diff options
author | Joey Yandle <xoloki@gmail.com> | 2016-05-16 12:30:41 -0700 |
---|---|---|
committer | Rich Salz <rsalz@openssl.org> | 2016-05-29 13:36:59 -0400 |
commit | 73241290bc15d708bb9ec8bb48891df1e5485e3e (patch) | |
tree | e1f4d1004d2071a8027ecfaebe1eecd5141b8468 | |
parent | ad0f926c9c556b5369ce98aa128e4db4463ac12d (diff) | |
download | openssl-73241290bc15d708bb9ec8bb48891df1e5485e3e.tar.gz |
add removed functions back as deprecated
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1079)
-rw-r--r-- | crypto/rand/rand_win.c | 13 | ||||
-rw-r--r-- | doc/crypto/RAND_add.pod | 9 | ||||
-rw-r--r-- | doc/crypto/rand.pod | 8 | ||||
-rw-r--r-- | include/openssl/rand.h | 5 |
4 files changed, 34 insertions, 1 deletions
diff --git a/crypto/rand/rand_win.c b/crypto/rand/rand_win.c index 3bbf73509a..46cbe1494c 100644 --- a/crypto/rand/rand_win.c +++ b/crypto/rand/rand_win.c @@ -65,6 +65,19 @@ int RAND_poll(void) return (1); } +#if OPENSSL_API_COMPAT < 0x00101000L +int RAND_event(UINT iMsg, WPARAM wParam, LPARAM lParam) +{ + RAND_poll(); + return RAND_status(); +} + +void RAND_screen(void) +{ + RAND_poll(); +} +#endif + /* feed timing information to the PRNG */ static void readtimer(void) { diff --git a/doc/crypto/RAND_add.pod b/doc/crypto/RAND_add.pod index fd830b49ee..d1910071b6 100644 --- a/doc/crypto/RAND_add.pod +++ b/doc/crypto/RAND_add.pod @@ -2,7 +2,7 @@ =head1 NAME -RAND_add, RAND_seed, RAND_status - add +RAND_add, RAND_seed, RAND_status, RAND_event, RAND_screen - add entropy to the PRNG =head1 SYNOPSIS @@ -15,6 +15,9 @@ entropy to the PRNG int RAND_status(void); + int RAND_event(UINT iMsg, WPARAM wParam, LPARAM lParam); + void RAND_screen(void); + =head1 DESCRIPTION RAND_add() mixes the B<num> bytes at B<buf> into the PRNG state. Thus, @@ -44,6 +47,10 @@ RAND_seed() is equivalent to RAND_add() when B<num == entropy>. RAND_status() returns 1 if the PRNG has been seeded with enough data, 0 otherwise. +RAND_event() calls RAND_poll() and returns RAND_seed(). + +RAND_screen calls RAND_poll(). + The other functions do not return values. =head1 SEE ALSO diff --git a/doc/crypto/rand.pod b/doc/crypto/rand.pod index 78a9d57820..76ec0b6b73 100644 --- a/doc/crypto/rand.pod +++ b/doc/crypto/rand.pod @@ -33,6 +33,14 @@ Deprecated: void RAND_cleanup(void) #endif +/* For Win32 only */ + + #if OPENSSL_API_COMPAT < 0x10100000L + void RAND_screen(void); + int RAND_event(UINT, WPARAM, LPARAM); + #endif + + =head1 DESCRIPTION Since the introduction of the ENGINE API, the recommended way of controlling diff --git a/include/openssl/rand.h b/include/openssl/rand.h index eadeb498e1..d0f8eabe0a 100644 --- a/include/openssl/rand.h +++ b/include/openssl/rand.h @@ -65,6 +65,11 @@ int RAND_egd_bytes(const char *path, int bytes); # endif int RAND_poll(void); +#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32) +DEPRECATEDIN_1_1_0(void RAND_screen(void)) +DEPRECATEDIN_1_1_0(int RAND_event(UINT, WPARAM, LPARAM)) +#endif + /* BEGIN ERROR CODES */ /* * The following lines are auto generated by the script mkerr.pl. Any changes |