diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2011-02-15 16:03:47 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2011-02-15 16:03:47 +0000 |
commit | 25c6542944821afc0693ca7027c769cc8775e90d (patch) | |
tree | 4c43805e7cbdfb46ee3807152e039d91bad64a09 /crypto | |
parent | 14567b145199739656e2bf8dd34f5da71f785802 (diff) | |
download | openssl-25c6542944821afc0693ca7027c769cc8775e90d.tar.gz |
Add non-FIPS algorithm blocking and selftest checking.
Diffstat (limited to 'crypto')
-rw-r--r-- | crypto/evp/evp.h | 1 | ||||
-rw-r--r-- | crypto/evp/evp_err.c | 1 | ||||
-rw-r--r-- | crypto/fips_err.h | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h index 042dc1c577..240d9d5d69 100644 --- a/crypto/evp/evp.h +++ b/crypto/evp/evp.h @@ -1319,6 +1319,7 @@ void ERR_load_EVP_strings(void); #define EVP_R_DECODE_ERROR 114 #define EVP_R_DIFFERENT_KEY_TYPES 101 #define EVP_R_DIFFERENT_PARAMETERS 153 +#define EVP_R_DISABLED_FOR_FIPS 163 #define EVP_R_ENCODE_ERROR 115 #define EVP_R_EVP_PBE_CIPHERINIT_ERROR 119 #define EVP_R_EXPECTING_AN_RSA_KEY 127 diff --git a/crypto/evp/evp_err.c b/crypto/evp/evp_err.c index 92e0493d3e..a9e26562c6 100644 --- a/crypto/evp/evp_err.c +++ b/crypto/evp/evp_err.c @@ -162,6 +162,7 @@ static ERR_STRING_DATA EVP_str_reasons[]= {ERR_REASON(EVP_R_DECODE_ERROR) ,"decode error"}, {ERR_REASON(EVP_R_DIFFERENT_KEY_TYPES) ,"different key types"}, {ERR_REASON(EVP_R_DIFFERENT_PARAMETERS) ,"different parameters"}, +{ERR_REASON(EVP_R_DISABLED_FOR_FIPS) ,"disabled for fips"}, {ERR_REASON(EVP_R_ENCODE_ERROR) ,"encode error"}, {ERR_REASON(EVP_R_EVP_PBE_CIPHERINIT_ERROR),"evp pbe cipherinit error"}, {ERR_REASON(EVP_R_EXPECTING_AN_RSA_KEY) ,"expecting an rsa key"}, diff --git a/crypto/fips_err.h b/crypto/fips_err.h index d2d9eb0d30..4ea18399f1 100644 --- a/crypto/fips_err.h +++ b/crypto/fips_err.h @@ -80,6 +80,8 @@ static ERR_STRING_DATA FIPS_str_functs[]= {ERR_FUNC(FIPS_F_FIPS_CHECK_DSA), "FIPS_CHECK_DSA"}, {ERR_FUNC(FIPS_F_FIPS_CHECK_INCORE_FINGERPRINT), "FIPS_check_incore_fingerprint"}, {ERR_FUNC(FIPS_F_FIPS_CHECK_RSA), "fips_check_rsa"}, +{ERR_FUNC(FIPS_F_FIPS_CIPHERINIT), "FIPS_CIPHERINIT"}, +{ERR_FUNC(FIPS_F_FIPS_DIGESTINIT), "FIPS_DIGESTINIT"}, {ERR_FUNC(FIPS_F_FIPS_DSA_CHECK), "FIPS_DSA_CHECK"}, {ERR_FUNC(FIPS_F_FIPS_MODE_SET), "FIPS_mode_set"}, {ERR_FUNC(FIPS_F_FIPS_PKEY_SIGNATURE_TEST), "fips_pkey_signature_test"}, |