Unverified Commit 117b4597 authored by Steven Fackler's avatar Steven Fackler Committed by GitHub
Browse files

Merge pull request #2017 from johntyner/feature/cipher-ctx-clone 

Add openssl::cipher_ctx::CipherCtx::clone
parents 99ea8a8a d2663601

openssl-sys/src/handwritten/evp.rs

+2 −0
Original line number Diff line number Diff line
@@ -271,6 +271,8 @@ const_ptr_api! { 
extern "C" {

    pub fn EVP_CIPHER_CTX_new() -> *mut EVP_CIPHER_CTX;

    pub fn EVP_CIPHER_CTX_free(ctx: *mut EVP_CIPHER_CTX);

    pub fn EVP_CIPHER_CTX_copy(dst: *mut EVP_CIPHER_CTX, src: *const EVP_CIPHER_CTX) -> c_int;



    pub fn EVP_MD_CTX_copy_ex(dst: *mut EVP_MD_CTX, src: *const EVP_MD_CTX) -> c_int;

    #[cfg(ossl111)]

    pub fn EVP_MD_CTX_reset(ctx: *mut EVP_MD_CTX) -> c_int;

openssl/src/cipher_ctx.rs

+8 −0
Original line number Diff line number Diff line
@@ -105,6 +105,14 @@ impl CipherCtx { 
}



impl CipherCtxRef {

    #[corresponds(EVP_CIPHER_CTX_copy)]

    pub fn copy(&mut self, src: &CipherCtxRef) -> Result<(), ErrorStack> {

        unsafe {

            cvt(ffi::EVP_CIPHER_CTX_copy(self.as_ptr(), src.as_ptr()))?;

            Ok(())

        }

    }



    /// Initializes the context for encryption.

    ///

    /// Normally this is called once to set all of the cipher, key, and IV. However, this process can be split up