diff options
| author | Tomas Mraz <tomas@openssl.org> | 2021-01-22 13:59:54 +0100 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2021-01-26 15:26:49 +0100 |
| commit | 82a46200911f2bb1af00b6921c0db9738825aa76 (patch) | |
| tree | 7f649219bfd9d88248bcb035b25024c2ab524da6 /crypto/evp/p_lib.c | |
| parent | f468e2f95160defb7ab7461f8217697add762b90 (diff) | |
| download | openssl-new-82a46200911f2bb1af00b6921c0db9738825aa76.tar.gz | |
Add checks for NULL return from EC_KEY_get0_group()
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/13139)
Diffstat (limited to 'crypto/evp/p_lib.c')
| -rw-r--r-- | crypto/evp/p_lib.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/crypto/evp/p_lib.c b/crypto/evp/p_lib.c index 11e86a7e93..d91cf01762 100644 --- a/crypto/evp/p_lib.c +++ b/crypto/evp/p_lib.c @@ -1221,9 +1221,11 @@ int EVP_PKEY_get_group_name(const EVP_PKEY *pkey, char *gname, size_t gname_sz, #ifndef OPENSSL_NO_EC case EVP_PKEY_EC: { - EC_KEY *ec = EVP_PKEY_get0_EC_KEY(pkey); - int nid = EC_GROUP_get_curve_name(EC_KEY_get0_group(ec)); + const EC_GROUP *grp = EC_KEY_get0_group(EVP_PKEY_get0_EC_KEY(pkey)); + int nid = NID_undef; + if (grp != NULL) + nid = EC_GROUP_get_curve_name(grp); if (nid != NID_undef) name = ec_curve_nid2name(nid); } @@ -2271,6 +2273,8 @@ int EVP_PKEY_get_field_type(const EVP_PKEY *pkey) if (ec == NULL) return 0; grp = EC_KEY_get0_group(ec); + if (grp == NULL) + return 0; return EC_GROUP_get_field_type(grp); #else |