diff options
Diffstat (limited to 'src/lib')
-rw-r--r-- | src/lib/libcrypto/ec/ec_asn1.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/lib/libcrypto/ec/ec_asn1.c b/src/lib/libcrypto/ec/ec_asn1.c index 6ec8ab0874..4cf0bf5972 100644 --- a/src/lib/libcrypto/ec/ec_asn1.c +++ b/src/lib/libcrypto/ec/ec_asn1.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ec_asn1.c,v 1.35 2022/01/14 08:16:13 tb Exp $ */ | 1 | /* $OpenBSD: ec_asn1.c,v 1.36 2022/03/31 13:00:58 tb Exp $ */ |
2 | /* | 2 | /* |
3 | * Written by Nils Larsch for the OpenSSL project. | 3 | * Written by Nils Larsch for the OpenSSL project. |
4 | */ | 4 | */ |
@@ -1285,7 +1285,7 @@ EC_GROUP * | |||
1285 | d2i_ECPKParameters(EC_GROUP ** a, const unsigned char **in, long len) | 1285 | d2i_ECPKParameters(EC_GROUP ** a, const unsigned char **in, long len) |
1286 | { | 1286 | { |
1287 | EC_GROUP *group = NULL; | 1287 | EC_GROUP *group = NULL; |
1288 | ECPKPARAMETERS *params = NULL; | 1288 | ECPKPARAMETERS *params; |
1289 | 1289 | ||
1290 | if ((params = d2i_ECPKPARAMETERS(NULL, in, len)) == NULL) { | 1290 | if ((params = d2i_ECPKPARAMETERS(NULL, in, len)) == NULL) { |
1291 | ECerror(EC_R_D2I_ECPKPARAMETERS_FAILURE); | 1291 | ECerror(EC_R_D2I_ECPKPARAMETERS_FAILURE); |
@@ -1332,13 +1332,8 @@ d2i_ECPrivateKey(EC_KEY ** a, const unsigned char **in, long len) | |||
1332 | EC_KEY *ret = NULL; | 1332 | EC_KEY *ret = NULL; |
1333 | EC_PRIVATEKEY *priv_key = NULL; | 1333 | EC_PRIVATEKEY *priv_key = NULL; |
1334 | 1334 | ||
1335 | if ((priv_key = EC_PRIVATEKEY_new()) == NULL) { | 1335 | if ((priv_key = d2i_EC_PRIVATEKEY(NULL, in, len)) == NULL) { |
1336 | ECerror(ERR_R_MALLOC_FAILURE); | ||
1337 | return NULL; | ||
1338 | } | ||
1339 | if ((priv_key = d2i_EC_PRIVATEKEY(&priv_key, in, len)) == NULL) { | ||
1340 | ECerror(ERR_R_EC_LIB); | 1336 | ECerror(ERR_R_EC_LIB); |
1341 | EC_PRIVATEKEY_free(priv_key); | ||
1342 | return NULL; | 1337 | return NULL; |
1343 | } | 1338 | } |
1344 | if (a == NULL || *a == NULL) { | 1339 | if (a == NULL || *a == NULL) { |