From f76b1baf8683e278aa4fc8992168fc6e375f0585 Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Thu, 12 May 2011 14:28:09 +0000
Subject: [PATCH] Fix error discrepancy.
---
crypto/fips_err.h | 2 +-
fips/fips.c | 6 +++---
fips/fips.h | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/crypto/fips_err.h b/crypto/fips_err.h
index dfb24ca6fa..21b820c695 100644
--- 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 2cb6866d64..09accac835 100644
--- 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 d07d190402..85a6f2574a 100644
--- 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
--
2.25.1