From: tb <tb@openbsd.org>
Date: Mon, 3 Jul 2023 11:06:28 +0000 (+0000)
Subject: sign_setup: split another check into two
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=492aa073e72ac8a2ddc9d3a205a9235d6d71b030;p=openbsd

sign_setup: split another check into two
---

diff --git a/lib/libcrypto/ecdsa/ecs_ossl.c b/lib/libcrypto/ecdsa/ecs_ossl.c
index 441033e5cdb..73aed6eb62f 100644
--- a/lib/libcrypto/ecdsa/ecs_ossl.c
+++ b/lib/libcrypto/ecdsa/ecs_ossl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecs_ossl.c,v 1.57 2023/07/03 10:21:25 tb Exp $ */
+/* $OpenBSD: ecs_ossl.c,v 1.58 2023/07/03 11:06:28 tb Exp $ */
 /*
  * Written by Nils Larsch for the OpenSSL project
  */
@@ -140,7 +140,11 @@ ossl_ecdsa_sign_setup(EC_KEY *eckey, BN_CTX *in_ctx, BIGNUM **out_kinv,
 	BN_free(*out_r);
 	*out_r = NULL;
 
-	if (eckey == NULL || (group = EC_KEY_get0_group(eckey)) == NULL) {
+	if (eckey == NULL) {
+		ECDSAerror(ERR_R_PASSED_NULL_PARAMETER);
+		goto err;
+	}
+	if ((group = EC_KEY_get0_group(eckey)) == NULL) {
 		ECDSAerror(ERR_R_PASSED_NULL_PARAMETER);
 		goto err;
 	}