diff options
| author | Adam Langley <agl@google.com> | 2015-11-07 03:02:39 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2015-11-10 02:06:13 +0300 |
| commit | 2e64f1b5d5838ab80786bf851e88b2254879c6ae (patch) | |
| tree | e0743d70cef0e3bda401b7242169282862ffbe41 /crypto/pkcs8 | |
| parent | f606f9831b648907514ff358b89fc120aa9c1c4f (diff) | |
Check PKCS#8 pkey field is valid before cleansing.
(Imported from upstream's 52e028b9de371da62c1e51b46592517b1068d770.)
Change-Id: If980d774671b9b5ba997db3fd7d4043525a85609
Reviewed-on: https://boringssl-review.googlesource.com/6445
Reviewed-by: David Benjamin <davidben@chromium.org>
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'crypto/pkcs8')
| -rw-r--r-- | crypto/pkcs8/p8_pkey.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/pkcs8/p8_pkey.c b/crypto/pkcs8/p8_pkey.c index bd9d30ca..c69d0fac 100644 --- a/crypto/pkcs8/p8_pkey.c +++ b/crypto/pkcs8/p8_pkey.c @@ -66,7 +66,7 @@ static int pkey_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, /* Since the structure must still be valid use ASN1_OP_FREE_PRE */ if (operation == ASN1_OP_FREE_PRE) { PKCS8_PRIV_KEY_INFO *key = (PKCS8_PRIV_KEY_INFO *)*pval; - if (key->pkey && + if (key->pkey && key->pkey->type == V_ASN1_OCTET_STRING && key->pkey->value.octet_string) { OPENSSL_cleanse(key->pkey->value.octet_string->data, key->pkey->value.octet_string->length); |