fix 3.0.0 bindgen (03ff84fb) · Commits · Public Repositories / Rust Openssl

openssl-sys/build/run_bindgen.rs

+9 −1

Original line number	Diff line number	Diff line
		@@ -19,7 +19,9 @@ const INCLUDES: &str = "
		#include <openssl/stack.h>
		#include <openssl/x509_vfy.h>
		#include <openssl/x509.h>
		#include <openssl/ocsp.h>
		#include <openssl/x509v3.h>
		#include <openssl/kdf.h>
		";

		pub fn run(include_dirs: &[PathBuf]) {
		@@ -30,7 +32,7 @@ pub fn run(include_dirs: &[PathBuf]) {
		.rust_target(RustTarget::Stable_1_47)
		.ctypes_prefix("::libc")
		.raw_line("use libc::*;")
		.allowlist_file(".*/openssl/[^/]+.h")
		.allowlist_file(".*/openssl/[^/]+\\.h")
		.allowlist_recursively(false)
		// libc is missing pthread_once_t on macOS
		.blocklist_type("CRYPTO_ONCE")
		@@ -38,6 +40,12 @@ pub fn run(include_dirs: &[PathBuf]) {
		// we don't want to mess with va_list
		.blocklist_function("BIO_vprintf")
		.blocklist_function("BIO_vsnprintf")
		.blocklist_function("ERR_vset_error")
		.blocklist_function("ERR_add_error_vdata")
		.blocklist_function("EVP_KDF_vctrl")
		.blocklist_type("OSSL_FUNC_core_vset_error_fn")
		.blocklist_type("OSSL_FUNC_BIO_vprintf_fn")
		.blocklist_type("OSSL_FUNC_BIO_vsnprintf_fn")
		// Maintain compatibility for existing enum definitions
		.rustified_enum("point_conversion_form_t")
		// Maintain compatibility for pre-union definitions

openssl-sys/src/handwritten/evp.rs

+0 −24

Original line number	Diff line number	Diff line
		@@ -505,30 +505,6 @@ extern "C" {
		) -> c_int;
		}

		cfg_if! {
		if #[cfg(ossl300)] {
		extern "C" {
		pub fn EVP_PKEY_CTX_set_hkdf_mode(ctx: *mut EVP_PKEY_CTX, mode: c_int) -> c_int;
		pub fn EVP_PKEY_CTX_set_hkdf_md(ctx: mut EVP_PKEY_CTX, md: const EVP_MD) -> c_int;
		pub fn EVP_PKEY_CTX_set1_hkdf_salt(
		ctx: *mut EVP_PKEY_CTX,
		salt: *const u8,
		saltlen: c_int,
		) -> c_int;
		pub fn EVP_PKEY_CTX_set1_hkdf_key(
		ctx: *mut EVP_PKEY_CTX,
		key: *const u8,
		keylen: c_int,
		) -> c_int;
		pub fn EVP_PKEY_CTX_add1_hkdf_info(
		ctx: *mut EVP_PKEY_CTX,
		info: *const u8,
		infolen: c_int,
		) -> c_int;
		}
		}
		}

		const_ptr_api! {
		extern "C" {
		pub fn EVP_PKCS82PKEY(p8: #[const_ptr_if(any(ossl110, libressl280))] PKCS8_PRIV_KEY_INFO) -> *mut EVP_PKEY;

openssl-sys/src/handwritten/kdf.rs

0 → 100644

+26 −0

Original line number	Diff line number	Diff line
		use libc::*;
		use *;

		cfg_if! {
		if #[cfg(ossl300)] {
		extern "C" {
		pub fn EVP_PKEY_CTX_set_hkdf_mode(ctx: *mut EVP_PKEY_CTX, mode: c_int) -> c_int;
		pub fn EVP_PKEY_CTX_set_hkdf_md(ctx: mut EVP_PKEY_CTX, md: const EVP_MD) -> c_int;
		pub fn EVP_PKEY_CTX_set1_hkdf_salt(
		ctx: *mut EVP_PKEY_CTX,
		salt: *const u8,
		saltlen: c_int,
		) -> c_int;
		pub fn EVP_PKEY_CTX_set1_hkdf_key(
		ctx: *mut EVP_PKEY_CTX,
		key: *const u8,
		keylen: c_int,
		) -> c_int;
		pub fn EVP_PKEY_CTX_add1_hkdf_info(
		ctx: *mut EVP_PKEY_CTX,
		info: *const u8,
		infolen: c_int,
		) -> c_int;
		}
		}
		}

openssl-sys/src/handwritten/mod.rs

+4 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,8 @@ pub use handwritten::dsa::*;
		pub use handwritten::ec::*;
		pub use handwritten::evp::*;
		pub use handwritten::hmac::*;
		pub use handwritten::kdf::*;
		pub use handwritten::ocsp::*;
		pub use handwritten::pkcs7::*;
		pub use handwritten::rsa::*;
		pub use handwritten::sha::*;
		@@ -27,6 +29,8 @@ mod dsa;
		mod ec;
		mod evp;
		mod hmac;
		mod kdf;
		mod ocsp;
		mod pkcs7;
		mod rsa;
		mod sha;

openssl-sys/src/handwritten/ocsp.rs

0 → 100644

+89 −0

Original line number	Diff line number	Diff line
		use libc::*;
		use *;

		pub enum OCSP_CERTID {}

		pub enum OCSP_ONEREQ {}

		pub enum OCSP_REQUEST {}

		pub enum OCSP_BASICRESP {}

		const_ptr_api! {
		extern "C" {
		pub fn OCSP_cert_to_id(
		dgst: *const EVP_MD,
		subject: #[const_ptr_if(any(ossl110, libressl281))] X509,
		issuer: #[const_ptr_if(any(ossl110, libressl281))] X509,
		) -> *mut OCSP_CERTID;
		}
		}

		extern "C" {
		pub fn OCSP_request_add0_id(r: mut OCSP_REQUEST, id: mut OCSP_CERTID) -> *mut OCSP_ONEREQ;

		pub fn OCSP_resp_find_status(
		bs: *mut OCSP_BASICRESP,
		id: *mut OCSP_CERTID,
		status: *mut c_int,
		reason: *mut c_int,
		revtime: mut mut ASN1_GENERALIZEDTIME,
		thisupd: mut mut ASN1_GENERALIZEDTIME,
		nextupd: mut mut ASN1_GENERALIZEDTIME,
		) -> c_int;
		pub fn OCSP_check_validity(
		thisupd: *mut ASN1_GENERALIZEDTIME,
		nextupd: *mut ASN1_GENERALIZEDTIME,
		sec: c_long,
		maxsec: c_long,
		) -> c_int;

		pub fn OCSP_response_status(resp: *mut OCSP_RESPONSE) -> c_int;
		pub fn OCSP_response_get1_basic(resp: mut OCSP_RESPONSE) -> mut OCSP_BASICRESP;

		pub fn OCSP_response_create(status: c_int, bs: mut OCSP_BASICRESP) -> mut OCSP_RESPONSE;

		pub fn OCSP_BASICRESP_new() -> *mut OCSP_BASICRESP;
		pub fn OCSP_BASICRESP_free(r: *mut OCSP_BASICRESP);
		pub fn OCSP_RESPONSE_new() -> *mut OCSP_RESPONSE;
		pub fn OCSP_RESPONSE_free(r: *mut OCSP_RESPONSE);
		}

		const_ptr_api! {
		extern "C" {
		pub fn i2d_OCSP_RESPONSE(a: #[const_ptr_if(ossl300)] OCSP_RESPONSE, pp: mut mut c_uchar) -> c_int;
		}
		}

		extern "C" {
		pub fn d2i_OCSP_RESPONSE(
		a: mut mut OCSP_RESPONSE,
		pp: mut const c_uchar,
		length: c_long,
		) -> *mut OCSP_RESPONSE;
		pub fn OCSP_ONEREQ_free(r: *mut OCSP_ONEREQ);
		pub fn OCSP_CERTID_free(id: *mut OCSP_CERTID);
		pub fn OCSP_REQUEST_new() -> *mut OCSP_REQUEST;
		pub fn OCSP_REQUEST_free(r: *mut OCSP_REQUEST);
		}

		const_ptr_api! {
		extern "C" {
		pub fn i2d_OCSP_REQUEST(a: #[const_ptr_if(ossl300)] OCSP_REQUEST, pp: mut mut c_uchar) -> c_int;
		}
		}

		extern "C" {
		pub fn d2i_OCSP_REQUEST(
		a: mut mut OCSP_REQUEST,
		pp: mut const c_uchar,
		length: c_long,
		) -> *mut OCSP_REQUEST;

		pub fn OCSP_basic_verify(
		bs: *mut OCSP_BASICRESP,
		certs: *mut stack_st_X509,
		st: *mut X509_STORE,
		flags: c_ulong,
		) -> c_int;
		}