Cleanse KDF error files

[openssl.git] / include / openssl / err.h

diff --git a/include/openssl/err.h b/include/openssl/err.h
index 142321d2c862e07c55e511b607536f98ff01d30e..03c3593f3404125d0d389c6d957d0f6e06d92780 100644 (file)
--- a/include/openssl/err.h
+++ b/include/openssl/err.h
@@ -25,12 +25,12 @@
 extern "C" {
 #endif
 
-# ifndef OPENSSL_NO_ERR
-#  define ERR_PUT_error(l,f,r,fn,ln)      ERR_put_error(l,f,r,fn,ln)
-#  define ERR_PUT_func_error(l,f,r,fn,ln) ERR_put_func_error(l,f,r,fn,ln)
-# else
-#  define ERR_PUT_error(l,f,r,fn,ln)      ERR_put_error(l,f,r,NULL,0)
-#  define ERR_PUT_func_error(l,f,r,fn,ln) ERR_put_func_error(l,f,r,NULL,0)
+# if !OPENSSL_API_3
+#  ifndef OPENSSL_NO_ERR
+#   define ERR_PUT_error(l,f,r,fn,ln)      ERR_put_error(l,f,r,fn,ln)
+#  else
+#   define ERR_PUT_error(l,f,r,fn,ln)      ERR_put_error(l,f,r,NULL,0)
+#  endif
 # endif
 
 # include <errno.h>
@@ -97,21 +97,19 @@ typedef struct err_state_st {
 /* # define ERR_LIB_JPAKE       49 */
 # define ERR_LIB_CT              50
 # define ERR_LIB_ASYNC           51
-# define ERR_LIB_KDF             52
-# define ERR_LIB_SM2             53
-# define ERR_LIB_ESS             54
-# define ERR_LIB_PROP            55
-# define ERR_LIB_CRMF            56
-# define ERR_LIB_PROV            57
-# define ERR_LIB_CMP             58
+# define ERR_LIB_SM2             52
+# define ERR_LIB_ESS             53
+# define ERR_LIB_PROP            54
+# define ERR_LIB_CRMF            55
+# define ERR_LIB_PROV            56
+# define ERR_LIB_CMP             57
 
 # define ERR_LIB_USER            128
 
 # if ! OPENSSL_API_3
 #  define SYSerr(f,r)  ERR_raise(ERR_LIB_SYS,(r))
 # endif
-# define FUNCerr(f,r)  ERR_raise_data(ERR_LIB_SYS,(r),"calling function %s",(f))
-# define BNerr(f,r)   ERR_raise(ERR_LIB_RSA,(r))
+# define BNerr(f,r)   ERR_raise(ERR_LIB_BN,(r))
 # define RSAerr(f,r)  ERR_raise(ERR_LIB_RSA,(r))
 # define DHerr(f,r)   ERR_raise(ERR_LIB_DH,(r))
 # define EVPerr(f,r)  ERR_raise(ERR_LIB_EVP,(r))
@@ -146,7 +144,6 @@ typedef struct err_state_st {
 # define HMACerr(f,r) ERR_raise(ERR_LIB_HMAC,(r))
 # define CTerr(f,r) ERR_raise(ERR_LIB_CT,(r))
 # define ASYNCerr(f,r) ERR_raise(ERR_LIB_ASYNC,(r))
-# define KDFerr(f,r) ERR_raise(ERR_LIB_KDF,(r))
 # define SM2err(f,r) ERR_raise(ERR_LIB_SM2,(r))
 # define ESSerr(f,r) ERR_raise(ERR_LIB_ESS,(r))
 # define PROPerr(f,r) ERR_raise(ERR_LIB_PROP,(r))
@@ -245,20 +242,30 @@ void ERR_set_debug(const char *file, int line, const char *func);
 void ERR_set_error(int lib, int reason, const char *fmt, ...);
 void ERR_vset_error(int lib, int reason, const char *fmt, va_list args);
 
+# ifndef OPENSSL_NO_ERR
+#  define ERR_DBG_FILE OPENSSL_FILE
+#  define ERR_DBG_LINE OPENSSL_LINE
+#  define ERR_DBG_FUNC OPENSSL_FUNC
+# else
+#  define ERR_DBG_FILE NULL
+#  define ERR_DBG_LINE 0
+#  define ERR_DBG_FUNC NULL
+# endif
+
 /* Main error raising functions */
-#define ERR_raise(lib, reason) ERR_raise_data((lib),(reason),NULL)
-#define ERR_raise_data                                          \
+# define ERR_raise(lib, reason) ERR_raise_data((lib),(reason),NULL)
+# define ERR_raise_data                                         \
     (ERR_new(),                                                 \
-     ERR_set_debug(OPENSSL_FILE,OPENSSL_LINE,OPENSSL_FUNC),     \
+     ERR_set_debug(ERR_DBG_FILE,ERR_DBG_LINE,ERR_DBG_FUNC),     \
      ERR_set_error)
 
-#if !OPENSSL_API_3
+# if !OPENSSL_API_3
 /* Backward compatibility */
-#define ERR_put_error(lib, func, reason, file, line)            \
+#  define ERR_put_error(lib, func, reason, file, line)          \
     (ERR_new(),                                                 \
      ERR_set_debug((file), (line), NULL),                       \
      ERR_set_error((lib), (reason), NULL))
-#endif
+# endif
 
 void ERR_set_error_data(char *data, int flags);