Commit 78c1e240 authored by Hiroki Noda's avatar Hiroki Noda
Browse files

Add EVP_EncryptInit_ex/EVP_EncryptFinish_ex, and the equivalently named 

decrypt functions

Some functions including low level AES functions would be deprecated
in next OpenSSL version(3.0).
OpenSSL team says that application should use the high level EVP APIs,
so I added these functions.

See also:
https://github.com/openssl/openssl/pull/10580
https://github.com/openssl/openssl/pull/10740
parent ad37e7e0

openssl-sys/src/evp.rs

+24 −0
Original line number Diff line number Diff line
@@ -122,6 +122,13 @@ extern "C" { 
        npubk: c_int,

    ) -> c_int;

    pub fn EVP_SealFinal(ctx: *mut EVP_CIPHER_CTX, out: *mut c_uchar, outl: *mut c_int) -> c_int;

    pub fn EVP_EncryptInit_ex(

        ctx: *mut EVP_CIPHER_CTX,

        cipher: *const EVP_CIPHER,

        impl_: *mut ENGINE,

        key: *const c_uchar,

        iv: *const c_uchar,

    ) -> c_int;

    pub fn EVP_EncryptUpdate(

        ctx: *mut EVP_CIPHER_CTX,

        out: *mut c_uchar,
@@ -129,6 +136,11 @@ extern "C" { 
        in_: *const u8,

        inl: c_int,

    ) -> c_int;

    pub fn EVP_EncryptFinal_ex(

        ctx: *mut EVP_CIPHER_CTX,

        out: *mut c_uchar,

        outl: *mut c_int,

    ) -> c_int;

    pub fn EVP_OpenInit(

        ctx: *mut EVP_CIPHER_CTX,

        type_: *const EVP_CIPHER,
@@ -138,6 +150,13 @@ extern "C" { 
        priv_: *mut EVP_PKEY,

    ) -> c_int;

    pub fn EVP_OpenFinal(ctx: *mut EVP_CIPHER_CTX, out: *mut c_uchar, outl: *mut c_int) -> c_int;

    pub fn EVP_DecryptInit_ex(

        ctx: *mut EVP_CIPHER_CTX,

        cipher: *const EVP_CIPHER,

        impl_: *mut ENGINE,

        key: *const c_uchar,

        iv: *const c_uchar,

    ) -> c_int;

    pub fn EVP_DecryptUpdate(

        ctx: *mut EVP_CIPHER_CTX,

        out: *mut c_uchar,
@@ -145,6 +164,11 @@ extern "C" { 
        in_: *const u8,

        inl: c_int,

    ) -> c_int;

    pub fn EVP_DecryptFinal_ex(

        ctx: *mut EVP_CIPHER_CTX,

        outm: *mut c_uchar,

        outl: *mut c_int

    ) -> c_int;

}

cfg_if! {

    if #[cfg(any(ossl111b, libressl280))] {