From 347da3c9b779633b238d09f0106558d61180c8d9 Mon Sep 17 00:00:00 2001 From: tb Date: Sat, 2 Mar 2024 09:33:14 +0000 Subject: [PATCH] Remove DSA_generate_parameters This was deprecated in 0.9.8 and used until recently by rust-openssl and by keynote (keynote has the excuse that it was written before the deprecation). Fortunately Paul Kehrer fixed this in rust-openssl, so we can garbage collect this turd. (It was replaced with the less ergonomic DSA_generate_parameters_ex() to expose a new fancy way of displaying dots, stars and pluses on key generation). ok jsing --- lib/libcrypto/Symbols.list | 1 - lib/libcrypto/Symbols.namespace | 1 - lib/libcrypto/dsa/dsa.h | 8 +------- lib/libcrypto/dsa/dsa_gen.c | 23 +---------------------- lib/libcrypto/hidden/openssl/dsa.h | 3 +-- 5 files changed, 3 insertions(+), 33 deletions(-) diff --git a/lib/libcrypto/Symbols.list b/lib/libcrypto/Symbols.list index 910a761787d..f9df2c28e7e 100644 --- a/lib/libcrypto/Symbols.list +++ b/lib/libcrypto/Symbols.list @@ -865,7 +865,6 @@ DSA_do_verify DSA_dup_DH DSA_free DSA_generate_key -DSA_generate_parameters DSA_generate_parameters_ex DSA_get0_engine DSA_get0_g diff --git a/lib/libcrypto/Symbols.namespace b/lib/libcrypto/Symbols.namespace index 3b6be84b85a..12575c11280 100644 --- a/lib/libcrypto/Symbols.namespace +++ b/lib/libcrypto/Symbols.namespace @@ -2469,7 +2469,6 @@ _libre_d2i_DSAPrivateKey _libre_i2d_DSAPrivateKey _libre_d2i_DSAparams _libre_i2d_DSAparams -_libre_DSA_generate_parameters _libre_DSA_generate_parameters_ex _libre_DSA_generate_key _libre_DSAparams_print diff --git a/lib/libcrypto/dsa/dsa.h b/lib/libcrypto/dsa/dsa.h index 8029e7f94c4..a0ef787a860 100644 --- a/lib/libcrypto/dsa/dsa.h +++ b/lib/libcrypto/dsa/dsa.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dsa.h,v 1.43 2023/04/18 08:47:28 tb Exp $ */ +/* $OpenBSD: dsa.h,v 1.44 2024/03/02 09:33:14 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -163,12 +163,6 @@ DSA *d2i_DSAparams(DSA **a, const unsigned char **pp, long length); int i2d_DSAparams(const DSA *a,unsigned char **pp); extern const ASN1_ITEM DSAparams_it; -/* Wrapped in OPENSSL_NO_DEPRECATED in 0.9.8. Still used in 2023. */ -DSA * DSA_generate_parameters(int bits, - unsigned char *seed,int seed_len, - int *counter_ret, unsigned long *h_ret,void - (*callback)(int, int, void *),void *cb_arg); - /* New version */ int DSA_generate_parameters_ex(DSA *dsa, int bits, const unsigned char *seed,int seed_len, diff --git a/lib/libcrypto/dsa/dsa_gen.c b/lib/libcrypto/dsa/dsa_gen.c index 490c7e51bbf..8b966871b4f 100644 --- a/lib/libcrypto/dsa/dsa_gen.c +++ b/lib/libcrypto/dsa/dsa_gen.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dsa_gen.c,v 1.30 2023/07/08 14:28:15 beck Exp $ */ +/* $OpenBSD: dsa_gen.c,v 1.31 2024/03/02 09:33:14 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -357,25 +357,4 @@ err: return ok; } -DSA * -DSA_generate_parameters(int bits, unsigned char *seed_in, int seed_len, - int *counter_ret, unsigned long *h_ret, void (*callback)(int, int, void *), - void *cb_arg) -{ - BN_GENCB cb; - DSA *ret; - - if ((ret = DSA_new()) == NULL) - return NULL; - - BN_GENCB_set_old(&cb, callback, cb_arg); - - if (DSA_generate_parameters_ex(ret, bits, seed_in, seed_len, - counter_ret, h_ret, &cb)) - return ret; - DSA_free(ret); - return NULL; -} -LCRYPTO_ALIAS(DSA_generate_parameters); - #endif diff --git a/lib/libcrypto/hidden/openssl/dsa.h b/lib/libcrypto/hidden/openssl/dsa.h index b2b0058cb9d..40597abb639 100644 --- a/lib/libcrypto/hidden/openssl/dsa.h +++ b/lib/libcrypto/hidden/openssl/dsa.h @@ -1,4 +1,4 @@ -/* $OpenBSD: dsa.h,v 1.1 2023/07/08 14:28:15 beck Exp $ */ +/* $OpenBSD: dsa.h,v 1.2 2024/03/02 09:33:14 tb Exp $ */ /* * Copyright (c) 2023 Bob Beck * @@ -61,7 +61,6 @@ LCRYPTO_USED(d2i_DSAPrivateKey); LCRYPTO_USED(i2d_DSAPrivateKey); LCRYPTO_USED(d2i_DSAparams); LCRYPTO_USED(i2d_DSAparams); -LCRYPTO_USED(DSA_generate_parameters); LCRYPTO_USED(DSA_generate_parameters_ex); LCRYPTO_USED(DSA_generate_key); LCRYPTO_USED(DSAparams_print); -- 2.20.1