From 952eae61d25b73a81ec28a1a1581c90cbe0ad20a Mon Sep 17 00:00:00 2001 From: tb <> Date: Sat, 11 May 2024 06:43:50 +0000 Subject: Remove unused DSA methods There are no accessors to set them, so this has been involved in a bunch of dead logic ever since we made DSA opaque a few years ago. ok jsing --- src/lib/libcrypto/dsa/dsa_gen.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) (limited to 'src/lib/libcrypto/dsa/dsa_gen.c') diff --git a/src/lib/libcrypto/dsa/dsa_gen.c b/src/lib/libcrypto/dsa/dsa_gen.c index 8b966871b4..dc04eba032 100644 --- a/src/lib/libcrypto/dsa/dsa_gen.c +++ b/src/lib/libcrypto/dsa/dsa_gen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dsa_gen.c,v 1.31 2024/03/02 09:33:14 tb Exp $ */ +/* $OpenBSD: dsa_gen.c,v 1.32 2024/05/11 06:43:50 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -75,24 +75,19 @@ int DSA_generate_parameters_ex(DSA *ret, int bits, const unsigned char *seed_in, int seed_len, int *counter_ret, unsigned long *h_ret, BN_GENCB *cb) { - if (ret->meth->dsa_paramgen) - return ret->meth->dsa_paramgen(ret, bits, seed_in, seed_len, - counter_ret, h_ret, cb); - else { - const EVP_MD *evpmd; - size_t qbits; - - if (bits >= 2048) { - qbits = 256; - evpmd = EVP_sha256(); - } else { - qbits = 160; - evpmd = EVP_sha1(); - } - - return dsa_builtin_paramgen(ret, bits, qbits, evpmd, seed_in, - seed_len, NULL, counter_ret, h_ret, cb); + const EVP_MD *evpmd; + size_t qbits; + + if (bits >= 2048) { + qbits = 256; + evpmd = EVP_sha256(); + } else { + qbits = 160; + evpmd = EVP_sha1(); } + + return dsa_builtin_paramgen(ret, bits, qbits, evpmd, seed_in, seed_len, + NULL, counter_ret, h_ret, cb); } LCRYPTO_ALIAS(DSA_generate_parameters_ex); -- cgit v1.2.3-55-g6feb