sys: add decoder symbols

Author: huwcbjones

openssl-sys/build/run_bindgen.rs

@@ -61,6 +61,7 @@ const INCLUDES: &str = "
 #include <openssl/provider.h>
 #include <openssl/params.h>
 #include <openssl/param_build.h>
+#include <openssl/decoder.h>
 #endif
 
 #if OPENSSL_VERSION_NUMBER >= 0x30200000

openssl-sys/src/handwritten/decoder.rs

@@ -0,0 +1,53 @@
+use super::super::*;
+use libc::*;
+
+#[cfg(ossl300)]
+extern "C" {
+    pub fn OSSL_DECODER_CTX_new() -> *mut OSSL_DECODER_CTX;
+    pub fn OSSL_DECODER_CTX_free(ctx: *mut OSSL_DECODER_CTX);
+
+    pub fn OSSL_DECODER_CTX_new_for_pkey(
+        pkey: *mut *mut EVP_PKEY,
+        input_type: *const c_char,
+        input_struct: *const c_char,
+        keytype: *const c_char,
+        selection: c_int,
+        libctx: *mut OSSL_LIB_CTX,
+        propquery: *const c_char,
+    ) -> *mut OSSL_DECODER_CTX;
+
+    pub fn OSSL_DECODER_CTX_set_selection(ctx: *mut OSSL_DECODER_CTX, selection: c_int) -> c_int;
+    pub fn OSSL_DECODER_CTX_set_input_type(
+        ctx: *mut OSSL_DECODER_CTX,
+        input_type: *const c_char,
+    ) -> c_int;
+    pub fn OSSL_DECODER_CTX_set_input_structure(
+        ctx: *mut OSSL_DECODER_CTX,
+        input_structure: *const c_char,
+    ) -> c_int;
+
+    pub fn OSSL_DECODER_CTX_set_passphrase(
+        ctx: *mut OSSL_DECODER_CTX,
+        kstr: *const c_uchar,
+        klen: size_t,
+    ) -> c_int;
+    pub fn OSSL_DECODER_CTX_set_pem_password_cb(
+        ctx: *mut OSSL_DECODER_CTX,
+        cb: pem_password_cb,
+        cbarg: *mut c_void,
+    ) -> c_int;
+    pub fn OSSL_DECODER_CTX_set_passphrase_cb(
+        ctx: *mut OSSL_DECODER_CTX,
+        cb: OSSL_PASSPHRASE_CALLBACK,
+        cbarg: *mut c_void,
+    ) -> c_int;
+
+    pub fn OSSL_DECODER_from_bio(ctx: *mut OSSL_DECODER_CTX, b_in: *mut BIO) -> c_int;
+    #[cfg(not(osslconf = "OPENSSL_NO_STDIO"))]
+    pub fn OSSL_DECODER_from_fp(ctx: *mut OSSL_DECODER_CTX, fp: *mut FILE) -> c_int;
+    pub fn OSSL_DECODER_from_data(
+        ctx: *mut OSSL_DECODER_CTX,
+        pdata: *mut *const c_uchar,
+        pdata_len: *mut size_t,
+    ) -> c_int;
+}

openssl-sys/src/handwritten/mod.rs

@@ -6,6 +6,7 @@ pub use self::cmac::*;
 pub use self::cms::*;
 pub use self::conf::*;
 pub use self::crypto::*;
+pub use self::decoder::*;
 pub use self::dh::*;
 pub use self::dsa::*;
 pub use self::ec::*;
@@ -45,6 +46,7 @@ mod cmac;
 mod cms;
 mod conf;
 mod crypto;
+mod decoder;
 mod dh;
 mod dsa;
 mod ec;

openssl-sys/src/handwritten/types.rs

@@ -1147,3 +1147,17 @@ pub enum OSSL_PARAM_BLD {}
 pub enum EVP_KDF {}
 #[cfg(ossl300)]
 pub enum EVP_KDF_CTX {}
+
+#[cfg(ossl300)]
+pub enum OSSL_DECODER_CTX {}
+
+#[cfg(ossl300)]
+pub type OSSL_PASSPHRASE_CALLBACK = Option<
+    unsafe extern "C" fn(
+        pass: *mut c_char,
+        pass_size: size_t,
+        pass_len: *mut size_t,
+        params: *const OSSL_PARAM,
+        arg: *mut c_void,
+    ) -> c_int,
+>;

systest/build.rs

@@ -85,7 +85,8 @@ fn main() {
         if version >= 0x30000000 {
             cfg.header("openssl/provider.h")
                 .header("openssl/params.h")
-                .header("openssl/param_build.h");
+                .header("openssl/param_build.h")
+            .header("openssl/decoder.h");
         }
         if version >= 0x30200000 {
             cfg.header("openssl/thread.h");
@@ -120,6 +121,7 @@ fn main() {
         s == "PasswordCallback"
             || s == "pem_password_cb"
             || s == "bio_info_cb"
+            || s == "OSSL_PASSPHRASE_CALLBACK"
             || s.starts_with("CRYPTO_EX_")
     });
     cfg.skip_struct(|s| {