summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/dsa
diff options
context:
space:
mode:
authortb <>2024-03-02 09:33:14 +0000
committertb <>2024-03-02 09:33:14 +0000
commitb6c0d9d6fa776c06e92022915759048de477768a (patch)
tree6a1f802b5baf968b2a0d8d4f07f71fcb1917e309 /src/lib/libcrypto/dsa
parent27e901828ab79e35b7a6b736f5050679265ae63d (diff)
downloadopenbsd-b6c0d9d6fa776c06e92022915759048de477768a.tar.gz
openbsd-b6c0d9d6fa776c06e92022915759048de477768a.tar.bz2
openbsd-b6c0d9d6fa776c06e92022915759048de477768a.zip
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
Diffstat (limited to 'src/lib/libcrypto/dsa')
-rw-r--r--src/lib/libcrypto/dsa/dsa.h8
-rw-r--r--src/lib/libcrypto/dsa/dsa_gen.c23
2 files changed, 2 insertions, 29 deletions
diff --git a/src/lib/libcrypto/dsa/dsa.h b/src/lib/libcrypto/dsa/dsa.h
index 8029e7f94c..a0ef787a86 100644
--- a/src/lib/libcrypto/dsa/dsa.h
+++ b/src/lib/libcrypto/dsa/dsa.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: dsa.h,v 1.43 2023/04/18 08:47:28 tb Exp $ */ 1/* $OpenBSD: dsa.h,v 1.44 2024/03/02 09:33:14 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -163,12 +163,6 @@ DSA *d2i_DSAparams(DSA **a, const unsigned char **pp, long length);
163int i2d_DSAparams(const DSA *a,unsigned char **pp); 163int i2d_DSAparams(const DSA *a,unsigned char **pp);
164extern const ASN1_ITEM DSAparams_it; 164extern const ASN1_ITEM DSAparams_it;
165 165
166/* Wrapped in OPENSSL_NO_DEPRECATED in 0.9.8. Still used in 2023. */
167DSA * DSA_generate_parameters(int bits,
168 unsigned char *seed,int seed_len,
169 int *counter_ret, unsigned long *h_ret,void
170 (*callback)(int, int, void *),void *cb_arg);
171
172/* New version */ 166/* New version */
173int DSA_generate_parameters_ex(DSA *dsa, int bits, 167int DSA_generate_parameters_ex(DSA *dsa, int bits,
174 const unsigned char *seed,int seed_len, 168 const unsigned char *seed,int seed_len,
diff --git a/src/lib/libcrypto/dsa/dsa_gen.c b/src/lib/libcrypto/dsa/dsa_gen.c
index 490c7e51bb..8b966871b4 100644
--- a/src/lib/libcrypto/dsa/dsa_gen.c
+++ b/src/lib/libcrypto/dsa/dsa_gen.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: dsa_gen.c,v 1.30 2023/07/08 14:28:15 beck Exp $ */ 1/* $OpenBSD: dsa_gen.c,v 1.31 2024/03/02 09:33:14 tb Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -357,25 +357,4 @@ err:
357 return ok; 357 return ok;
358} 358}
359 359
360DSA *
361DSA_generate_parameters(int bits, unsigned char *seed_in, int seed_len,
362 int *counter_ret, unsigned long *h_ret, void (*callback)(int, int, void *),
363 void *cb_arg)
364{
365 BN_GENCB cb;
366 DSA *ret;
367
368 if ((ret = DSA_new()) == NULL)
369 return NULL;
370
371 BN_GENCB_set_old(&cb, callback, cb_arg);
372
373 if (DSA_generate_parameters_ex(ret, bits, seed_in, seed_len,
374 counter_ret, h_ret, &cb))
375 return ret;
376 DSA_free(ret);
377 return NULL;
378}
379LCRYPTO_ALIAS(DSA_generate_parameters);
380
381#endif 360#endif