summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2024-10-11 06:18:40 +0000
committertb <>2024-10-11 06:18:40 +0000
commitbb3fdb807ea088e740438f0e8ec3d252b591570b (patch)
tree8f6e02bd23b6df9e4fa3df82ab9ea1f2d7cbc324 /src
parentf8ad3a37492a13165ccab6bc62ca867432fbd88f (diff)
downloadopenbsd-bb3fdb807ea088e740438f0e8ec3d252b591570b.tar.gz
openbsd-bb3fdb807ea088e740438f0e8ec3d252b591570b.tar.bz2
openbsd-bb3fdb807ea088e740438f0e8ec3d252b591570b.zip
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
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/ec/ec_asn1.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/libcrypto/ec/ec_asn1.c b/src/lib/libcrypto/ec/ec_asn1.c
index d6b92fb16d..d471d2dff4 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.58 2024/10/11 06:13:09 tb Exp $ */ 1/* $OpenBSD: ec_asn1.c,v 1.59 2024/10/11 06:18:40 tb Exp $ */
2/* 2/*
3 * Written by Nils Larsch for the OpenSSL project. 3 * Written by Nils Larsch for the OpenSSL project.
4 */ 4 */
@@ -1182,11 +1182,13 @@ i2d_ECPrivateKey(EC_KEY *a, unsigned char **out)
1182 goto err; 1182 goto err;
1183 } 1183 }
1184 if (!(a->enc_flag & EC_PKEY_NO_PARAMETERS)) { 1184 if (!(a->enc_flag & EC_PKEY_NO_PARAMETERS)) {
1185 if ((priv_key->parameters = ec_asn1_group2pkparameters( 1185 ECPKPARAMETERS *parameters;
1186 a->group, priv_key->parameters)) == NULL) { 1186
1187 if ((parameters = ec_asn1_group2pkparameters(a->group, NULL)) == NULL) {
1187 ECerror(ERR_R_EC_LIB); 1188 ECerror(ERR_R_EC_LIB);
1188 goto err; 1189 goto err;
1189 } 1190 }
1191 priv_key->parameters = parameters;
1190 } 1192 }
1191 if (!(a->enc_flag & EC_PKEY_NO_PUBKEY) && a->pub_key != NULL) { 1193 if (!(a->enc_flag & EC_PKEY_NO_PUBKEY) && a->pub_key != NULL) {
1192 priv_key->publicKey = ASN1_BIT_STRING_new(); 1194 priv_key->publicKey = ASN1_BIT_STRING_new();