remove OPENSSL_NO_ASM dependency

[oweals/openssl.git] / crypto / dh / dh_err.c

diff --git a/crypto/dh/dh_err.c b/crypto/dh/dh_err.c
index ff2d1684c214d4652844c3b48ca768e6dd76ffb7..edce2c7036fb6ae69bbc4cd07cc65debfbcfb463 100644 (file)
--- a/crypto/dh/dh_err.c
+++ b/crypto/dh/dh_err.c
@@ -1,6 +1,6 @@
 /* crypto/dh/dh_err.c */
 /* ====================================================================
- * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1999-2005 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
@@ -63,21 +63,27 @@
 #include <openssl/dh.h>
 
 /* BEGIN ERROR CODES */
-#ifndef NO_ERR
+#ifndef OPENSSL_NO_ERR
+
+#define ERR_FUNC(func) ERR_PACK(ERR_LIB_DH,func,0)
+#define ERR_REASON(reason) ERR_PACK(ERR_LIB_DH,0,reason)
+
 static ERR_STRING_DATA DH_str_functs[]=
        {
-{ERR_PACK(0,DH_F_DHPARAMS_PRINT,0),    "DHparams_print"},
-{ERR_PACK(0,DH_F_DHPARAMS_PRINT_FP,0), "DHparams_print_fp"},
-{ERR_PACK(0,DH_F_DH_COMPUTE_KEY,0),    "DH_compute_key"},
-{ERR_PACK(0,DH_F_DH_GENERATE_KEY,0),   "DH_generate_key"},
-{ERR_PACK(0,DH_F_DH_GENERATE_PARAMETERS,0),    "DH_generate_parameters"},
-{ERR_PACK(0,DH_F_DH_NEW,0),    "DH_new"},
+{ERR_FUNC(DH_F_COMPUTE_KEY),   "COMPUTE_KEY"},
+{ERR_FUNC(DH_F_DHPARAMS_PRINT),        "DHparams_print"},
+{ERR_FUNC(DH_F_DHPARAMS_PRINT_FP),     "DHparams_print_fp"},
+{ERR_FUNC(DH_F_DH_BUILTIN_GENPARAMS),  "DH_BUILTIN_GENPARAMS"},
+{ERR_FUNC(DH_F_DH_NEW_METHOD), "DH_new_method"},
+{ERR_FUNC(DH_F_GENERATE_KEY),  "GENERATE_KEY"},
+{ERR_FUNC(DH_F_GENERATE_PARAMETERS),   "GENERATE_PARAMETERS"},
 {0,NULL}
        };
 
 static ERR_STRING_DATA DH_str_reasons[]=
        {
-{DH_R_NO_PRIVATE_VALUE                   ,"no private value"},
+{ERR_REASON(DH_R_BAD_GENERATOR)          ,"bad generator"},
+{ERR_REASON(DH_R_NO_PRIVATE_VALUE)       ,"no private value"},
 {0,NULL}
        };
 
@@ -90,9 +96,9 @@ void ERR_load_DH_strings(void)
        if (init)
                {
                init=0;
-#ifndef NO_ERR
-               ERR_load_strings(ERR_LIB_DH,DH_str_functs);
-               ERR_load_strings(ERR_LIB_DH,DH_str_reasons);
+#ifndef OPENSSL_NO_ERR
+               ERR_load_strings(0,DH_str_functs);
+               ERR_load_strings(0,DH_str_reasons);
 #endif
 
                }