diff options
| author | jwalch <jeremy.walch@gmail.com> | 2020-09-09 22:36:00 -0400 |
|---|---|---|
| committer | Tomas Mraz <tmraz@fedoraproject.org> | 2020-09-17 09:36:52 +0200 |
| commit | 4bb73d5409c056a878f526280f86cc3c01f8cd68 (patch) | |
| tree | 42e6f7ee3b30f4346f58d9cf36a4cee7950775a2 | |
| parent | 8230710f04ed70fee41ec3ed8f3e4b1af55be05a (diff) | |
Add a NULL check to EVP_PKEY_assign
Fixes #12619
Update p_lib.c
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12863)
| -rw-r--r-- | crypto/evp/p_lib.c | 2 | ||||
| -rw-r--r-- | test/ecdsatest.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c index e336d91286..5e032b4053 100644 --- a/crypto/evp/p_lib.c +++ b/crypto/evp/p_lib.c @@ -709,7 +709,7 @@ int EVP_PKEY_assign(EVP_PKEY *pkey, int type, void *key) int alias = type; #ifndef OPENSSL_NO_EC - if (EVP_PKEY_type(type) == EVP_PKEY_EC) { + if ((key != NULL) && (EVP_PKEY_type(type) == EVP_PKEY_EC)) { const EC_GROUP *group = EC_KEY_get0_group(key); if (group != NULL && EC_GROUP_get_curve_name(group) == NID_sm2) diff --git a/test/ecdsatest.c b/test/ecdsatest.c index f7d6608f39..471aaa184d 100644 --- a/test/ecdsatest.c +++ b/test/ecdsatest.c @@ -252,6 +252,7 @@ static int test_builtin(int n, int as) || !TEST_ptr(eckey_neg = EC_KEY_new_by_curve_name(nid)) || !TEST_true(EC_KEY_generate_key(eckey_neg)) || !TEST_ptr(pkey_neg = EVP_PKEY_new()) + || !TEST_false(EVP_PKEY_assign_EC_KEY(pkey_neg, NULL)) || !TEST_true(EVP_PKEY_assign_EC_KEY(pkey_neg, eckey_neg))) goto err; |