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

Merge pull request #2289 from reaperhulk/kdf 

add basic EVP_KDF bindings
parents 48824a62 3ed6fe2a

openssl-sys/src/handwritten/kdf.rs

+8 −0
Original line number Diff line number Diff line
@@ -21,6 +21,14 @@ cfg_if! { 
                info: *const u8,

                infolen: c_int,

            ) -> c_int;

            pub fn EVP_KDF_CTX_new(kdf: *mut EVP_KDF) -> *mut EVP_KDF_CTX;

            pub fn EVP_KDF_CTX_free(ctx: *mut EVP_KDF_CTX);

            pub fn EVP_KDF_CTX_reset(ctx: *mut EVP_KDF_CTX);

            pub fn EVP_KDF_CTX_get_kdf_size(ctx: *mut EVP_KDF_CTX) -> size_t;

            pub fn EVP_KDF_derive(ctx: *mut EVP_KDF_CTX, key: *mut u8, keylen: size_t, params: *const OSSL_PARAM) -> c_int;

            pub fn EVP_KDF_fetch(ctx: *mut OSSL_LIB_CTX, algorithm: *const c_char, properties: *const c_char) -> *mut EVP_KDF;

            pub fn EVP_KDF_free(kdf: *mut EVP_KDF);

        }



    }

}

openssl-sys/src/handwritten/params.rs

+7 −0
Original line number Diff line number Diff line
@@ -6,4 +6,11 @@ extern "C" { 
    pub fn OSSL_PARAM_construct_uint(key: *const c_char, buf: *mut c_uint) -> OSSL_PARAM;

    #[cfg(ossl300)]

    pub fn OSSL_PARAM_construct_end() -> OSSL_PARAM;

    #[cfg(ossl300)]

    pub fn OSSL_PARAM_construct_octet_string(

        key: *const c_char,

        buf: *mut c_void,

        bsize: size_t,

    ) -> OSSL_PARAM;



}

openssl-sys/src/handwritten/types.rs

+5 −0
Original line number Diff line number Diff line
@@ -1139,3 +1139,8 @@ pub struct OSSL_PARAM { 
    data_size: size_t,

    return_size: size_t,

}



#[cfg(ossl300)]

pub enum EVP_KDF {}

#[cfg(ossl300)]

pub enum EVP_KDF_CTX {}