X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=fips%2Ffips.h;h=921591ba98313d813d5b3fe5c075d68094e70e9d;hp=64115da2d6a120b93a194c812a94fbbf1b0396f8;hb=8cf88778ea1fe21bcbb16be778c79e418a3fbdd0;hpb=25c6542944821afc0693ca7027c769cc8775e90d

diff --git a/fips/fips.h b/fips/fips.h
index 64115da2d6..921591ba98 100644
--- a/fips/fips.h
+++ b/fips/fips.h
@@ -75,6 +75,8 @@ void FIPS_selftest_check(void);
 void FIPS_corrupt_sha1(void);
 int FIPS_selftest_sha1(void);
 void FIPS_corrupt_aes(void);
+int FIPS_selftest_aes_gcm(void);
+void FIPS_corrupt_aes_gcm(void);
 int FIPS_selftest_aes(void);
 void FIPS_corrupt_des(void);
 int FIPS_selftest_des(void);
@@ -84,10 +86,16 @@ int FIPS_selftest_rsa(void);
 void FIPS_corrupt_dsa(void);
 void FIPS_corrupt_dsa_keygen(void);
 int FIPS_selftest_dsa(void);
+int FIPS_selftest_ecdsa(void);
+void FIPS_corrupt_ecdsa(void);
+void FIPS_corrupt_ec_keygen(void);
 void FIPS_corrupt_rng(void);
+void FIPS_corrupt_drbg(void);
 void FIPS_rng_stick(void);
 int FIPS_selftest_rng(void);
 int FIPS_selftest_hmac(void);
+int FIPS_selftest_drbg(void);
+int FIPS_selftest_cmac(void);
 
 unsigned int FIPS_incore_fingerprint(unsigned char *sig,unsigned int len);
 int FIPS_check_incore_fingerprint(void);
@@ -114,6 +122,10 @@ void FIPS_set_locking_callbacks(void (*func)(int mode, int type,
 				int (*add_cb)(int *pointer, int amount,
 					int type, const char *file, int line));
 
+void FIPS_set_malloc_callbacks(
+		void *(*malloc_cb)(int num, const char *file, int line),
+		void (*free_cb)(void *));
+
 #define FIPS_ERROR_IGNORED(alg) OpenSSLDie(__FILE__, __LINE__, \
 		alg " previous FIPS forbidden algorithm error ignored");
 
@@ -152,6 +164,8 @@ void FIPS_set_locking_callbacks(void (*func)(int mode, int type,
 #define EVP_CIPHER_CTX_ctrl FIPS_cipher_ctx_ctrl
 #define EVP_CIPHER_CTX_new FIPS_cipher_ctx_new
 #define EVP_CIPHER_CTX_free FIPS_cipher_ctx_free
+#define EVP_CIPHER_CTX_copy FIPS_cipher_ctx_copy
+#define EVP_CIPHER_CTX_set_key_length FIPS_cipher_ctx_set_key_length
 
 #define DSA_SIG_new FIPS_dsa_sig_new
 #define DSA_SIG_free FIPS_dsa_sig_free
@@ -160,6 +174,7 @@ void FIPS_set_locking_callbacks(void (*func)(int mode, int type,
 #define ECDSA_SIG_free FIPS_ecdsa_sig_free
 
 #define ecdsa_check fips_ecdsa_check
+#define ecdh_check fips_ecdh_check
 
 #endif
 
@@ -180,16 +195,28 @@ void ERR_load_FIPS_strings(void);
 #define FIPS_F_EVP_CIPHERINIT_EX			 124
 #define FIPS_F_EVP_DIGESTINIT_EX			 125
 #define FIPS_F_FIPS_CHECK_DSA				 104
+#define FIPS_F_FIPS_CHECK_EC				 129
 #define FIPS_F_FIPS_CHECK_INCORE_FINGERPRINT		 105
 #define FIPS_F_FIPS_CHECK_RSA				 106
 #define FIPS_F_FIPS_CIPHERINIT				 128
 #define FIPS_F_FIPS_DIGESTINIT				 127
+#define FIPS_F_FIPS_DRBG_GENERATE			 132
+#define FIPS_F_FIPS_DRBG_GENERATE_INTERNAL		 138
+#define FIPS_F_FIPS_DRBG_HEALTH_CHECK			 137
+#define FIPS_F_FIPS_DRBG_INIT				 136
+#define FIPS_F_FIPS_DRBG_INSTANTIATE			 133
+#define FIPS_F_FIPS_DRBG_NEW				 134
+#define FIPS_F_FIPS_DRBG_RESEED				 135
+#define FIPS_F_FIPS_DRBG_SINGLE_KAT			 140
 #define FIPS_F_FIPS_DSA_CHECK				 107
 #define FIPS_F_FIPS_MODE_SET				 108
 #define FIPS_F_FIPS_PKEY_SIGNATURE_TEST			 109
 #define FIPS_F_FIPS_SELFTEST_AES			 110
+#define FIPS_F_FIPS_SELFTEST_AES_GCM			 130
+#define FIPS_F_FIPS_SELFTEST_CMAC			 139
 #define FIPS_F_FIPS_SELFTEST_DES			 111
 #define FIPS_F_FIPS_SELFTEST_DSA			 112
+#define FIPS_F_FIPS_SELFTEST_ECDSA			 131
 #define FIPS_F_FIPS_SELFTEST_HMAC			 113
 #define FIPS_F_FIPS_SELFTEST_RNG			 114
 #define FIPS_F_FIPS_SELFTEST_SHA1			 115
@@ -203,23 +230,48 @@ void ERR_load_FIPS_strings(void);
 #define FIPS_F_SSLEAY_RAND_BYTES			 122
 
 /* Reason codes. */
+#define FIPS_R_ADDITIONAL_INPUT_TOO_LONG		 118
+#define FIPS_R_ALREADY_INSTANTIATED			 119
 #define FIPS_R_CANNOT_READ_EXE				 103
 #define FIPS_R_CANNOT_READ_EXE_DIGEST			 104
 #define FIPS_R_CONTRADICTING_EVIDENCE			 114
+#define FIPS_R_DRBG_STUCK				 142
+#define FIPS_R_ENTROPY_ERROR_UNDETECTED			 133
+#define FIPS_R_ENTROPY_NOT_REQUESTED_FOR_RESEED		 134
+#define FIPS_R_ERROR_INITIALISING_DRBG			 120
+#define FIPS_R_ERROR_INSTANTIATING_DRBG			 121
+#define FIPS_R_ERROR_RETRIEVING_ENTROPY			 122
+#define FIPS_R_ERROR_RETRIEVING_NONCE			 123
 #define FIPS_R_EXE_DIGEST_DOES_NOT_MATCH		 105
 #define FIPS_R_FINGERPRINT_DOES_NOT_MATCH		 110
 #define FIPS_R_FINGERPRINT_DOES_NOT_MATCH_NONPIC_RELOCATED 111
 #define FIPS_R_FINGERPRINT_DOES_NOT_MATCH_SEGMENT_ALIASING 112
 #define FIPS_R_FIPS_MODE_ALREADY_SET			 102
 #define FIPS_R_FIPS_SELFTEST_FAILED			 106
+#define FIPS_R_FUNCTION_ERROR				 135
+#define FIPS_R_GENERATE_ERROR				 124
+#define FIPS_R_GENERATE_ERROR_UNDETECTED		 136
+#define FIPS_R_INSTANTIATE_ERROR			 125
+#define FIPS_R_INSUFFICIENT_SECURITY_STRENGTH		 132
 #define FIPS_R_INVALID_KEY_LENGTH			 109
+#define FIPS_R_IN_ERROR_STATE				 126
 #define FIPS_R_KEY_TOO_SHORT				 108
 #define FIPS_R_NON_FIPS_METHOD				 100
+#define FIPS_R_NOT_INSTANTIATED				 127
 #define FIPS_R_PAIRWISE_TEST_FAILED			 107
+#define FIPS_R_PERSONALISATION_ERROR_UNDETECTED		 137
+#define FIPS_R_PERSONALISATION_STRING_TOO_LONG		 128
+#define FIPS_R_REQUEST_LENGTH_ERROR_UNDETECTED		 138
+#define FIPS_R_REQUEST_TOO_LARGE_FOR_DRBG		 129
+#define FIPS_R_RESEED_COUNTER_ERROR			 139
+#define FIPS_R_RESEED_ERROR				 130
 #define FIPS_R_RSA_DECRYPT_ERROR			 115
 #define FIPS_R_RSA_ENCRYPT_ERROR			 116
 #define FIPS_R_SELFTEST_FAILED				 101
+#define FIPS_R_STRENGTH_ERROR_UNDETECTED		 140
 #define FIPS_R_TEST_FAILURE				 117
+#define FIPS_R_UNINSTANTIATE_ZEROISE_ERROR		 141
+#define FIPS_R_UNSUPPORTED_DRBG_TYPE			 131
 #define FIPS_R_UNSUPPORTED_PLATFORM			 113
 
 #ifdef  __cplusplus