Fix types for boringssl changes (b2ca7210) · Commits · Public Repositories / Rust Openssl

openssl/src/x509/mod.rs

+8 −8

Original line number	Diff line number	Diff line
		@@ -986,13 +986,13 @@ impl X509NameBuilder {
		pub fn append_entry_by_text(&mut self, field: &str, value: &str) -> Result<(), ErrorStack> {
		unsafe {
		let field = CString::new(field).unwrap();
		assert!(value.len() <= c_int::max_value() as usize);
		assert!(value.len() <= crate::SLenType::max_value() as usize);
		cvt(ffi::X509_NAME_add_entry_by_txt(
		self.0.as_ptr(),
		field.as_ptr() as *mut _,
		ffi::MBSTRING_UTF8,
		value.as_ptr(),
		value.len() as c_int,
		value.len() as crate::SLenType,
		-1,
		0,
		))
		@@ -1013,13 +1013,13 @@ impl X509NameBuilder {
		) -> Result<(), ErrorStack> {
		unsafe {
		let field = CString::new(field).unwrap();
		assert!(value.len() <= c_int::max_value() as usize);
		assert!(value.len() <= crate::SLenType::max_value() as usize);
		cvt(ffi::X509_NAME_add_entry_by_txt(
		self.0.as_ptr(),
		field.as_ptr() as *mut _,
		ty.as_raw(),
		value.as_ptr(),
		value.len() as c_int,
		value.len() as crate::SLenType,
		-1,
		0,
		))
		@@ -1034,13 +1034,13 @@ impl X509NameBuilder {
		/// [`X509_NAME_add_entry_by_NID`]: https://www.openssl.org/docs/manmaster/crypto/X509_NAME_add_entry_by_NID.html
		pub fn append_entry_by_nid(&mut self, field: Nid, value: &str) -> Result<(), ErrorStack> {
		unsafe {
		assert!(value.len() <= c_int::max_value() as usize);
		assert!(value.len() <= crate::SLenType::max_value() as usize);
		cvt(ffi::X509_NAME_add_entry_by_NID(
		self.0.as_ptr(),
		field.as_raw(),
		ffi::MBSTRING_UTF8,
		value.as_ptr() as *mut _,
		value.len() as c_int,
		value.len() as crate::SLenType,
		-1,
		0,
		))
		@@ -1060,13 +1060,13 @@ impl X509NameBuilder {
		ty: Asn1Type,
		) -> Result<(), ErrorStack> {
		unsafe {
		assert!(value.len() <= c_int::max_value() as usize);
		assert!(value.len() <= crate::SLenType::max_value() as usize);
		cvt(ffi::X509_NAME_add_entry_by_NID(
		self.0.as_ptr(),
		field.as_raw(),
		ty.as_raw(),
		value.as_ptr() as *mut _,
		value.len() as c_int,
		value.len() as crate::SLenType,
		-1,
		0,
		))

Admin message