Fix warnings.

[openssl.git] / crypto / rand / rand.h

diff --git a/crypto/rand/rand.h b/crypto/rand/rand.h
index 7baac68ee52af637f1ffa17b45c05ee41b6854a6..971880edaa2a3d46790a0461d46ff017ab696625 100644 (file)
--- a/crypto/rand/rand.h
+++ b/crypto/rand/rand.h
@@ -65,47 +65,66 @@ 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);
+       int (*status)(void);
        } RAND_METHOD;
 
-#ifndef NOPROTO
+#ifdef BN_DEBUG
+extern int rand_predictable;
+#endif
+
 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);
-#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();
+const char *RAND_file_name(char *file,int num);
+int RAND_status(void);
+int RAND_egd(const char *path);
+int RAND_egd_bytes(const char *path,int bytes);
+void ERR_load_RAND_strings(void);
+int RAND_poll(void);
+
+#ifdef  __cplusplus
+}
 #endif
+
+#if defined(WINDOWS) || defined(WIN32)
+#include <windows.h>
+
+#ifdef  __cplusplus
+extern "C" {
 #endif
 
+void RAND_screen(void);
+int RAND_event(UINT, WPARAM, LPARAM);
+
 #ifdef  __cplusplus
 }
 #endif
+#endif
+
+/* 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
 
 #endif
+