diff options
Diffstat (limited to 'src/lib/libcrypto/dsa')
-rw-r--r-- | src/lib/libcrypto/dsa/dsa.h | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/dsa/dsa_depr.c | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/lib/libcrypto/dsa/dsa.h b/src/lib/libcrypto/dsa/dsa.h index 1fa5fc3132..c1ff3d7de7 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.40 2023/03/04 20:47:04 tb Exp $ */ | 1 | /* $OpenBSD: dsa.h,v 1.41 2023/04/09 19:10:23 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 | * |
@@ -165,13 +165,11 @@ DSA *d2i_DSAparams(DSA **a, const unsigned char **pp, long length); | |||
165 | int i2d_DSAparams(const DSA *a,unsigned char **pp); | 165 | int i2d_DSAparams(const DSA *a,unsigned char **pp); |
166 | extern const ASN1_ITEM DSAparams_it; | 166 | extern const ASN1_ITEM DSAparams_it; |
167 | 167 | ||
168 | /* Deprecated version */ | 168 | /* Wrapped in OPENSSL_NO_DEPRECATED in 0.9.8. Still used in 2023. */ |
169 | #ifndef OPENSSL_NO_DEPRECATED | ||
170 | DSA * DSA_generate_parameters(int bits, | 169 | DSA * DSA_generate_parameters(int bits, |
171 | unsigned char *seed,int seed_len, | 170 | unsigned char *seed,int seed_len, |
172 | int *counter_ret, unsigned long *h_ret,void | 171 | int *counter_ret, unsigned long *h_ret,void |
173 | (*callback)(int, int, void *),void *cb_arg); | 172 | (*callback)(int, int, void *),void *cb_arg); |
174 | #endif /* !defined(OPENSSL_NO_DEPRECATED) */ | ||
175 | 173 | ||
176 | /* New version */ | 174 | /* New version */ |
177 | int DSA_generate_parameters_ex(DSA *dsa, int bits, | 175 | int DSA_generate_parameters_ex(DSA *dsa, int bits, |
diff --git a/src/lib/libcrypto/dsa/dsa_depr.c b/src/lib/libcrypto/dsa/dsa_depr.c index 790db6685a..b3f7ec0413 100644 --- a/src/lib/libcrypto/dsa/dsa_depr.c +++ b/src/lib/libcrypto/dsa/dsa_depr.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: dsa_depr.c,v 1.10 2022/11/26 16:08:52 tb Exp $ */ | 1 | /* $OpenBSD: dsa_depr.c,v 1.11 2023/04/09 19:10:23 tb Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved. |
4 | * | 4 | * |
@@ -70,7 +70,6 @@ | |||
70 | 70 | ||
71 | #include "bn_local.h" | 71 | #include "bn_local.h" |
72 | 72 | ||
73 | #ifndef OPENSSL_NO_DEPRECATED | ||
74 | DSA * | 73 | DSA * |
75 | DSA_generate_parameters(int bits, unsigned char *seed_in, int seed_len, | 74 | DSA_generate_parameters(int bits, unsigned char *seed_in, int seed_len, |
76 | int *counter_ret, unsigned long *h_ret, void (*callback)(int, int, void *), | 75 | int *counter_ret, unsigned long *h_ret, void (*callback)(int, int, void *), |
@@ -91,4 +90,3 @@ DSA_generate_parameters(int bits, unsigned char *seed_in, int seed_len, | |||
91 | return NULL; | 90 | return NULL; |
92 | } | 91 | } |
93 | #endif | 92 | #endif |
94 | #endif | ||