From 20b99ef1b095df1edc7b972985b80068ac408e59 Mon Sep 17 00:00:00 2001 From: tb Date: Fri, 11 Oct 2024 06:18:40 +0000 Subject: [PATCH] Spell NULL in a simpler fashion priv_key->parameters is always NULL at this point, since its corresponding entry in the ASN.1 template has ASN1_TFLG_OPTIONAL set, so there is no point in pretending to pass it to ec_asn1_group2pkparameters(). ok jsing --- lib/libcrypto/ec/ec_asn1.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/libcrypto/ec/ec_asn1.c b/lib/libcrypto/ec/ec_asn1.c index d6b92fb16d1..d471d2dff4b 100644 --- a/lib/libcrypto/ec/ec_asn1.c +++ b/lib/libcrypto/ec/ec_asn1.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_asn1.c,v 1.58 2024/10/11 06:13:09 tb Exp $ */ +/* $OpenBSD: ec_asn1.c,v 1.59 2024/10/11 06:18:40 tb Exp $ */ /* * Written by Nils Larsch for the OpenSSL project. */ @@ -1182,11 +1182,13 @@ i2d_ECPrivateKey(EC_KEY *a, unsigned char **out) goto err; } if (!(a->enc_flag & EC_PKEY_NO_PARAMETERS)) { - if ((priv_key->parameters = ec_asn1_group2pkparameters( - a->group, priv_key->parameters)) == NULL) { + ECPKPARAMETERS *parameters; + + if ((parameters = ec_asn1_group2pkparameters(a->group, NULL)) == NULL) { ECerror(ERR_R_EC_LIB); goto err; } + priv_key->parameters = parameters; } if (!(a->enc_flag & EC_PKEY_NO_PUBKEY) && a->pub_key != NULL) { priv_key->publicKey = ASN1_BIT_STRING_new(); -- 2.20.1