From e187598b3af245fef99788faf28736cce0498577 Mon Sep 17 00:00:00 2001
From: tb <>
Date: Fri, 10 May 2024 04:53:55 +0000
Subject: Inline dsa_builtin_keygen() in DSA_generate_key()

ok djm
---
 src/lib/libcrypto/dsa/dsa_key.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/lib/libcrypto/dsa/dsa_key.c b/src/lib/libcrypto/dsa/dsa_key.c
index 431748ab75..46ec9cfce9 100644
--- a/src/lib/libcrypto/dsa/dsa_key.c
+++ b/src/lib/libcrypto/dsa/dsa_key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsa_key.c,v 1.35 2023/08/03 18:53:55 tb Exp $ */
+/* $OpenBSD: dsa_key.c,v 1.36 2024/05/10 04:53:55 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -69,24 +69,16 @@
 #include "bn_local.h"
 #include "dsa_local.h"
 
-static int dsa_builtin_keygen(DSA *dsa);
-
 int
 DSA_generate_key(DSA *dsa)
-{
-	if (dsa->meth->dsa_keygen)
-		return dsa->meth->dsa_keygen(dsa);
-	return dsa_builtin_keygen(dsa);
-}
-LCRYPTO_ALIAS(DSA_generate_key);
-
-static int
-dsa_builtin_keygen(DSA *dsa)
 {
 	BIGNUM *pub_key = NULL, *priv_key = NULL;
 	BN_CTX *ctx = NULL;
 	int ok = 0;
 
+	if (dsa->meth->dsa_keygen != NULL)
+		return dsa->meth->dsa_keygen(dsa);
+
 	if ((priv_key = BN_new()) == NULL)
 		goto err;
 	if ((pub_key = BN_new()) == NULL)
@@ -117,4 +109,6 @@ dsa_builtin_keygen(DSA *dsa)
 
 	return ok;
 }
+LCRYPTO_ALIAS(DSA_generate_key);
+
 #endif
-- 
cgit v1.2.3-55-g6feb