X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=fips%2Ffips.h;h=8f94167ee0063b14fef780892c730cfa6f404a10;hp=e0a0247ba69ba30cd9ec0f196bfd422acbea87ee;hb=de2132de937217353d0a4a0aafa087d263a23ba0;hpb=644ce07ecdec4e1a547f142bccc250ef6fd8a0af diff --git a/fips/fips.h b/fips/fips.h index e0a0247ba6..8f94167ee0 100644 --- a/fips/fips.h +++ b/fips/fips.h @@ -72,6 +72,14 @@ struct env_md_st; struct env_md_ctx_st; struct evp_cipher_st; struct evp_cipher_ctx_st; +struct ec_method_st; +struct ecdsa_method; +struct dh_method; +struct CMAC_CTX_st; +struct hmac_ctx_st; + +unsigned long FIPS_module_version(void); +const char *FIPS_module_version_text(void); int FIPS_module_mode_set(int onoff); int FIPS_module_mode(void); @@ -207,7 +215,7 @@ int FIPS_rsa_verify_digest(struct rsa_st *rsa, const struct env_md_st *mgf1Hash, const unsigned char *sigbuf, unsigned int siglen); -#ifndef OPENSSL_FIPSCANISTER +#ifdef OPENSSL_FIPSCAPABLE int FIPS_digestinit(EVP_MD_CTX *ctx, const EVP_MD *type); int FIPS_digestupdate(EVP_MD_CTX *ctx, const void *data, size_t count); @@ -261,6 +269,7 @@ const EVP_CIPHER *FIPS_evp_des_ede_cbc(void); const EVP_CIPHER *FIPS_evp_des_ede_cfb64(void); const EVP_CIPHER *FIPS_evp_des_ede_ecb(void); const EVP_CIPHER *FIPS_evp_des_ede_ofb(void); +const EVP_CIPHER *FIPS_evp_enc_null(void); const EVP_MD *FIPS_evp_sha1(void); const EVP_MD *FIPS_evp_sha224(void); const EVP_MD *FIPS_evp_sha256(void); @@ -273,60 +282,45 @@ const EVP_MD *FIPS_evp_ecdsa(void); const RSA_METHOD *FIPS_rsa_pkcs1_ssleay(void); int FIPS_rsa_generate_key_ex(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb); -#endif - -/* Where necessary redirect standard OpenSSL APIs to FIPS versions */ - -#if defined(OPENSSL_FIPSCANISTER) && defined(OPENSSL_FIPSAPI) - -#define CRYPTO_lock FIPS_lock -#define CRYPTO_add_lock FIPS_add_lock -#define CRYPTO_malloc FIPS_malloc -#define CRYPTO_free FIPS_free - -#define ERR_put_error FIPS_put_error -#define ERR_add_error_data FIPS_add_error_data - -#define EVP_MD_CTX_init FIPS_md_ctx_init -#define EVP_MD_CTX_cleanup FIPS_md_ctx_cleanup -#define EVP_MD_CTX_create FIPS_md_ctx_create -#define EVP_MD_CTX_destroy FIPS_md_ctx_destroy -#define EVP_DigestInit_ex(ctx, type, impl) FIPS_digestinit(ctx, type) -#define EVP_DigestInit FIPS_digestinit -#define EVP_DigestUpdate FIPS_digestupdate -#define EVP_Digest(data, count, md, size, type, impl) \ - FIPS_digest(data, count, md, size, type) -#define EVP_DigestFinal_ex FIPS_digestfinal -#define EVP_MD_CTX_copy_ex FIPS_md_ctx_copy - -#define EVP_CipherInit_ex(ctx, cipher, impl, key, iv, enc) \ - FIPS_cipherinit(ctx, cipher, key, iv, enc) - -#define EVP_CipherInit FIPS_cipherinit - -#define EVP_CIPHER_CTX_init FIPS_cipher_ctx_init -#define EVP_CIPHER_CTX_cleanup FIPS_cipher_ctx_cleanup -#define EVP_Cipher FIPS_cipher -#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 - -#define ECDSA_SIG_new FIPS_ecdsa_sig_new -#define ECDSA_SIG_free FIPS_ecdsa_sig_free - -#define ecdsa_check fips_ecdsa_check -#define ecdh_check fips_ecdh_check - -#define RAND_bytes FIPS_rand_bytes -#define RAND_pseudo_bytes FIPS_rand_pseudo_bytes -#define RAND_add FIPS_rand_add -#define RAND_seed FIPS_rand_seed -#define RAND_status FIPS_rand_status +const struct dsa_method *FIPS_dsa_openssl(void); +int FIPS_dsa_generate_key(DSA *dsa); +int FIPS_dsa_generate_parameters_ex(DSA *dsa, int bits, + const unsigned char *seed,int seed_len, + int *counter_ret, unsigned long *h_ret, BN_GENCB *cb); + +int fips_dsa_builtin_paramgen2(DSA *ret, size_t L, size_t N, + const EVP_MD *evpmd, const unsigned char *seed_in, size_t seed_len, + unsigned char *seed_out, + int *counter_ret, unsigned long *h_ret, BN_GENCB *cb); + +const struct ec_method_st *fips_ec_gf2m_simple_method(void); +const struct ec_method_st *fips_ec_gfp_simple_method(void); +const struct ec_method_st *fips_ec_gfp_mont_method(void); +const struct ec_method_st *fips_ec_gfp_nist_method(void); + +const struct ecdsa_method *FIPS_ecdsa_openssl(void); +const struct ecdh_method *FIPS_ecdh_openssl(void); + +int FIPS_ec_key_generate_key(struct ec_key_st *key); + +const struct dh_method *FIPS_dh_openssl(void); +int FIPS_dh_generate_parameters_ex(DH *dh, int prime_len, + int generator, BN_GENCB *cb); + +int FIPS_cmac_init(struct CMAC_CTX_st *ctx, const void *key, size_t keylen, + const EVP_CIPHER *cipher, ENGINE *impl); +int FIPS_cmac_update(struct CMAC_CTX_st *ctx, const void *in, size_t dlen); +int FIPS_cmac_final(struct CMAC_CTX_st *ctx, unsigned char *out, + size_t *poutlen); +void FIPS_cmac_ctx_cleanup(struct CMAC_CTX_st *ctx); + +void FIPS_hmac_ctx_cleanup(struct hmac_ctx_st *ctx); +int FIPS_hmac_init_ex(struct hmac_ctx_st *ctx, const void *key, int len, + const EVP_MD *md, ENGINE *impl); +int FIPS_hmac_update(struct hmac_ctx_st *ctx, + const unsigned char *data, size_t len); +int FIPS_hmac_final(struct hmac_ctx_st *ctx, + unsigned char *md, unsigned int *len); #endif @@ -431,11 +425,15 @@ void ERR_load_FIPS_strings(void); #define FIPS_R_IN_ERROR_STATE 123 #define FIPS_R_KEY_TOO_SHORT 124 #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