diff options
| author | Cody P Schafer <[email protected]> | 2016-01-19 22:04:18 -0500 |
|---|---|---|
| committer | Cody P Schafer <[email protected]> | 2016-01-19 22:04:51 -0500 |
| commit | 36a667be49075ddea193214b55f76f6186c6f64a (patch) | |
| tree | cabb93dce85825b5000af015124f8f5444597ee9 /openssl/src | |
| parent | crypto/pkey: impl Clone for PKey using openssl's ref counting (diff) | |
| download | rust-openssl-36a667be49075ddea193214b55f76f6186c6f64a.tar.xz rust-openssl-36a667be49075ddea193214b55f76f6186c6f64a.zip | |
x509: impl Clone using references & CRYPTO_add()
Diffstat (limited to 'openssl/src')
| -rw-r--r-- | openssl/src/c_helpers.c | 4 | ||||
| -rw-r--r-- | openssl/src/x509/mod.rs | 14 |
2 files changed, 18 insertions, 0 deletions
diff --git a/openssl/src/c_helpers.c b/openssl/src/c_helpers.c index dfbfbf81..1b48565e 100644 --- a/openssl/src/c_helpers.c +++ b/openssl/src/c_helpers.c @@ -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); +} diff --git a/openssl/src/x509/mod.rs b/openssl/src/x509/mod.rs index ffd478ef..f31de89b 100644 --- a/openssl/src/x509/mod.rs +++ b/openssl/src/x509/mod.rs @@ -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 { |