Commit 73241290 authored by Joey Yandle's avatar Joey Yandle Committed by Rich Salz
Browse files

add removed functions back as deprecated 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1079)
parent ad0f926c

crypto/rand/rand_win.c

+13 −0
Original line number Diff line number Diff line
@@ -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)

{

doc/crypto/RAND_add.pod

+8 −1
Original line number Diff line number Diff line
@@ -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

doc/crypto/rand.pod

+8 −0
Original line number Diff line number Diff line
@@ -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

include/openssl/rand.h

+5 −0
Original line number Diff line number Diff line
@@ -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