add authentication parameter to FIPS_module_mode_set

[openssl.git] / fips / fips.h

diff --git a/fips/fips.h b/fips/fips.h
index 3b679411f252ed7270e6011f5fbce282221a9d88..aaeadf5b5146b21a85461076f579212d2c91bc17 100644 (file)
--- a/fips/fips.h
+++ b/fips/fips.h
@@ -78,7 +78,10 @@ struct dh_method;
 struct CMAC_CTX_st;
 struct hmac_ctx_st;
 
-int FIPS_module_mode_set(int onoff);
+unsigned long FIPS_module_version(void);
+const char *FIPS_module_version_text(void);
+
+int FIPS_module_mode_set(int onoff, const char *auth);
 int FIPS_module_mode(void);
 const void *FIPS_rand_check(void);
 int FIPS_selftest(void);
@@ -93,12 +96,14 @@ int FIPS_selftest_des(void);
 int FIPS_selftest_rsa(void);
 int FIPS_selftest_dsa(void);
 int FIPS_selftest_ecdsa(void);
+int FIPS_selftest_ecdh(void);
 void FIPS_corrupt_drbg(void);
 void FIPS_x931_stick(void);
 void FIPS_drbg_stick(void);
 int FIPS_selftest_x931(void);
 int FIPS_selftest_hmac(void);
 int FIPS_selftest_drbg(void);
+int FIPS_selftest_drbg_all(void);
 int FIPS_selftest_cmac(void);
 
 unsigned int FIPS_incore_fingerprint(unsigned char *sig,unsigned int len);
@@ -166,6 +171,11 @@ void FIPS_get_timevec(unsigned char *buf, unsigned long *pctr);
 #define FIPS_TEST_PAIRWISE     12
 /* Continuous PRNG test */
 #define FIPS_TEST_CONTINUOUS   13
+/* ECDH test */
+#define FIPS_TEST_ECDH         14
+
+/* Minimum authorisation string length */
+#define FIPS_AUTH_MIN_LEN      16
 
 void FIPS_post_set_callback(
        int (*post_cb)(int op, int id, int subid, void *ex));
@@ -189,6 +199,8 @@ int fips_cipher_test(int id, struct evp_cipher_ctx_st *ctx,
 
 const struct env_md_st *FIPS_get_digestbynid(int nid);
 
+const struct evp_cipher_st *FIPS_get_cipherbynid(int nid);
+
 struct rsa_st *FIPS_rsa_new(void);
 void FIPS_rsa_free(struct rsa_st *r);
 int FIPS_rsa_sign_ctx(struct rsa_st *rsa, struct env_md_ctx_st *ctx,
@@ -394,8 +406,10 @@ void ERR_load_FIPS_strings(void);
 #define FIPS_F_RSA_X931_GENERATE_KEY_EX                         143
 
 /* Reason codes. */
+#define FIPS_R_ADDITIONAL_INPUT_ERROR_UNDETECTED        150
 #define FIPS_R_ADDITIONAL_INPUT_TOO_LONG                100
 #define FIPS_R_ALREADY_INSTANTIATED                     101
+#define FIPS_R_AUTHENTICATION_FAILURE                   151
 #define FIPS_R_CONTRADICTING_EVIDENCE                   102
 #define FIPS_R_DRBG_STUCK                               103
 #define FIPS_R_ENTROPY_ERROR_UNDETECTED                         104
@@ -421,12 +435,17 @@ void ERR_load_FIPS_strings(void);
 #define FIPS_R_INVALID_PARAMETERS                       144
 #define FIPS_R_IN_ERROR_STATE                           123
 #define FIPS_R_KEY_TOO_SHORT                            124
+#define FIPS_R_NONCE_ERROR_UNDETECTED                   149
 #define FIPS_R_NON_FIPS_METHOD                          125
+#define FIPS_R_NOPR_TEST1_FAILURE                       145
+#define FIPS_R_NOPR_TEST2_FAILURE                       146
 #define FIPS_R_NOT_INSTANTIATED                                 126
 #define FIPS_R_PAIRWISE_TEST_FAILED                     127
 #define FIPS_R_PERSONALISATION_ERROR_UNDETECTED                 128
 #define FIPS_R_PERSONALISATION_STRING_TOO_LONG          129
 #define FIPS_R_PRNG_STRENGTH_TOO_LOW                    143
+#define FIPS_R_PR_TEST1_FAILURE                                 147
+#define FIPS_R_PR_TEST2_FAILURE                                 148
 #define FIPS_R_REQUEST_LENGTH_ERROR_UNDETECTED          130
 #define FIPS_R_REQUEST_TOO_LARGE_FOR_DRBG               131
 #define FIPS_R_RESEED_COUNTER_ERROR                     132