diff options
| author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2017-07-29 12:19:29 +0200 |
|---|---|---|
| committer | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2017-07-29 15:00:47 +0200 |
| commit | a2ce081490891a561be40d943513458b3568fd1c (patch) | |
| tree | 90f9f3b469dae139db8e4e2525a1a4c063bb4a5c /crypto/pem | |
| parent | 49616d925251a8d38ef2af55d045a778215a7b55 (diff) | |
Clean password buffer on stack for PEM_read_bio_PrivateKey
and d2i_PKCS8PrivateKey_bio before it goes out of scope.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4047)
(cherry picked from commit 02fd47c8b0930dff9b188fd13bfb9da5e59444a8)
Diffstat (limited to 'crypto/pem')
| -rw-r--r-- | crypto/pem/pem_pk8.c | 1 | ||||
| -rw-r--r-- | crypto/pem/pem_pkey.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/crypto/pem/pem_pk8.c b/crypto/pem/pem_pk8.c index 993c595a7b..5caad9faab 100644 --- a/crypto/pem/pem_pk8.c +++ b/crypto/pem/pem_pk8.c @@ -131,6 +131,7 @@ EVP_PKEY *d2i_PKCS8PrivateKey_bio(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, } p8inf = PKCS8_decrypt(p8, psbuf, klen); X509_SIG_free(p8); + OPENSSL_cleanse(psbuf, klen); if (!p8inf) return NULL; ret = EVP_PKCS82PKEY(p8inf); diff --git a/crypto/pem/pem_pkey.c b/crypto/pem/pem_pkey.c index 6308622707..671b374f36 100644 --- a/crypto/pem/pem_pkey.c +++ b/crypto/pem/pem_pkey.c @@ -66,6 +66,7 @@ EVP_PKEY *PEM_read_bio_PrivateKey(BIO *bp, EVP_PKEY **x, pem_password_cb *cb, } p8inf = PKCS8_decrypt(p8, psbuf, klen); X509_SIG_free(p8); + OPENSSL_cleanse(psbuf, klen); if (!p8inf) goto p8err; ret = EVP_PKCS82PKEY(p8inf); |