Fix error discrepancy.
authorDr. Stephen Henson <steve@openssl.org>
Thu, 12 May 2011 14:28:09 +0000 (14:28 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Thu, 12 May 2011 14:28:09 +0000 (14:28 +0000)
crypto/fips_err.h
fips/fips.c
fips/fips.h

index dfb24ca..21b820c 100644 (file)
@@ -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"},
index 2cb6866..09accac 100644 (file)
@@ -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;
index d07d190..85a6f25 100644 (file)
@@ -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