X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Frand%2Frand.h;h=28f45ec05269965e4a9b37819b16787016932a7d;hb=8d5b4ee1cab7cd02f9fe246fb60d7d018a315a86;hp=7baac68ee52af637f1ffa17b45c05ee41b6854a6;hpb=bf5dcd135fb77dc23d8566b6456317a10e806b7d;p=oweals%2Fopenssl.git

diff --git a/crypto/rand/rand.h b/crypto/rand/rand.h
index 7baac68ee5..28f45ec052 100644
--- a/crypto/rand/rand.h
+++ b/crypto/rand/rand.h
@@ -65,47 +65,46 @@ extern "C" {
 
 typedef struct rand_meth_st
 	{
-#ifndef NOPROTO
 	void (*seed)(const void *buf, int num);
-	void (*bytes)(unsigned char *buf, int num);
+	int (*bytes)(unsigned char *buf, int num);
 	void (*cleanup)(void);
-#else
-	void (*seed)();
-	void (*bytes)();
-	void (*cleanup)();
-#endif
+	void (*add)(const void *buf, int num, double entropy);
+	int (*pseudorand)(unsigned char *buf, int num);
 	} RAND_METHOD;
 
-#ifndef NOPROTO
 void RAND_set_rand_method(RAND_METHOD *meth);
 RAND_METHOD *RAND_get_rand_method(void );
 RAND_METHOD *RAND_SSLeay(void);
 void RAND_cleanup(void );
-void RAND_bytes(unsigned char *buf,int num);
+int  RAND_bytes(unsigned char *buf,int num);
+int  RAND_pseudo_bytes(unsigned char *buf,int num);
 void RAND_seed(const void *buf,int num);
+void RAND_add(const void *buf,int num,double entropy);
 int  RAND_load_file(const char *file,long max_bytes);
 int  RAND_write_file(const char *file);
-char *RAND_file_name(char *file,int num);
+const char *RAND_file_name(char *file,int num);
+int RAND_status(void);
+int RAND_egd(const char *path);
 #ifdef WINDOWS
 void RAND_screen(void);
 #endif
-#else
-void RAND_set_rand_method();
-RAND_METHOD *RAND_get_rand_method();
-RAND_METHOD *RAND_SSLeay();
-void RAND_cleanup();
-void RAND_bytes();
-void RAND_seed();
-int  RAND_load_file();
-int  RAND_write_file();
-char *RAND_file_name();
-#ifdef WINDOWS
-void RAND_screen();
-#endif
-#endif
+void	ERR_load_RAND_strings(void);
+
+/* BEGIN ERROR CODES */
+/* The following lines are auto generated by the script mkerr.pl. Any changes
+ * made after this point may be overwritten when the script is next run.
+ */
+
+/* Error codes for the RAND functions. */
+
+/* Function codes. */
+#define RAND_F_SSLEAY_RAND_BYTES			 100
+
+/* Reason codes. */
+#define RAND_R_PRNG_NOT_SEEDED				 100
 
 #ifdef  __cplusplus
 }
 #endif
-
 #endif
+