From 96a1e660b2205dd364475572ad5939f41dbf268e Mon Sep 17 00:00:00 2001
From: tb <>
Date: Wed, 22 Jan 2025 09:39:56 +0000
Subject: BN_mod_mul_reciprocal: remove y == NULL complication

No caller ever passes y == NULL, so remove the corresponding contortions
and unindent the relevant bits.

ok jsing
---
 src/lib/libcrypto/bn/bn_recp.c | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/lib/libcrypto/bn/bn_recp.c b/src/lib/libcrypto/bn/bn_recp.c
index e7484f9f4b..8dd6b8af65 100644
--- a/src/lib/libcrypto/bn/bn_recp.c
+++ b/src/lib/libcrypto/bn/bn_recp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bn_recp.c,v 1.26 2025/01/21 15:44:22 tb Exp $ */
+/* $OpenBSD: bn_recp.c,v 1.27 2025/01/22 09:39:56 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -225,30 +225,27 @@ err:
 	return ret;
 }
 
+/* Compute r = (x * y) % m. */
 int
 BN_mod_mul_reciprocal(BIGNUM *r, const BIGNUM *x, const BIGNUM *y,
     BN_RECP_CTX *recp, BN_CTX *ctx)
 {
 	int ret = 0;
 	BIGNUM *a;
-	const BIGNUM *ca;
 
 	BN_CTX_start(ctx);
 	if ((a = BN_CTX_get(ctx)) == NULL)
 		goto err;
-	if (y != NULL) {
-		if (x == y) {
-			if (!BN_sqr(a, x, ctx))
-				goto err;
-		} else {
-			if (!BN_mul(a, x, y, ctx))
-				goto err;
-		}
-		ca = a;
-	} else
-		ca = x; /* Just do the mod */
 
-	ret = BN_div_recp(NULL, r, ca, recp, ctx);
+	if (x == y) {
+		if (!BN_sqr(a, x, ctx))
+			goto err;
+	} else {
+		if (!BN_mul(a, x, y, ctx))
+			goto err;
+	}
+
+	ret = BN_div_recp(NULL, r, a, recp, ctx);
 
 err:
 	BN_CTX_end(ctx);
-- 
cgit v1.2.3-55-g6feb