min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x509: impl Clone using references & CRYPTO_add()

This commit is contained in:
Cody P Schafer 2016-01-19 22:04:18 -05:00
parent 3c51f159a7
commit 36a667be49
2 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openssl/src/c_helpers.c
View File

@ -11,3 +11,7 @@ void rust_SSL_CTX_clone(SSL_CTX *ctx) {
void rust_EVP_PKEY_clone(EVP_PKEY *pkey) { void rust_EVP_PKEY_clone(EVP_PKEY *pkey) {
CRYPTO_add(&pkey->references,1,CRYPTO_LOCK_EVP_PKEY); CRYPTO_add(&pkey->references,1,CRYPTO_LOCK_EVP_PKEY);
} }
void rust_X509_clone(X509 *x509) {
CRYPTO_add(&x509->references,1,CRYPTO_LOCK_X509);
}

14
openssl/src/x509/mod.rs
View File

@ -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> { impl<'ctx> Drop for X509<'ctx> {
fn drop(&mut self) { fn drop(&mut self) {
if self.owned { if self.owned {