diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2007-02-21 13:48:49 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2007-02-21 13:48:49 +0000 |
| commit | 52ee969e2991d8e8c90c4835dc4bb047912ea291 (patch) | |
| tree | 9129aac8b38deecd102875689c8208cb25f3359a /crypto/pem | |
| parent | 55f05012016279fba6456f22dca265d4589b1d04 (diff) | |
Update from 0.9.7-stable.
Diffstat (limited to 'crypto/pem')
| -rw-r--r-- | crypto/pem/pem_lib.c | 5 | ||||
| -rw-r--r-- | crypto/pem/pem_pkey.c | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/crypto/pem/pem_lib.c b/crypto/pem/pem_lib.c index ffb29ce3d7..9bae4c8850 100644 --- a/crypto/pem/pem_lib.c +++ b/crypto/pem/pem_lib.c @@ -579,6 +579,7 @@ int PEM_write_bio(BIO *bp, const char *name, char *header, unsigned char *data, } EVP_EncodeFinal(&ctx,buf,&outl); if ((outl > 0) && (BIO_write(bp,(char *)buf,outl) != outl)) goto err; + OPENSSL_cleanse(buf, PEM_BUFSIZE*8); OPENSSL_free(buf); buf = NULL; if ( (BIO_write(bp,"-----END ",9) != 9) || @@ -587,8 +588,10 @@ int PEM_write_bio(BIO *bp, const char *name, char *header, unsigned char *data, goto err; return(i+outl); err: - if (buf) + if (buf) { + OPENSSL_cleanse(buf, PEM_BUFSIZE*8); OPENSSL_free(buf); + } PEMerr(PEM_F_PEM_WRITE_BIO,reason); return(0); } diff --git a/crypto/pem/pem_pkey.c b/crypto/pem/pem_pkey.c index 2162a45323..4da4c31ce5 100644 --- a/crypto/pem/pem_pkey.c +++ b/crypto/pem/pem_pkey.c @@ -125,6 +125,7 @@ p8err: PEMerr(PEM_F_PEM_READ_BIO_PRIVATEKEY,ERR_R_ASN1_LIB); err: OPENSSL_free(nm); + OPENSSL_cleanse(data, len); OPENSSL_free(data); return(ret); } |