1 files changed, 26 insertions, 40 deletions

diff --git a/src/lib/libssl/src/fips/fips_err.h b/src/lib/libcrypto/ecdsa/ecs_err.c
index d643c9f55f..98e38d537f 100644
--- a/src/lib/libssl/src/fips/fips_err.h
+++ b/src/lib/libcrypto/ecdsa/ecs_err.c
@@ -1,6 +1,6 @@
-/* fips/fips_err.h */
+/* crypto/ecdsa/ecs_err.c */
 /* ====================================================================
- * Copyright (c) 1999-2003 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2006 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -60,59 +60,45 @@
 
 #include <stdio.h>
 #include <openssl/err.h>
-#include <openssl/fips.h>
+#include <openssl/ecdsa.h>
 
 /* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
-static ERR_STRING_DATA FIPS_str_functs[]=
+
+#define ERR_FUNC(func) ERR_PACK(ERR_LIB_ECDSA,func,0)
+#define ERR_REASON(reason) ERR_PACK(ERR_LIB_ECDSA,0,reason)
+
+static ERR_STRING_DATA ECDSA_str_functs[]=
         {
-{ERR_PACK(0,FIPS_F_DSA_DO_SIGN,0),      "DSA_do_sign"},
-{ERR_PACK(0,FIPS_F_DSA_DO_VERIFY,0),    "DSA_do_verify"},
-{ERR_PACK(0,FIPS_F_DSA_GENERATE_PARAMETERS,0),  "DSA_generate_parameters"},
-{ERR_PACK(0,FIPS_F_FIPS_CHECK_DSA,0),   "FIPS_CHECK_DSA"},
-{ERR_PACK(0,FIPS_F_FIPS_CHECK_EXE,0),   "FIPS_CHECK_EXE"},
-{ERR_PACK(0,FIPS_F_FIPS_CHECK_RSA,0),   "FIPS_CHECK_RSA"},
-{ERR_PACK(0,FIPS_F_FIPS_DSA_CHECK,0),   "FIPS_dsa_check"},
-{ERR_PACK(0,FIPS_F_FIPS_MODE_SET,0),    "FIPS_mode_set"},
-{ERR_PACK(0,FIPS_F_FIPS_SELFTEST_AES,0),        "FIPS_selftest_aes"},
-{ERR_PACK(0,FIPS_F_FIPS_SELFTEST_DES,0),        "FIPS_selftest_des"},
-{ERR_PACK(0,FIPS_F_FIPS_SELFTEST_DSA,0),        "FIPS_selftest_dsa"},
-{ERR_PACK(0,FIPS_F_FIPS_SELFTEST_RSA,0),        "FIPS_selftest_rsa"},
-{ERR_PACK(0,FIPS_F_FIPS_SELFTEST_SHA1,0),       "FIPS_selftest_sha1"},
-{ERR_PACK(0,FIPS_F_HASH_FINAL,0),       "HASH_FINAL"},
-{ERR_PACK(0,FIPS_F_DH_GENERATE_PARAMETERS,0),   "DH_generate_parameters"},
-{ERR_PACK(0,FIPS_F_RSA_EAY_PUBLIC_ENCRYPT,0),   "RSA_EAY_PUBLIC_ENCRYPT"},
-{ERR_PACK(0,FIPS_F_RSA_GENERATE_KEY,0), "RSA_generate_key"},
-{ERR_PACK(0,FIPS_F_SSLEAY_RAND_BYTES,0),        "SSLEAY_RAND_BYTES"},
+{ERR_FUNC(ECDSA_F_ECDSA_DATA_NEW_METHOD),       "ECDSA_DATA_NEW_METHOD"},
+{ERR_FUNC(ECDSA_F_ECDSA_DO_SIGN),       "ECDSA_do_sign"},
+{ERR_FUNC(ECDSA_F_ECDSA_DO_VERIFY),     "ECDSA_do_verify"},
+{ERR_FUNC(ECDSA_F_ECDSA_SIGN_SETUP),    "ECDSA_sign_setup"},
 {0,NULL}
         };
 
-static ERR_STRING_DATA FIPS_str_reasons[]=
+static ERR_STRING_DATA ECDSA_str_reasons[]=
         {
-{FIPS_R_CANNOT_READ_EXE                  ,"cannot read exe"},
-{FIPS_R_CANNOT_READ_EXE_DIGEST           ,"cannot read exe digest"},
-{FIPS_R_EXE_DIGEST_DOES_NOT_MATCH        ,"exe digest does not match"},
-{FIPS_R_FIPS_MODE_ALREADY_SET            ,"fips mode already set"},
-{FIPS_R_FIPS_SELFTEST_FAILED             ,"fips selftest failed"},
-{FIPS_R_NON_FIPS_METHOD                  ,"non fips method"},
-{FIPS_R_PAIRWISE_TEST_FAILED             ,"pairwise test failed"},
-{FIPS_R_SELFTEST_FAILED                  ,"selftest failed"},
+{ERR_REASON(ECDSA_R_BAD_SIGNATURE)       ,"bad signature"},
+{ERR_REASON(ECDSA_R_DATA_TOO_LARGE_FOR_KEY_SIZE),"data too large for key size"},
+{ERR_REASON(ECDSA_R_ERR_EC_LIB)          ,"err ec lib"},
+{ERR_REASON(ECDSA_R_MISSING_PARAMETERS)  ,"missing parameters"},
+{ERR_REASON(ECDSA_R_NEED_NEW_SETUP_VALUES),"need new setup values"},
+{ERR_REASON(ECDSA_R_RANDOM_NUMBER_GENERATION_FAILED),"random number generation failed"},
+{ERR_REASON(ECDSA_R_SIGNATURE_MALLOC_FAILED),"signature malloc failed"},
 {0,NULL}
         };
 
 #endif
 
-void ERR_load_FIPS_strings(void)
+void ERR_load_ECDSA_strings(void)
         {
-        static int init=1;
-
-        if (init)
-                {
-                init=0;
 #ifndef OPENSSL_NO_ERR
-                ERR_load_strings(ERR_LIB_FIPS,FIPS_str_functs);
-                ERR_load_strings(ERR_LIB_FIPS,FIPS_str_reasons);
-#endif
 
+        if (ERR_func_error_string(ECDSA_str_functs[0].error) == NULL)
+                {
+                ERR_load_strings(0,ECDSA_str_functs);
+                ERR_load_strings(0,ECDSA_str_reasons);
                 }
+#endif
         }