diff options
Diffstat (limited to 'src/lib/libcrypto/rsa')
-rw-r--r-- | src/lib/libcrypto/rsa/rsa.h | 9 | ||||
-rw-r--r-- | src/lib/libcrypto/rsa/rsa_depr.c | 5 |
2 files changed, 6 insertions, 8 deletions
diff --git a/src/lib/libcrypto/rsa/rsa.h b/src/lib/libcrypto/rsa/rsa.h index 73ec9d5a42..fa98f9cf76 100644 --- a/src/lib/libcrypto/rsa/rsa.h +++ b/src/lib/libcrypto/rsa/rsa.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: rsa.h,v 1.58 2022/07/12 14:42:50 kn Exp $ */ | 1 | /* $OpenBSD: rsa.h,v 1.59 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 | * |
@@ -240,11 +240,12 @@ RSA *RSA_new_method(ENGINE *engine); | |||
240 | int RSA_bits(const RSA *rsa); | 240 | int RSA_bits(const RSA *rsa); |
241 | int RSA_size(const RSA *rsa); | 241 | int RSA_size(const RSA *rsa); |
242 | 242 | ||
243 | /* Deprecated version */ | 243 | /* |
244 | #ifndef OPENSSL_NO_DEPRECATED | 244 | * Wrapped in OPENSSL_NO_DEPRECATED in 0.9.8. Still used for libressl bindings |
245 | * in rust-openssl. | ||
246 | */ | ||
245 | RSA *RSA_generate_key(int bits, unsigned long e, | 247 | RSA *RSA_generate_key(int bits, unsigned long e, |
246 | void (*callback)(int, int, void *), void *cb_arg); | 248 | void (*callback)(int, int, void *), void *cb_arg); |
247 | #endif /* !defined(OPENSSL_NO_DEPRECATED) */ | ||
248 | 249 | ||
249 | /* New version */ | 250 | /* New version */ |
250 | int RSA_generate_key_ex(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb); | 251 | int RSA_generate_key_ex(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb); |
diff --git a/src/lib/libcrypto/rsa/rsa_depr.c b/src/lib/libcrypto/rsa/rsa_depr.c index 8a432b348b..2d8d55a693 100644 --- a/src/lib/libcrypto/rsa/rsa_depr.c +++ b/src/lib/libcrypto/rsa/rsa_depr.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: rsa_depr.c,v 1.10 2022/11/26 16:08:54 tb Exp $ */ | 1 | /* $OpenBSD: rsa_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 | * |
@@ -66,8 +66,6 @@ | |||
66 | 66 | ||
67 | #include "bn_local.h" | 67 | #include "bn_local.h" |
68 | 68 | ||
69 | #ifndef OPENSSL_NO_DEPRECATED | ||
70 | |||
71 | RSA * | 69 | RSA * |
72 | RSA_generate_key(int bits, unsigned long e_value, | 70 | RSA_generate_key(int bits, unsigned long e_value, |
73 | void (*callback)(int, int, void *), void *cb_arg) | 71 | void (*callback)(int, int, void *), void *cb_arg) |
@@ -100,4 +98,3 @@ err: | |||
100 | 98 | ||
101 | return 0; | 99 | return 0; |
102 | } | 100 | } |
103 | #endif | ||