1 files changed, 28 insertions, 26 deletions

diff --git a/src/lib/libcrypto/err/err_local.h b/src/lib/libcrypto/err/err_local.h
index 0e3c191a64..a9db196d47 100644
--- a/src/lib/libcrypto/err/err_local.h
+++ b/src/lib/libcrypto/err/err_local.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: err_local.h,v 1.3 2025/05/10 06:22:08 tb Exp $ */
+/*      $OpenBSD: err_local.h,v 1.4 2025/05/10 06:35:22 tb Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -118,31 +118,33 @@ __BEGIN_HIDDEN_DECLS
 
 void ERR_load_const_strings(const ERR_STRING_DATA *str);
 
-#define SYSerror(r)     ERR_PUT_error(ERR_LIB_SYS,(0xfff),(r),OPENSSL_FILE,OPENSSL_LINE)
-#define BNerror(r)      ERR_PUT_error(ERR_LIB_BN,(0xfff),(r),OPENSSL_FILE,OPENSSL_LINE)
-#define RSAerror(r)     ERR_PUT_error(ERR_LIB_RSA,(0xfff),(r),OPENSSL_FILE,OPENSSL_LINE)
-#define DHerror(r)      ERR_PUT_error(ERR_LIB_DH,(0xfff),(r),OPENSSL_FILE,OPENSSL_LINE)
-#define EVPerror(r)     ERR_PUT_error(ERR_LIB_EVP,(0xfff),(r),OPENSSL_FILE,OPENSSL_LINE)
-#define BUFerror(r)     ERR_PUT_error(ERR_LIB_BUF,(0xfff),(r),OPENSSL_FILE,OPENSSL_LINE)
-#define OBJerror(r)     ERR_PUT_error(ERR_LIB_OBJ,(0xfff),(r),OPENSSL_FILE,OPENSSL_LINE)
-#define PEMerror(r)     ERR_PUT_error(ERR_LIB_PEM,(0xfff),(r),OPENSSL_FILE,OPENSSL_LINE)
-#define DSAerror(r)     ERR_PUT_error(ERR_LIB_DSA,(0xfff),(r),OPENSSL_FILE,OPENSSL_LINE)
-#define X509error(r)    ERR_PUT_error(ERR_LIB_X509,(0xfff),(r),OPENSSL_FILE,OPENSSL_LINE)
-#define ASN1error(r)    ERR_PUT_error(ERR_LIB_ASN1,(0xfff),(r),OPENSSL_FILE,OPENSSL_LINE)
-#define CONFerror(r)    ERR_PUT_error(ERR_LIB_CONF,(0xfff),(r),OPENSSL_FILE,OPENSSL_LINE)
-#define CRYPTOerror(r)  ERR_PUT_error(ERR_LIB_CRYPTO,(0xfff),(r),OPENSSL_FILE,OPENSSL_LINE)
-#define ECerror(r)      ERR_PUT_error(ERR_LIB_EC,(0xfff),(r),OPENSSL_FILE,OPENSSL_LINE)
-#define BIOerror(r)     ERR_PUT_error(ERR_LIB_BIO,(0xfff),(r),OPENSSL_FILE,OPENSSL_LINE)
-#define PKCS7error(r)   ERR_PUT_error(ERR_LIB_PKCS7,(0xfff),(r),OPENSSL_FILE,OPENSSL_LINE)
-#define X509V3error(r)  ERR_PUT_error(ERR_LIB_X509V3,(0xfff),(r),OPENSSL_FILE,OPENSSL_LINE)
-#define PKCS12error(r)  ERR_PUT_error(ERR_LIB_PKCS12,(0xfff),(r),OPENSSL_FILE,OPENSSL_LINE)
-#define RANDerror(r)    ERR_PUT_error(ERR_LIB_RAND,(0xfff),(r),OPENSSL_FILE,OPENSSL_LINE)
-#define OCSPerror(r)    ERR_PUT_error(ERR_LIB_OCSP,(0xfff),(r),OPENSSL_FILE,OPENSSL_LINE)
-#define UIerror(r)      ERR_PUT_error(ERR_LIB_UI,(0xfff),(r),OPENSSL_FILE,OPENSSL_LINE)
-#define CMSerror(r)     ERR_PUT_error(ERR_LIB_CMS,(0xfff),(r),OPENSSL_FILE,OPENSSL_LINE)
-#define TSerror(r)      ERR_PUT_error(ERR_LIB_TS,(0xfff),(r),OPENSSL_FILE,OPENSSL_LINE)
-#define CTerror(r)      ERR_PUT_error(ERR_LIB_CT,(0xfff),(r),OPENSSL_FILE,OPENSSL_LINE)
-#define KDFerror(r)     ERR_PUT_error(ERR_LIB_KDF,(0xfff),(r),OPENSSL_FILE,OPENSSL_LINE)
+#define ERR_PUT_ERROR(l, r) ERR_PUT_error((l), 0xfff, (r), OPENSSL_FILE, OPENSSL_LINE)
+
+#define SYSerror(r)     ERR_PUT_ERROR(ERR_LIB_SYS, (r))
+#define BNerror(r)      ERR_PUT_ERROR(ERR_LIB_BN, (r))
+#define RSAerror(r)     ERR_PUT_ERROR(ERR_LIB_RSA, (r))
+#define DHerror(r)      ERR_PUT_ERROR(ERR_LIB_DH, (r))
+#define EVPerror(r)     ERR_PUT_ERROR(ERR_LIB_EVP, (r))
+#define BUFerror(r)     ERR_PUT_ERROR(ERR_LIB_BUF, (r))
+#define OBJerror(r)     ERR_PUT_ERROR(ERR_LIB_OBJ, (r))
+#define PEMerror(r)     ERR_PUT_ERROR(ERR_LIB_PEM, (r))
+#define DSAerror(r)     ERR_PUT_ERROR(ERR_LIB_DSA, (r))
+#define X509error(r)    ERR_PUT_ERROR(ERR_LIB_X509, (r))
+#define ASN1error(r)    ERR_PUT_ERROR(ERR_LIB_ASN1, (r))
+#define CONFerror(r)    ERR_PUT_ERROR(ERR_LIB_CONF, (r))
+#define CRYPTOerror(r)  ERR_PUT_ERROR(ERR_LIB_CRYPTO, (r))
+#define ECerror(r)      ERR_PUT_ERROR(ERR_LIB_EC, (r))
+#define BIOerror(r)     ERR_PUT_ERROR(ERR_LIB_BIO, (r))
+#define PKCS7error(r)   ERR_PUT_ERROR(ERR_LIB_PKCS7, (r))
+#define X509V3error(r)  ERR_PUT_ERROR(ERR_LIB_X509V3, (r))
+#define PKCS12error(r)  ERR_PUT_ERROR(ERR_LIB_PKCS12, (r))
+#define RANDerror(r)    ERR_PUT_ERROR(ERR_LIB_RAND, (r))
+#define OCSPerror(r)    ERR_PUT_ERROR(ERR_LIB_OCSP, (r))
+#define UIerror(r)      ERR_PUT_ERROR(ERR_LIB_UI, (r))
+#define CMSerror(r)     ERR_PUT_ERROR(ERR_LIB_CMS, (r))
+#define TSerror(r)      ERR_PUT_ERROR(ERR_LIB_TS, (r))
+#define CTerror(r)      ERR_PUT_ERROR(ERR_LIB_CT, (r))
+#define KDFerror(r)     ERR_PUT_ERROR(ERR_LIB_KDF, (r))
 
 __END_HIDDEN_DECLS