add new RAND errors

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

diff --git a/crypto/rand/rand.h b/crypto/rand/rand.h
index b2f6146a0e17695c3efd72f0f50ea21f60a5846f..7a3a79b44f02ed9b822581c2266fabd2076b0259 100644 (file)
--- a/crypto/rand/rand.h
+++ b/crypto/rand/rand.h
@@ -61,7 +61,7 @@
 
 #include <stdlib.h>
 #include <openssl/ossl_typ.h>
-#include <openssl/opensslconf.h>
+#include <openssl/e_os2.h>
 
 #if defined(OPENSSL_SYS_WINDOWS)
 #include <windows.h>
@@ -71,15 +71,22 @@
 extern "C" {
 #endif
 
-typedef struct rand_meth_st
+#if defined(OPENSSL_FIPS)
+#define FIPS_RAND_SIZE_T size_t
+#endif
+
+/* Already defined in ossl_typ.h */
+/* typedef struct rand_meth_st RAND_METHOD; */
+
+struct rand_meth_st
        {
-       void (*seed)(const void *buf, int num);
+       int (*seed)(const void *buf, int num);
        int (*bytes)(unsigned char *buf, int num);
        void (*cleanup)(void);
-       void (*add)(const void *buf, int num, double entropy);
+       int (*add)(const void *buf, int num, double entropy);
        int (*pseudorand)(unsigned char *buf, int num);
        int (*status)(void);
-       } RAND_METHOD;
+       };
 
 #ifdef BN_DEBUG
 extern int rand_predictable;
@@ -87,7 +94,9 @@ extern int rand_predictable;
 
 int RAND_set_rand_method(const RAND_METHOD *meth);
 const RAND_METHOD *RAND_get_rand_method(void);
+#ifndef OPENSSL_NO_ENGINE
 int RAND_set_rand_engine(ENGINE *engine);
+#endif
 RAND_METHOD *RAND_SSLeay(void);
 void RAND_cleanup(void );
 int  RAND_bytes(unsigned char *buf,int num);
@@ -103,7 +112,7 @@ int RAND_egd(const char *path);
 int RAND_egd_bytes(const char *path,int bytes);
 int RAND_poll(void);
 
-#if defined(OPENSSL_SYS_WINDOWS)
+#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_WIN32)
 
 void RAND_screen(void);
 int RAND_event(UINT, WPARAM, LPARAM);
@@ -119,11 +128,21 @@ void ERR_load_RAND_strings(void);
 /* Error codes for the RAND functions. */
 
 /* Function codes. */
+#define RAND_F_FIPS_RAND                                102
+#define RAND_F_FIPS_RAND_SET_DT                                 103
+#define RAND_F_FIPS_SET_PRNG_SEED                       104
+#define RAND_F_FIPS_SET_TEST_MODE                       105
 #define RAND_F_RAND_GET_RAND_METHOD                     101
 #define RAND_F_SSLEAY_RAND_BYTES                        100
 
 /* Reason codes. */
+#define RAND_R_NOT_IN_TEST_MODE                                 101
+#define RAND_R_NO_KEY_SET                               102
+#define RAND_R_PRNG_ERROR                               103
+#define RAND_R_PRNG_KEYED                               104
 #define RAND_R_PRNG_NOT_SEEDED                          100
+#define RAND_R_PRNG_SEED_MUST_NOT_MATCH_KEY             105
+#define RAND_R_PRNG_STUCK                               106
 
 #ifdef  __cplusplus
 }