sha1-x86_64.pl: harmonize Win64 SE handlers for SIMD code pathes.

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

diff --git a/crypto/rand/rand.h b/crypto/rand/rand.h
index 66e39991ec75248ab35298efeb5fdcadd5d2cf09..d446c38daf43e86908e0b1ad6f64e96755605a65 100644 (file)
--- a/crypto/rand/rand.h
+++ b/crypto/rand/rand.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);
@@ -110,6 +119,10 @@ int RAND_event(UINT, WPARAM, LPARAM);
 
 #endif
 
+#ifdef OPENSSL_FIPS
+int RAND_init_fips(void);
+#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.
@@ -119,11 +132,22 @@ 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_FIPS_X931_SET_DT                                 106
 #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
 }