Commit 36a667be authored by Cody P Schafer's avatar Cody P Schafer
Browse files

x509: impl Clone using references & CRYPTO_add()

parent 3c51f159

openssl/src/c_helpers.c

+4 −0
Original line number Diff line number Diff line
@@ -11,3 +11,7 @@ void rust_SSL_CTX_clone(SSL_CTX *ctx) { 
void rust_EVP_PKEY_clone(EVP_PKEY *pkey) {

    CRYPTO_add(&pkey->references,1,CRYPTO_LOCK_EVP_PKEY);

}



void rust_X509_clone(X509 *x509) {

    CRYPTO_add(&x509->references,1,CRYPTO_LOCK_X509);

}

openssl/src/x509/mod.rs

+14 −0
Original line number Diff line number Diff line
@@ -507,6 +507,20 @@ impl<'ctx> X509<'ctx> { 
    }

}



extern "C" {

    fn rust_X509_clone(x509: *mut ffi::X509);

}



impl<'ctx> Clone for X509<'ctx> {

    fn clone(&self) -> X509<'ctx> {

        unsafe { rust_X509_clone(self.handle) }

        /* FIXME: given that we now have refcounting control, 'owned' should be uneeded, the 'ctx

         * is probably also uneeded. We can remove both to condense the x509 api quite a bit

         */

        X509::new(self.handle, true)

    }

}



impl<'ctx> Drop for X509<'ctx> {

    fn drop(&mut self) {

        if self.owned {