mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2025-02-17 14:32:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

add removed functions back as deprecated

Browse Source 
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)
This commit is contained in:
Joey Yandle 2016-05-16 12:30:41 -07:00 committed by Rich Salz
parent ad0f926c9c
commit 73241290bc
4 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
crypto/rand/rand_win.c
View File

@ -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)
{

9
doc/crypto/RAND_add.pod
View File

@ -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

8
doc/crypto/rand.pod
View File

@ -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

5
include/openssl/rand.h
View File

@ -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