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)

diff --git a/crypto/rand/rand_win.c b/crypto/rand/rand_win.c
index 3bbf73509a2d8dad732babb5790c710e71c77a53..46cbe1494c24f9c39e07ceb35246d2449f0a0705 100644 (file)
--- 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 fd830b49ee8143bb6cc181f8808f0d35b3546865..d1910071b6ae6027c77d98b0a79f5e333815041a 100644 (file)
--- 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 78a9d57820ae694be492904e6693a129a774be20..76ec0b6b7338d27c92cde0c288a15baa7fa3c5af 100644 (file)
--- 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 eadeb498e1d9873f543da5a4b7a6d9b66517464e..d0f8eabe0a34bbbd77ab0148ed7249ea613baa55 100644 (file)
--- 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