Unverified Commit ae0407be authored by Alex Gaynor's avatar Alex Gaynor Committed by GitHub
Browse files

Merge pull request #2426 from botovq/const-evp-pkey-get1 

Some API adjustments for LibreSSL 4.2.0
parents 194498cc 32852a94

openssl-sys/build/cfgs.rs

+3 −0
Original line number Diff line number Diff line
@@ -71,6 +71,9 @@ pub fn get(openssl_version: Option<u64>, libressl_version: Option<u64>) -> Vec<& 
        if libressl_version >= 0x4_01_00_00_0 {

            cfgs.push("libressl410");

        }

        if libressl_version >= 0x4_02_00_00_0 {

            cfgs.push("libressl420");

        }

    } else {

        let openssl_version = openssl_version.unwrap();

openssl-sys/build/main.rs

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ fn main() { 
    println!("cargo:rustc-check-cfg=cfg(libressl390)");

    println!("cargo:rustc-check-cfg=cfg(libressl400)");

    println!("cargo:rustc-check-cfg=cfg(libressl410)");

    println!("cargo:rustc-check-cfg=cfg(libressl420)");



    println!("cargo:rustc-check-cfg=cfg(ossl101)");

    println!("cargo:rustc-check-cfg=cfg(ossl102)");

openssl-sys/src/handwritten/evp.rs

+8 −4
Original line number Diff line number Diff line
@@ -472,17 +472,21 @@ cfg_if! { 
        }

    }

}

const_ptr_api! {

    extern "C" {

        pub fn EVP_PKEY_get1_RSA(k: #[const_ptr_if(libressl420)] EVP_PKEY) -> *mut RSA;

        pub fn EVP_PKEY_get1_DSA(k: #[const_ptr_if(libressl420)] EVP_PKEY) -> *mut DSA;

        pub fn EVP_PKEY_get1_DH(k: #[const_ptr_if(libressl420)] EVP_PKEY) -> *mut DH;

        pub fn EVP_PKEY_get1_EC_KEY(k: #[const_ptr_if(libressl420)] EVP_PKEY) -> *mut EC_KEY;

    }

}

extern "C" {

    pub fn EVP_PKEY_assign(pkey: *mut EVP_PKEY, typ: c_int, key: *mut c_void) -> c_int;



    pub fn EVP_PKEY_set1_RSA(k: *mut EVP_PKEY, r: *mut RSA) -> c_int;

    pub fn EVP_PKEY_get1_RSA(k: *mut EVP_PKEY) -> *mut RSA;

    pub fn EVP_PKEY_set1_DSA(k: *mut EVP_PKEY, k: *mut DSA) -> c_int;

    pub fn EVP_PKEY_get1_DSA(k: *mut EVP_PKEY) -> *mut DSA;

    pub fn EVP_PKEY_set1_DH(k: *mut EVP_PKEY, k: *mut DH) -> c_int;

    pub fn EVP_PKEY_get1_DH(k: *mut EVP_PKEY) -> *mut DH;

    pub fn EVP_PKEY_set1_EC_KEY(k: *mut EVP_PKEY, k: *mut EC_KEY) -> c_int;

    pub fn EVP_PKEY_get1_EC_KEY(k: *mut EVP_PKEY) -> *mut EC_KEY;



    pub fn EVP_PKEY_new() -> *mut EVP_PKEY;

    pub fn EVP_PKEY_free(k: *mut EVP_PKEY);