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

Merge pull request #836 from sfackler/cert-store-leak 

Don't leak X509s
This commit is contained in:
Steven Fackler 2018-02-12 09:50:41 -08:00 committed by GitHub
parent 2fd79b525e b1ab0ec473
commit 9f167894a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
openssl/src/x509/store.rs
View File

@ -30,7 +30,7 @@
//! builder.set_issuer_name(&name).unwrap(); //! builder.set_issuer_name(&name).unwrap();
//! builder.set_pubkey(&pkey).unwrap(); //! builder.set_pubkey(&pkey).unwrap();
//! builder.sign(&pkey, MessageDigest::sha256()).unwrap(); //! builder.sign(&pkey, MessageDigest::sha256()).unwrap();
//! //!
//! let certificate: X509 = builder.build(); //! let certificate: X509 = builder.build();
//! //!
//! let mut builder = X509StoreBuilder::new().unwrap(); //! let mut builder = X509StoreBuilder::new().unwrap();
@ -52,7 +52,7 @@ foreign_type! {
type CType = ffi::X509_STORE; type CType = ffi::X509_STORE;
fn drop = ffi::X509_STORE_free; fn drop = ffi::X509_STORE_free;
/// A builder type used to construct an `X509Store`. /// A builder type used to construct an `X509Store`.
pub struct X509StoreBuilder; pub struct X509StoreBuilder;
/// Reference to an `X509StoreBuilder`. /// Reference to an `X509StoreBuilder`.
pub struct X509StoreBuilderRef; pub struct X509StoreBuilderRef;
@ -80,11 +80,10 @@ impl X509StoreBuilder {
impl X509StoreBuilderRef { impl X509StoreBuilderRef {
/// Adds a certificate to the certificate store. /// Adds a certificate to the certificate store.
// FIXME should take an &X509Ref
pub fn add_cert(&mut self, cert: X509) -> Result<(), ErrorStack> { pub fn add_cert(&mut self, cert: X509) -> Result<(), ErrorStack> {
unsafe { unsafe {
let ptr = cert.as_ptr(); cvt(ffi::X509_STORE_add_cert(self.as_ptr(), cert.as_ptr())).map(|_| ())
mem::forget(cert); // the cert will be freed inside of X509_STORE_add_cert on error
cvt(ffi::X509_STORE_add_cert(self.as_ptr(), ptr)).map(|_| ())
} }
} }