From bee8e9204cf4b2cb0c53c4431da6ab1d54393c6d Mon Sep 17 00:00:00 2001
From: tb <>
Date: Mon, 14 Oct 2024 18:17:11 +0000
Subject: Make NULL checks in ec_asn1_group2curve() explicit
---
src/lib/libcrypto/ec/ec_asn1.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/lib/libcrypto/ec/ec_asn1.c b/src/lib/libcrypto/ec/ec_asn1.c
index 8d0f032907..0fe187aeb1 100644
--- a/src/lib/libcrypto/ec/ec_asn1.c
+++ b/src/lib/libcrypto/ec/ec_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_asn1.c,v 1.71 2024/10/14 12:50:18 tb Exp $ */
+/* $OpenBSD: ec_asn1.c,v 1.72 2024/10/14 18:17:11 tb Exp $ */
/*
* Written by Nils Larsch for the OpenSSL project.
*/
@@ -637,8 +637,10 @@ ec_asn1_group2curve(const EC_GROUP *group, X9_62_CURVE *curve)
BIGNUM *a = NULL, *b = NULL;
int ret = 0;
- if (!group || !curve || !curve->a || !curve->b)
- return 0;
+ if (group == NULL)
+ goto err;
+ if (curve == NULL || curve->a == NULL || curve->b == NULL)
+ goto err;
if ((a = BN_new()) == NULL || (b = BN_new()) == NULL) {
ECerror(ERR_R_MALLOC_FAILURE);
--
cgit v1.2.3-55-g6feb