Merge pull request #1888 from sfackler/alex-patch-1 (a24bf4e8) · Commits · Public Repositories / Rust Openssl

.github/workflows/ci.yml

+2 −2

Original line number	Diff line number	Diff line
		@@ -153,7 +153,7 @@ jobs:
		- false
		library:
		- name: boringssl
		version: 93e8d4463d59d671e9c5c6171226341f04b07907
		version: bcecc7d834fc44ad257b2f23f88e1cf597ab2736
		- name: openssl
		version: vendored
		- name: openssl
		@@ -310,7 +310,7 @@ jobs:
		- run: \|
		mkdir -p .cargo
		echo '[patch.crates-io]' > .cargo/config.toml
		echo 'bssl-sys = { path = "'$OPENSSL_DIR'/rust" }' >> .cargo/config.toml
		echo 'bssl-sys = { path = "'$OPENSSL_DIR'/rust/bssl-sys" }' >> .cargo/config.toml
		if: matrix.library.name == 'boringssl' && !matrix.bindgen
		- uses: actions/cache@v3
		with:

openssl-sys/build/run_bindgen.rs

+0 −2

Original line number	Diff line number	Diff line
		@@ -111,7 +111,6 @@ pub fn run_boringssl(include_dirs: &[PathBuf]) {
		.ctypes_prefix("::libc")
		.derive_default(false)
		.enable_function_attribute_detection()
		.size_t_is_usize(true)
		.default_macro_constant_type(MacroTypeVariation::Signed)
		.rustified_enum("point_conversion_form_t")
		.allowlist_file(".*/openssl/[^/]+\\.h")
		@@ -167,7 +166,6 @@ pub fn run_boringssl(include_dirs: &[PathBuf]) {
		.arg("--ctypes-prefix=::libc")
		.arg("--no-derive-default")
		.arg("--enable-function-attribute-detection")
		.arg("--size_t-is-usize")
		.arg("--default-macro-constant-type=signed")
		.arg("--rustified-enum=point_conversion_form_t")
		.arg("--allowlist-file=.*/openssl/[^/]+\\.h")

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