diff options
| author | Richard Levitte <levitte@openssl.org> | 2018-08-07 04:55:47 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2018-08-07 07:56:19 +0200 |
| commit | 29cbeb9f0279678706dc9f5d96bcb64fc766658f (patch) | |
| tree | ee8e8a7cda9e5b2fb0d54f552b75c5557961e9b7 /crypto | |
| parent | 831a2b0637b0eb21c9c2f8cc67f4579368637077 (diff) | |
Make EVP_PKEY_asn1_new() stricter with its input
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/6880)
(cherry picked from commit 38eca7fed09a57c1b7a05d651af2c667b3e87719)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/asn1/ameth_lib.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/crypto/asn1/ameth_lib.c b/crypto/asn1/ameth_lib.c index b8ba067877..9b0a2ccb20 100644 --- a/crypto/asn1/ameth_lib.c +++ b/crypto/asn1/ameth_lib.c @@ -255,6 +255,18 @@ EVP_PKEY_ASN1_METHOD *EVP_PKEY_asn1_new(int id, int flags, goto err; } + /* + * One of the following must be true: + * + * pem_str == NULL AND ASN1_PKEY_ALIAS is set + * pem_str != NULL AND ASN1_PKEY_ALIAS is clear + * + * Anything else is an error and may lead to a corrupt ASN1 method table + */ + if (!((pem_str == NULL && (flags & ASN1_PKEY_ALIAS) != 0) + || (pem_str != NULL && (flags & ASN1_PKEY_ALIAS) == 0))) + goto err; + if (pem_str) { ameth->pem_str = OPENSSL_strdup(pem_str); if (!ameth->pem_str) |