Fix error discrepancy.

diff --git a/crypto/fips_err.h b/crypto/fips_err.h
index dfb24ca6fa9e71daf3cb53383dfc6f4bb3feb608..21b820c6957729bb775ba2ddc4fbae4ad699c522 100644 (file)
--- a/crypto/fips_err.h
+++ b/crypto/fips_err.h
@@ -102,7 +102,7 @@ static ERR_STRING_DATA FIPS_str_functs[]=
 {ERR_FUNC(FIPS_F_FIPS_DSA_SIGN_DIGEST),        "FIPS_dsa_sign_digest"},
 {ERR_FUNC(FIPS_F_FIPS_DSA_VERIFY_DIGEST),      "FIPS_dsa_verify_digest"},
 {ERR_FUNC(FIPS_F_FIPS_GET_ENTROPY),    "FIPS_GET_ENTROPY"},
-{ERR_FUNC(FIPS_F_FIPS_MODE_SET),       "FIPS_mode_set"},
+{ERR_FUNC(FIPS_F_FIPS_MODULE_MODE_SET),        "FIPS_module_mode_set"},
 {ERR_FUNC(FIPS_F_FIPS_PKEY_SIGNATURE_TEST),    "fips_pkey_signature_test"},
 {ERR_FUNC(FIPS_F_FIPS_RAND_ADD),       "FIPS_rand_add"},
 {ERR_FUNC(FIPS_F_FIPS_RAND_BYTES),     "FIPS_rand_bytes"},

diff --git a/fips/fips.c b/fips/fips.c
index 2cb6866d64982c4e462c08b42d908b508afbcbaf..09accac835f9c26e0484173470475e78bdd2b887 100644 (file)
--- a/fips/fips.c
+++ b/fips/fips.c
@@ -256,7 +256,7 @@ int FIPS_module_mode_set(int onoff)
           seeding */
        if(FIPS_module_mode())
            {
-           FIPSerr(FIPS_F_FIPS_MODE_SET,FIPS_R_FIPS_MODE_ALREADY_SET);
+           FIPSerr(FIPS_F_FIPS_MODULE_MODE_SET,FIPS_R_FIPS_MODE_ALREADY_SET);
            fips_selftest_fail = 1;
            ret = 0;
            goto end;
@@ -265,7 +265,7 @@ int FIPS_module_mode_set(int onoff)
 #ifdef OPENSSL_IA32_SSE2
        if ((OPENSSL_ia32cap & (1<<25|1<<26)) != (1<<25|1<<26))
            {
-           FIPSerr(FIPS_F_FIPS_MODE_SET,FIPS_R_UNSUPPORTED_PLATFORM);
+           FIPSerr(FIPS_F_FIPS_MODULE_MODE_SET,FIPS_R_UNSUPPORTED_PLATFORM);
            fips_selftest_fail = 1;
            ret = 0;
            goto end;
@@ -274,7 +274,7 @@ int FIPS_module_mode_set(int onoff)
 
        if(fips_signature_witness() != FIPS_signature)
            {
-           FIPSerr(FIPS_F_FIPS_MODE_SET,FIPS_R_CONTRADICTING_EVIDENCE);
+           FIPSerr(FIPS_F_FIPS_MODULE_MODE_SET,FIPS_R_CONTRADICTING_EVIDENCE);
            fips_selftest_fail = 1;
            ret = 0;
            goto end;

diff --git a/fips/fips.h b/fips/fips.h
index d07d1904029c83e0e142ef2a4c5c56c521fa4530..85a6f2574a3da827e50c27ddc8ceda2c38041031 100644 (file)
--- a/fips/fips.h
+++ b/fips/fips.h
@@ -268,7 +268,7 @@ void ERR_load_FIPS_strings(void);
 #define FIPS_F_FIPS_DSA_SIGN_DIGEST                     154
 #define FIPS_F_FIPS_DSA_VERIFY_DIGEST                   155
 #define FIPS_F_FIPS_GET_ENTROPY                                 147
-#define FIPS_F_FIPS_MODE_SET                            120
+#define FIPS_F_FIPS_MODULE_MODE_SET                     120
 #define FIPS_F_FIPS_PKEY_SIGNATURE_TEST                         121
 #define FIPS_F_FIPS_RAND_ADD                            122
 #define FIPS_F_FIPS_RAND_BYTES                          123