diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-11-20 10:08:03 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-12-04 20:44:24 +0100 |
| commit | 00639486b0ab66d9cd89ab47fc56a3ac6cb40084 (patch) | |
| tree | d35bdba700b288b324db6aa413b1e602710e5a0b | |
| parent | be8e9b39a32d6eae59f8b7eab48e9535bd4e9bb2 (diff) | |
| download | openssl-00639486b0ab66d9cd89ab47fc56a3ac6cb40084.tar.gz | |
Switch deprecation method for RAND
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
(Merged from https://github.com/openssl/openssl/pull/13460)
| -rw-r--r-- | include/openssl/rand.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/include/openssl/rand.h b/include/openssl/rand.h index 73eefd5c14..2570b8463e 100644 --- a/include/openssl/rand.h +++ b/include/openssl/rand.h @@ -64,8 +64,9 @@ int RAND_priv_bytes_ex(OSSL_LIB_CTX *ctx, unsigned char *buf, int num); /* Equivalent of RAND_bytes() but additionally taking an OSSL_LIB_CTX */ int RAND_bytes_ex(OSSL_LIB_CTX *ctx, unsigned char *buf, int num); - -DEPRECATEDIN_1_1_0(int RAND_pseudo_bytes(unsigned char *buf, int num)) +# ifndef OPENSSL_NO_DEPRECATED_1_1_0 +OSSL_DEPRECATEDIN_1_1_0 int RAND_pseudo_bytes(unsigned char *buf, int num); +# endif EVP_RAND_CTX *RAND_get0_primary(OSSL_LIB_CTX *ctx); EVP_RAND_CTX *RAND_get0_public(OSSL_LIB_CTX *ctx); @@ -93,8 +94,10 @@ int RAND_poll(void); # if defined(_WIN32) && (defined(BASETYPES) || defined(_WINDEF_H)) /* application has to include <windows.h> in order to use these */ -DEPRECATEDIN_1_1_0(void RAND_screen(void)) -DEPRECATEDIN_1_1_0(int RAND_event(UINT, WPARAM, LPARAM)) +# ifndef OPENSSL_NO_DEPRECATED_1_1_0 +OSSL_DEPRECATEDIN_1_1_0 void RAND_screen(void); +OSSL_DEPRECATEDIN_1_1_0 int RAND_event(UINT, WPARAM, LPARAM); +# endif # endif #ifdef __cplusplus |