63 files changed, 61 insertions, 1261 deletions
diff --git a/src/lib/libcrypto/asn1/asn1.h b/src/lib/libcrypto/asn1/asn1.h
index 00634a6e82..f172e027e1 100644
--- a/src/lib/libcrypto/asn1/asn1.h
+++ b/src/lib/libcrypto/asn1/asn1.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn1.h,v 1.67 2022/07/07 13:01:28 tb Exp $ */
+/* $OpenBSD: asn1.h,v 1.68 2022/07/12 14:42:48 kn Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -947,10 +947,6 @@ ASN1_VALUE *SMIME_read_ASN1(BIO *bio, BIO **bcont, const ASN1_ITEM *it);
 int SMIME_crlf_copy(BIO *in, BIO *out, int flags);
 int SMIME_text(BIO *in, BIO *out);
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
 void ERR_load_ASN1_strings(void);
 /* Error codes for the ASN1 functions. */
diff --git a/src/lib/libcrypto/asn1/asn1_err.c b/src/lib/libcrypto/asn1/asn1_err.c
index 98db4f7802..8a99e78bd8 100644
--- a/src/lib/libcrypto/asn1/asn1_err.c
+++ b/src/lib/libcrypto/asn1/asn1_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn1_err.c,v 1.23 2022/06/25 15:39:12 jsing Exp $ */
+/* $OpenBSD: asn1_err.c,v 1.24 2022/07/12 14:42:48 kn Exp $ */
 /* ====================================================================
 * Copyright (c) 1999-2011 The OpenSSL Project.  All rights reserved.
 *
@@ -53,11 +53,6 @@
 *
 */
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
- */
 #include <stdio.h>
 #include <openssl/opensslconf.h>
@@ -65,7 +60,6 @@
 #include <openssl/err.h>
 #include <openssl/asn1.h>
-/* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_ASN1,func,0)
diff --git a/src/lib/libcrypto/bio/bio.h b/src/lib/libcrypto/bio/bio.h
index 679e88a3bc..0a729bded9 100644
--- a/src/lib/libcrypto/bio/bio.h
+++ b/src/lib/libcrypto/bio/bio.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bio.h,v 1.54 2022/01/14 08:40:57 tb Exp $ */
+/* $OpenBSD: bio.h,v 1.55 2022/07/12 14:42:48 kn Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -681,10 +681,6 @@ BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args)
        __attribute__((__deprecated__, __format__(__printf__, 3, 0),
            __nonnull__(3)));
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
 void ERR_load_BIO_strings(void);
 /* Error codes for the BIO functions. */
diff --git a/src/lib/libcrypto/bio/bio_err.c b/src/lib/libcrypto/bio/bio_err.c
index cda693d036..fa5d16aff8 100644
--- a/src/lib/libcrypto/bio/bio_err.c
+++ b/src/lib/libcrypto/bio/bio_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bio_err.c,v 1.18 2022/01/14 08:40:57 tb Exp $ */
+/* $OpenBSD: bio_err.c,v 1.19 2022/07/12 14:42:48 kn Exp $ */
 /* ====================================================================
 * Copyright (c) 1999-2011 The OpenSSL Project.  All rights reserved.
 *
@@ -53,11 +53,6 @@
 *
 */
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
- */
 #include <stdio.h>
 #include <openssl/opensslconf.h>
@@ -65,7 +60,6 @@
 #include <openssl/err.h>
 #include <openssl/bio.h>
-/* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_BIO,func,0)
diff --git a/src/lib/libcrypto/bn/bn.h b/src/lib/libcrypto/bn/bn.h
index 436be593bf..5ac41438eb 100644
--- a/src/lib/libcrypto/bn/bn.h
+++ b/src/lib/libcrypto/bn/bn.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bn.h,v 1.54 2022/07/07 13:01:28 tb Exp $ */
+/* $OpenBSD: bn.h,v 1.55 2022/07/12 14:42:48 kn Exp $ */
 /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -653,10 +653,6 @@ BIGNUM *BN_get_rfc3526_prime_4096(BIGNUM *bn);
 BIGNUM *BN_get_rfc3526_prime_6144(BIGNUM *bn);
 BIGNUM *BN_get_rfc3526_prime_8192(BIGNUM *bn);
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
 void ERR_load_BN_strings(void);
 /* Error codes for the BN functions. */
diff --git a/src/lib/libcrypto/bn/bn_err.c b/src/lib/libcrypto/bn/bn_err.c
index a693a8cbf8..592c509416 100644
--- a/src/lib/libcrypto/bn/bn_err.c
+++ b/src/lib/libcrypto/bn/bn_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bn_err.c,v 1.14 2017/01/29 17:49:22 beck Exp $ */
+/* $OpenBSD: bn_err.c,v 1.15 2022/07/12 14:42:48 kn Exp $ */
 /* ====================================================================
 * Copyright (c) 1999-2007 The OpenSSL Project.  All rights reserved.
 *
@@ -53,11 +53,6 @@
 *
 */
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
- */
 #include <stdio.h>
 #include <openssl/opensslconf.h>
@@ -65,7 +60,6 @@
 #include <openssl/err.h>
 #include <openssl/bn.h>
-/* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_BN,func,0)
diff --git a/src/lib/libcrypto/buffer/buf_err.c b/src/lib/libcrypto/buffer/buf_err.c
index dd5cc5e173..4dc1dca790 100644
--- a/src/lib/libcrypto/buffer/buf_err.c
+++ b/src/lib/libcrypto/buffer/buf_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: buf_err.c,v 1.11 2017/01/29 17:49:22 beck Exp $ */
+/* $OpenBSD: buf_err.c,v 1.12 2022/07/12 14:42:48 kn Exp $ */
 /* ====================================================================
 * Copyright (c) 1999-2006 The OpenSSL Project.  All rights reserved.
 *
@@ -53,11 +53,6 @@
 *
 */
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
- */
 #include <stdio.h>
 #include <openssl/opensslconf.h>
@@ -65,7 +60,6 @@
 #include <openssl/err.h>
 #include <openssl/buffer.h>
-/* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_BUF,func,0)
diff --git a/src/lib/libcrypto/buffer/buffer.h b/src/lib/libcrypto/buffer/buffer.h
index ed6dac0e69..c210bfd1c5 100644
--- a/src/lib/libcrypto/buffer/buffer.h
+++ b/src/lib/libcrypto/buffer/buffer.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: buffer.h,v 1.15 2015/06/24 10:05:14 jsing Exp $ */
+/* $OpenBSD: buffer.h,v 1.16 2022/07/12 14:42:48 kn Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -98,10 +98,6 @@ size_t BUF_strlcat(char *dst, const char *src, size_t siz)
        __attribute__ ((__bounded__(__string__,1,3)));
 #endif
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
 void ERR_load_BUF_strings(void);
 /* Error codes for the BUF functions. */
diff --git a/src/lib/libcrypto/cms/cms_err.c b/src/lib/libcrypto/cms/cms_err.c
index 2fd550cae3..07869ff986 100644
--- a/src/lib/libcrypto/cms/cms_err.c
+++ b/src/lib/libcrypto/cms/cms_err.c
@@ -1,6 +1,5 @@
-/* $OpenBSD: cms_err.c,v 1.12 2020/06/05 16:51:12 jsing Exp $ */
+/* $OpenBSD: cms_err.c,v 1.13 2022/07/12 14:42:48 kn Exp $ */
 /*
- * Generated by util/mkerr.pl DO NOT EDIT
 * Copyright 1995-2018 The OpenSSL Project Authors. All Rights Reserved.
 *
 * Licensed under the OpenSSL license (the "License").  You may not use
diff --git a/src/lib/libcrypto/comp/comp_err.c b/src/lib/libcrypto/comp/comp_err.c
index ccc7a28cd3..eb5fc0ad50 100644
--- a/src/lib/libcrypto/comp/comp_err.c
+++ b/src/lib/libcrypto/comp/comp_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: comp_err.c,v 1.11 2022/01/09 23:50:10 tb Exp $ */
+/* $OpenBSD: comp_err.c,v 1.12 2022/07/12 14:42:48 kn Exp $ */
 /* ====================================================================
 * Copyright (c) 1999-2007 The OpenSSL Project.  All rights reserved.
 *
@@ -62,7 +62,6 @@
 #include "comp_local.h"
-/* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_COMP,func,0)
diff --git a/src/lib/libcrypto/conf/conf.h b/src/lib/libcrypto/conf/conf.h
index bea6a87197..5d10163bfb 100644
--- a/src/lib/libcrypto/conf/conf.h
+++ b/src/lib/libcrypto/conf/conf.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.h,v 1.15 2020/02/17 12:51:48 inoguchi Exp $ */
+/* $OpenBSD: conf.h,v 1.16 2022/07/12 14:42:48 kn Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -193,10 +193,6 @@ int CONF_parse_list(const char *list, int sep, int nospc,
 void OPENSSL_load_builtin_modules(void);
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
 void ERR_load_CONF_strings(void);
 /* Error codes for the CONF functions. */
diff --git a/src/lib/libcrypto/conf/conf_err.c b/src/lib/libcrypto/conf/conf_err.c
index 1e5eaff60e..e6c707ab31 100644
--- a/src/lib/libcrypto/conf/conf_err.c
+++ b/src/lib/libcrypto/conf/conf_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf_err.c,v 1.14 2020/02/17 12:51:48 inoguchi Exp $ */
+/* $OpenBSD: conf_err.c,v 1.15 2022/07/12 14:42:48 kn Exp $ */
 /* ====================================================================
 * Copyright (c) 1999-2007 The OpenSSL Project.  All rights reserved.
 *
@@ -53,11 +53,6 @@
 *
 */
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
- */
 #include <stdio.h>
 #include <openssl/opensslconf.h>
@@ -65,7 +60,6 @@
 #include <openssl/conf.h>
 #include <openssl/err.h>
-/* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_CONF,func,0)
diff --git a/src/lib/libcrypto/cpt_err.c b/src/lib/libcrypto/cpt_err.c
index 4ac32a28ec..718c72608e 100644
--- a/src/lib/libcrypto/cpt_err.c
+++ b/src/lib/libcrypto/cpt_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cpt_err.c,v 1.13 2014/07/10 22:45:56 jsing Exp $ */
+/* $OpenBSD: cpt_err.c,v 1.14 2022/07/12 14:42:48 kn Exp $ */
 /* ====================================================================
 * Copyright (c) 1999-2011 The OpenSSL Project.  All rights reserved.
 *
@@ -53,11 +53,6 @@
 *
 */
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
- */
 #include <stdio.h>
 #include <openssl/opensslconf.h>
@@ -65,7 +60,6 @@
 #include <openssl/err.h>
 #include <openssl/crypto.h>
-/* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_CRYPTO,func,0)
diff --git a/src/lib/libcrypto/crypto.h b/src/lib/libcrypto/crypto.h
index 5524feec98..82372537e1 100644
--- a/src/lib/libcrypto/crypto.h
+++ b/src/lib/libcrypto/crypto.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: crypto.h,v 1.54 2022/01/14 08:23:25 tb Exp $ */
+/* $OpenBSD: crypto.h,v 1.55 2022/07/12 14:42:48 kn Exp $ */
 /* ====================================================================
 * Copyright (c) 1998-2006 The OpenSSL Project.  All rights reserved.
 *
@@ -509,10 +509,6 @@ void OPENSSL_init(void);
 int CRYPTO_memcmp(const void *a, const void *b, size_t len);
 #endif
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
 void ERR_load_CRYPTO_strings(void);
 /* Error codes for the CRYPTO functions. */
diff --git a/src/lib/libcrypto/ct/ct_err.c b/src/lib/libcrypto/ct/ct_err.c
index 01b6a7c209..2597874bd3 100644
--- a/src/lib/libcrypto/ct/ct_err.c
+++ b/src/lib/libcrypto/ct/ct_err.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ct_err.c,v 1.6 2022/05/08 20:59:32 tb Exp $ */
+/*      $OpenBSD: ct_err.c,v 1.7 2022/07/12 14:42:48 kn Exp $ */
 /* ====================================================================
 * Copyright (c) 1999-2006 The OpenSSL Project.  All rights reserved.
 *
@@ -53,11 +53,6 @@
 *
 */
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
- */
 #include <openssl/ct.h>
 #include <openssl/err.h>
diff --git a/src/lib/libcrypto/dh/dh.h b/src/lib/libcrypto/dh/dh.h
index 4e4fdcd982..7b226a70c8 100644
--- a/src/lib/libcrypto/dh/dh.h
+++ b/src/lib/libcrypto/dh/dh.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh.h,v 1.34 2022/07/07 13:01:28 tb Exp $ */
+/* $OpenBSD: dh.h,v 1.35 2022/07/12 14:42:49 kn Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -196,10 +196,6 @@ int	DHparams_print(char *bp, const DH *x);
 #define EVP_PKEY_CTRL_DH_PARAMGEN_GENERATOR     (EVP_PKEY_ALG_CTRL + 2)
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
 void ERR_load_DH_strings(void);
 /* Error codes for the DH functions. */
diff --git a/src/lib/libcrypto/dh/dh_err.c b/src/lib/libcrypto/dh/dh_err.c
index a387c37cca..db66d68e3b 100644
--- a/src/lib/libcrypto/dh/dh_err.c
+++ b/src/lib/libcrypto/dh/dh_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dh_err.c,v 1.17 2022/01/10 12:00:52 tb Exp $ */
+/* $OpenBSD: dh_err.c,v 1.18 2022/07/12 14:42:49 kn Exp $ */
 /* ====================================================================
 * Copyright (c) 1999-2011 The OpenSSL Project.  All rights reserved.
 *
@@ -53,11 +53,6 @@
 *
 */
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
- */
 #include <stdio.h>
 #include <openssl/opensslconf.h>
@@ -65,7 +60,6 @@
 #include <openssl/err.h>
 #include <openssl/dh.h>
-/* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_DH,func,0)
diff --git a/src/lib/libcrypto/dsa/dsa.h b/src/lib/libcrypto/dsa/dsa.h
index 75fb2d004b..eab35a6f6f 100644
--- a/src/lib/libcrypto/dsa/dsa.h
+++ b/src/lib/libcrypto/dsa/dsa.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsa.h,v 1.38 2022/07/07 13:01:28 tb Exp $ */
+/* $OpenBSD: dsa.h,v 1.39 2022/07/12 14:42:49 kn Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -234,10 +234,6 @@ int DSA_meth_set_finish(DSA_METHOD *meth, int (*finish)(DSA *));
 #define EVP_PKEY_CTRL_DSA_PARAMGEN_Q_BITS       (EVP_PKEY_ALG_CTRL + 2)
 #define EVP_PKEY_CTRL_DSA_PARAMGEN_MD           (EVP_PKEY_ALG_CTRL + 3)
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
 void ERR_load_DSA_strings(void);
 /* Error codes for the DSA functions. */
diff --git a/src/lib/libcrypto/dsa/dsa_err.c b/src/lib/libcrypto/dsa/dsa_err.c
index 2dcddcbf77..494773c86d 100644
--- a/src/lib/libcrypto/dsa/dsa_err.c
+++ b/src/lib/libcrypto/dsa/dsa_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dsa_err.c,v 1.15 2017/01/29 17:49:22 beck Exp $ */
+/* $OpenBSD: dsa_err.c,v 1.16 2022/07/12 14:42:49 kn Exp $ */
 /* ====================================================================
 * Copyright (c) 1999-2011 The OpenSSL Project.  All rights reserved.
 *
@@ -53,11 +53,6 @@
 *
 */
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
- */
 #include <stdio.h>
 #include <openssl/opensslconf.h>
@@ -65,7 +60,6 @@
 #include <openssl/err.h>
 #include <openssl/dsa.h>
-/* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_DSA,func,0)
diff --git a/src/lib/libcrypto/dso/dso.h b/src/lib/libcrypto/dso/dso.h
index 6c982c9f97..ae07b0a5f7 100644
--- a/src/lib/libcrypto/dso/dso.h
+++ b/src/lib/libcrypto/dso/dso.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dso.h,v 1.12 2016/03/15 20:50:22 krw Exp $ */
+/* $OpenBSD: dso.h,v 1.13 2022/07/12 14:42:49 kn Exp $ */
 /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
 * project 2000.
 */
@@ -302,10 +302,6 @@ int DSO_pathbyaddr(void *addr, char *path, int sz);
 * itself or libsocket. */
 void *DSO_global_lookup(const char *name);
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
 void ERR_load_DSO_strings(void);
 /* Error codes for the DSO functions. */
diff --git a/src/lib/libcrypto/dso/dso_err.c b/src/lib/libcrypto/dso/dso_err.c
index be6375a3a7..2eee155b57 100644
--- a/src/lib/libcrypto/dso/dso_err.c
+++ b/src/lib/libcrypto/dso/dso_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dso_err.c,v 1.9 2017/01/29 17:49:23 beck Exp $ */
+/* $OpenBSD: dso_err.c,v 1.10 2022/07/12 14:42:49 kn Exp $ */
 /* ====================================================================
 * Copyright (c) 1999-2006 The OpenSSL Project.  All rights reserved.
 *
@@ -53,11 +53,6 @@
 *
 */
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
- */
 #include <stdio.h>
 #include <openssl/opensslconf.h>
@@ -65,7 +60,6 @@
 #include <openssl/err.h>
 #include <openssl/dso.h>
-/* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_DSO,func,0)
diff --git a/src/lib/libcrypto/ec/ec.h b/src/lib/libcrypto/ec/ec.h
index d8ff42c0c9..52c8f2f329 100644
--- a/src/lib/libcrypto/ec/ec.h
+++ b/src/lib/libcrypto/ec/ec.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec.h,v 1.27 2021/09/12 16:23:19 tb Exp $ */
+/* $OpenBSD: ec.h,v 1.28 2022/07/12 14:42:49 kn Exp $ */
 /*
 * Originally written by Bodo Moeller for the OpenSSL project.
 */
@@ -1116,10 +1116,6 @@ EC_KEY *ECParameters_dup(EC_KEY *key);
 #define EVP_PKEY_ECDH_KDF_NONE                          1
 #define EVP_PKEY_ECDH_KDF_X9_63                         2
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
 void ERR_load_EC_strings(void);
 /* Error codes for the EC functions. */
diff --git a/src/lib/libcrypto/ec/ec_err.c b/src/lib/libcrypto/ec/ec_err.c
index 95c15a1110..d8ead9636c 100644
--- a/src/lib/libcrypto/ec/ec_err.c
+++ b/src/lib/libcrypto/ec/ec_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_err.c,v 1.12 2019/09/29 10:09:09 tb Exp $ */
+/* $OpenBSD: ec_err.c,v 1.13 2022/07/12 14:42:49 kn Exp $ */
 /* ====================================================================
 * Copyright (c) 1999-2011 The OpenSSL Project.  All rights reserved.
 *
@@ -53,11 +53,6 @@
 *
 */
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
- */
 #include <stdio.h>
 #include <openssl/opensslconf.h>
@@ -65,7 +60,6 @@
 #include <openssl/err.h>
 #include <openssl/ec.h>
-/* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_EC,func,0)
diff --git a/src/lib/libcrypto/ecdh/ecdh.h b/src/lib/libcrypto/ecdh/ecdh.h
index ccc1312fd8..b39a90f165 100644
--- a/src/lib/libcrypto/ecdh/ecdh.h
+++ b/src/lib/libcrypto/ecdh/ecdh.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecdh.h,v 1.5 2015/09/13 12:03:07 jsing Exp $ */
+/* $OpenBSD: ecdh.h,v 1.6 2022/07/12 14:42:49 kn Exp $ */
 /* ====================================================================
 * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED.
 *
@@ -102,10 +102,6 @@ int 	  ECDH_set_ex_data(EC_KEY *d, int idx, void *arg);
 void      *ECDH_get_ex_data(EC_KEY *d, int idx);
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
 void ERR_load_ECDH_strings(void);
 /* Error codes for the ECDH functions. */
diff --git a/src/lib/libcrypto/ecdh/ech_err.c b/src/lib/libcrypto/ecdh/ech_err.c
index 149c2a8505..e0cfddfe9c 100644
--- a/src/lib/libcrypto/ecdh/ech_err.c
+++ b/src/lib/libcrypto/ecdh/ech_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ech_err.c,v 1.6 2017/01/29 17:49:23 beck Exp $ */
+/* $OpenBSD: ech_err.c,v 1.7 2022/07/12 14:42:49 kn Exp $ */
 /* ====================================================================
 * Copyright (c) 1999-2011 The OpenSSL Project.  All rights reserved.
 *
@@ -53,11 +53,6 @@
 *
 */
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
- */
 #include <stdio.h>
 #include <openssl/opensslconf.h>
@@ -65,7 +60,6 @@
 #include <openssl/err.h>
 #include <openssl/ecdh.h>
-/* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_ECDH,func,0)
diff --git a/src/lib/libcrypto/ecdsa/ecdsa.h b/src/lib/libcrypto/ecdsa/ecdsa.h
index eccca65b5a..29ee8729ed 100644
--- a/src/lib/libcrypto/ecdsa/ecdsa.h
+++ b/src/lib/libcrypto/ecdsa/ecdsa.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecdsa.h,v 1.11 2022/01/14 08:31:03 tb Exp $ */
+/* $OpenBSD: ecdsa.h,v 1.12 2022/07/12 14:42:49 kn Exp $ */
 /**
 * \file   crypto/ecdsa/ecdsa.h Include file for the OpenSSL ECDSA functions
 * \author Written by Nils Larsch for the OpenSSL project
@@ -293,11 +293,6 @@ void EC_KEY_METHOD_get_verify(const EC_KEY_METHOD *meth,
    int (**pverify_sig)(const unsigned char *dgst, int dgst_len,
        const ECDSA_SIG *sig, EC_KEY *eckey));
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
 void ERR_load_ECDSA_strings(void);
 /* Error codes for the ECDSA functions. */
diff --git a/src/lib/libcrypto/ecdsa/ecs_err.c b/src/lib/libcrypto/ecdsa/ecs_err.c
index ac8850dba5..c839c35221 100644
--- a/src/lib/libcrypto/ecdsa/ecs_err.c
+++ b/src/lib/libcrypto/ecdsa/ecs_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ecs_err.c,v 1.6 2022/01/27 20:31:21 tb Exp $ */
+/* $OpenBSD: ecs_err.c,v 1.7 2022/07/12 14:42:49 kn Exp $ */
 /* ====================================================================
 * Copyright (c) 1999-2011 The OpenSSL Project.  All rights reserved.
 *
@@ -53,11 +53,6 @@
 *
 */
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
- */
 #include <stdio.h>
 #include <openssl/opensslconf.h>
@@ -65,7 +60,6 @@
 #include <openssl/ecdsa.h>
 #include <openssl/err.h>
-/* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_ECDSA,func,0)
diff --git a/src/lib/libcrypto/engine/eng_err.c b/src/lib/libcrypto/engine/eng_err.c
index b604cbba9e..5f86a41540 100644
--- a/src/lib/libcrypto/engine/eng_err.c
+++ b/src/lib/libcrypto/engine/eng_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: eng_err.c,v 1.11 2017/01/29 17:49:23 beck Exp $ */
+/* $OpenBSD: eng_err.c,v 1.12 2022/07/12 14:42:49 kn Exp $ */
 /* ====================================================================
 * Copyright (c) 1999-2010 The OpenSSL Project.  All rights reserved.
 *
@@ -53,11 +53,6 @@
 *
 */
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
- */
 #include <stdio.h>
 #include <openssl/opensslconf.h>
@@ -65,7 +60,6 @@
 #include <openssl/err.h>
 #include <openssl/engine.h>
-/* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_ENGINE,func,0)
diff --git a/src/lib/libcrypto/engine/engine.h b/src/lib/libcrypto/engine/engine.h
index dc14be8e38..5c21647fe3 100644
--- a/src/lib/libcrypto/engine/engine.h
+++ b/src/lib/libcrypto/engine/engine.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: engine.h,v 1.33 2019/01/19 01:07:00 tb Exp $ */
+/* $OpenBSD: engine.h,v 1.34 2022/07/12 14:42:49 kn Exp $ */
 /* Written by Geoff Thorpe (geoff@geoffthorpe.net) for the OpenSSL
 * project 2000.
 */
@@ -716,10 +716,6 @@ typedef int (*dynamic_bind_engine)(ENGINE *e, const char *id,
 * values. */
                                        void *ENGINE_get_static_state(void);
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
 void ERR_load_ENGINE_strings(void);
 /* Error codes for the ENGINE functions. */
diff --git a/src/lib/libcrypto/err/openssl.ec b/src/lib/libcrypto/err/openssl.ec
deleted file mode 100644
index dcebbba6c4..0000000000
--- a/src/lib/libcrypto/err/openssl.ec
+++ /dev/null
@@ -1,96 +0,0 @@
-# crypto/err/openssl.ec
-# configuration file for util/mkerr.pl
-# files that may have to be rewritten by util/mkerr.pl
-L ERR           NONE                            NONE
-L BN            crypto/bn/bn.h                  crypto/bn/bn_err.c
-L RSA           crypto/rsa/rsa.h                crypto/rsa/rsa_err.c
-L DH            crypto/dh/dh.h                  crypto/dh/dh_err.c
-L EVP           crypto/evp/evp.h                crypto/evp/evp_err.c
-L BUF           crypto/buffer/buffer.h          crypto/buffer/buf_err.c
-L OBJ           crypto/objects/objects.h        crypto/objects/obj_err.c
-L PEM           crypto/pem/pem.h                crypto/pem/pem_err.c
-L DSA           crypto/dsa/dsa.h                crypto/dsa/dsa_err.c
-L X509          crypto/x509/x509.h              crypto/x509/x509_err.c
-L ASN1          crypto/asn1/asn1.h              crypto/asn1/asn1_err.c
-L CONF          crypto/conf/conf.h              crypto/conf/conf_err.c
-L CRYPTO        crypto/crypto.h                 crypto/cpt_err.c
-L EC            crypto/ec/ec.h                  crypto/ec/ec_err.c
-L SSL           ssl/ssl.h                       ssl/ssl_err.c
-L BIO           crypto/bio/bio.h                crypto/bio/bio_err.c
-L PKCS7         crypto/pkcs7/pkcs7.h            crypto/pkcs7/pkcs7err.c
-L X509V3        crypto/x509v3/x509v3.h          crypto/x509v3/v3err.c
-L PKCS12        crypto/pkcs12/pkcs12.h          crypto/pkcs12/pk12err.c
-L RAND          crypto/rand/rand.h              crypto/rand/rand_err.c
-L DSO           crypto/dso/dso.h                crypto/dso/dso_err.c
-L ENGINE        crypto/engine/engine.h          crypto/engine/eng_err.c
-L OCSP          crypto/ocsp/ocsp.h              crypto/ocsp/ocsp_err.c
-L UI            crypto/ui/ui.h                  crypto/ui/ui_err.c
-L COMP          crypto/comp/comp.h              crypto/comp/comp_err.c
-L ECDSA         crypto/ecdsa/ecdsa.h            crypto/ecdsa/ecs_err.c
-L ECDH          crypto/ecdh/ecdh.h              crypto/ecdh/ech_err.c
-L STORE         crypto/store/store.h            crypto/store/str_err.c
-L TS            crypto/ts/ts.h                  crypto/ts/ts_err.c
-L HMAC          crypto/hmac/hmac.h              crypto/hmac/hmac_err.c
-L CMS           crypto/cms/cms.h                crypto/cms/cms_err.c
-L GOST          crypto/gost/gost.h              crypto/gost/gost_err.c
-# additional header files to be scanned for function names
-L NONE          crypto/x509/x509_vfy.h          NONE
-L NONE          crypto/ec/ec_lcl.h              NONE
-L NONE          crypto/asn1/asn_lcl.h           NONE
-L NONE          crypto/cms/cms_lcl.h            NONE
-F RSAREF_F_RSA_BN2BIN
-F RSAREF_F_RSA_PRIVATE_DECRYPT
-F RSAREF_F_RSA_PRIVATE_ENCRYPT
-F RSAREF_F_RSA_PUBLIC_DECRYPT
-F RSAREF_F_RSA_PUBLIC_ENCRYPT
-#F SSL_F_CLIENT_CERTIFICATE
-R SSL_R_SSLV3_ALERT_UNEXPECTED_MESSAGE          1010
-R SSL_R_SSLV3_ALERT_BAD_RECORD_MAC              1020
-R SSL_R_TLSV1_ALERT_DECRYPTION_FAILED           1021
-R SSL_R_TLSV1_ALERT_RECORD_OVERFLOW             1022
-R SSL_R_SSLV3_ALERT_DECOMPRESSION_FAILURE       1030
-R SSL_R_SSLV3_ALERT_HANDSHAKE_FAILURE           1040
-R SSL_R_SSLV3_ALERT_NO_CERTIFICATE              1041
-R SSL_R_SSLV3_ALERT_BAD_CERTIFICATE             1042
-R SSL_R_SSLV3_ALERT_UNSUPPORTED_CERTIFICATE     1043
-R SSL_R_SSLV3_ALERT_CERTIFICATE_REVOKED         1044
-R SSL_R_SSLV3_ALERT_CERTIFICATE_EXPIRED         1045
-R SSL_R_SSLV3_ALERT_CERTIFICATE_UNKNOWN         1046
-R SSL_R_SSLV3_ALERT_ILLEGAL_PARAMETER           1047
-R SSL_R_TLSV1_ALERT_UNKNOWN_CA                  1048
-R SSL_R_TLSV1_ALERT_ACCESS_DENIED               1049
-R SSL_R_TLSV1_ALERT_DECODE_ERROR                1050
-R SSL_R_TLSV1_ALERT_DECRYPT_ERROR               1051
-R SSL_R_TLSV1_ALERT_EXPORT_RESTRICTION          1060
-R SSL_R_TLSV1_ALERT_PROTOCOL_VERSION            1070
-R SSL_R_TLSV1_ALERT_INSUFFICIENT_SECURITY       1071
-R SSL_R_TLSV1_ALERT_INTERNAL_ERROR              1080
-R SSL_R_TLSV1_ALERT_USER_CANCELLED              1090
-R SSL_R_TLSV1_ALERT_NO_RENEGOTIATION            1100
-R SSL_R_TLSV1_UNSUPPORTED_EXTENSION             1110
-R SSL_R_TLSV1_CERTIFICATE_UNOBTAINABLE          1111
-R SSL_R_TLSV1_UNRECOGNIZED_NAME                 1112
-R SSL_R_TLSV1_BAD_CERTIFICATE_STATUS_RESPONSE   1113
-R SSL_R_TLSV1_BAD_CERTIFICATE_HASH_VALUE        1114
-R RSAREF_R_CONTENT_ENCODING                     0x0400
-R RSAREF_R_DATA                                 0x0401
-R RSAREF_R_DIGEST_ALGORITHM                     0x0402
-R RSAREF_R_ENCODING                             0x0403
-R RSAREF_R_KEY                                  0x0404
-R RSAREF_R_KEY_ENCODING                         0x0405
-R RSAREF_R_LEN                                  0x0406
-R RSAREF_R_MODULUS_LEN                          0x0407
-R RSAREF_R_NEED_RANDOM                          0x0408
-R RSAREF_R_PRIVATE_KEY                          0x0409
-R RSAREF_R_PUBLIC_KEY                           0x040a
-R RSAREF_R_SIGNATURE                            0x040b
-R RSAREF_R_SIGNATURE_ENCODING                   0x040c
-R RSAREF_R_ENCRYPTION_ALGORITHM                 0x040d
diff --git a/src/lib/libcrypto/evp/evp.h b/src/lib/libcrypto/evp/evp.h
index 0574556b63..f016b6377c 100644
--- a/src/lib/libcrypto/evp/evp.h
+++ b/src/lib/libcrypto/evp/evp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: evp.h,v 1.102 2022/07/07 13:01:28 tb Exp $ */
+/* $OpenBSD: evp.h,v 1.103 2022/07/12 14:42:49 kn Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -1262,10 +1262,6 @@ int EVP_AEAD_CTX_open(const EVP_AEAD_CTX *ctx, unsigned char *out,
 void EVP_add_alg_module(void);
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
 void ERR_load_EVP_strings(void);
 /* Error codes for the EVP functions. */
diff --git a/src/lib/libcrypto/evp/evp_err.c b/src/lib/libcrypto/evp/evp_err.c
index 07ece82c3a..4feea1aabf 100644
--- a/src/lib/libcrypto/evp/evp_err.c
+++ b/src/lib/libcrypto/evp/evp_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: evp_err.c,v 1.27 2021/03/29 15:57:23 tb Exp $ */
+/* $OpenBSD: evp_err.c,v 1.28 2022/07/12 14:42:49 kn Exp $ */
 /* ====================================================================
 * Copyright (c) 1999-2011 The OpenSSL Project.  All rights reserved.
 *
@@ -53,11 +53,6 @@
 *
 */
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
- */
 #include <stdio.h>
 #include <openssl/opensslconf.h>
@@ -65,7 +60,6 @@
 #include <openssl/err.h>
 #include <openssl/evp.h>
-/* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_EVP,func,0)
diff --git a/src/lib/libcrypto/gost/gost.h b/src/lib/libcrypto/gost/gost.h
index 092f96fb60..c7d9d25b2b 100644
--- a/src/lib/libcrypto/gost/gost.h
+++ b/src/lib/libcrypto/gost/gost.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: gost.h,v 1.3 2016/09/04 17:02:31 jsing Exp $ */
+/* $OpenBSD: gost.h,v 1.4 2022/07/12 14:42:49 kn Exp $ */
 /*
 * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
 * Copyright (c) 2005-2006 Cryptocom LTD
@@ -199,10 +199,6 @@ size_t GOST_KEY_get_size(const GOST_KEY * r);
 #define GOST_SIG_FORMAT_SR_BE   0
 #define GOST_SIG_FORMAT_RS_LE   1
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
 void ERR_load_GOST_strings(void);
 /* Error codes for the GOST functions. */
diff --git a/src/lib/libcrypto/gost/gost_err.c b/src/lib/libcrypto/gost/gost_err.c
index e7111dd34b..0c46dbc36c 100644
--- a/src/lib/libcrypto/gost/gost_err.c
+++ b/src/lib/libcrypto/gost/gost_err.c
@@ -53,16 +53,10 @@
 *
 */
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
- */
 #include <stdio.h>
 #include <openssl/err.h>
 #include <openssl/gost.h>
-/* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_GOST,func,0)
diff --git a/src/lib/libcrypto/kdf/kdf.h b/src/lib/libcrypto/kdf/kdf.h
index cc506e51bf..f823bf99e2 100644
--- a/src/lib/libcrypto/kdf/kdf.h
+++ b/src/lib/libcrypto/kdf/kdf.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: kdf.h,v 1.7 2022/05/05 08:24:14 tb Exp $ */
+/*      $OpenBSD: kdf.h,v 1.8 2022/07/12 14:42:49 kn Exp $ */
 /*
 * Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
 * project.
@@ -89,10 +89,6 @@ extern "C" {
            EVP_PKEY_CTX_ctrl(pctx, -1, EVP_PKEY_OP_DERIVE, \
                              EVP_PKEY_CTRL_HKDF_MODE, mode, NULL)
-/*
- * Generated by util/mkerr.pl DO NOT EDIT
- */
 int ERR_load_KDF_strings(void);
 /*
diff --git a/src/lib/libcrypto/kdf/kdf_err.c b/src/lib/libcrypto/kdf/kdf_err.c
index 703690a0d5..4dd323701a 100644
--- a/src/lib/libcrypto/kdf/kdf_err.c
+++ b/src/lib/libcrypto/kdf/kdf_err.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: kdf_err.c,v 1.8 2022/05/05 08:24:14 tb Exp $ */
+/*      $OpenBSD: kdf_err.c,v 1.9 2022/07/12 14:42:49 kn Exp $ */
 /* ====================================================================
 * Copyright (c) 1999-2018 The OpenSSL Project.  All rights reserved.
 *
@@ -53,10 +53,6 @@
 *
 */
-/*
- * Generated by util/mkerr.pl DO NOT EDIT
- */
 #include <openssl/err.h>
 #include <openssl/kdf.h>
diff --git a/src/lib/libcrypto/man/ERR.3 b/src/lib/libcrypto/man/ERR.3
index 6d42d875a2..b1be67a037 100644
--- a/src/lib/libcrypto/man/ERR.3
+++ b/src/lib/libcrypto/man/ERR.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: ERR.3,v 1.8 2019/06/10 09:49:48 schwarze Exp $
+.\"     $OpenBSD: ERR.3,v 1.9 2022/07/12 14:42:49 kn Exp $
 .\"     OpenSSL 186bb907 Apr 13 11:05:13 2015 -0700
 .\"
 .\" This file was written by Ulf Moeller <ulf@openssl.org> and
@@ -49,7 +49,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 10 2019 $
+.Dd $Mdocdate: July 12 2022 $
 .Dt ERR 3
 .Os
 .Sh NAME
@@ -171,14 +171,6 @@ definitions it uses.
 .Sh USING ERROR CODES IN EXTERNAL LIBRARIES
 It is also possible to use OpenSSL's error code scheme in external
 libraries.
-The library needs to load its own codes and call the OpenSSL error code
-insertion script
-.Pa mkerr.pl
-explicitly to add codes to the header file and generate the C error code
-file.
-This will normally be done if the external library needs to generate new
-ASN.1 structures but it can also be used to add more general purpose
-error code handling.
 .Sh INTERNALS
 The error queues are stored in a hash table with one
 .Vt ERR_STATE
diff --git a/src/lib/libcrypto/objects/obj_err.c b/src/lib/libcrypto/objects/obj_err.c
index e1413190eb..50e2a0e0c4 100644
--- a/src/lib/libcrypto/objects/obj_err.c
+++ b/src/lib/libcrypto/objects/obj_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: obj_err.c,v 1.12 2017/01/29 17:49:23 beck Exp $ */
+/* $OpenBSD: obj_err.c,v 1.13 2022/07/12 14:42:49 kn Exp $ */
 /* ====================================================================
 * Copyright (c) 1999-2006 The OpenSSL Project.  All rights reserved.
 *
@@ -53,11 +53,6 @@
 *
 */
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
- */
 #include <stdio.h>
 #include <openssl/opensslconf.h>
@@ -65,7 +60,6 @@
 #include <openssl/err.h>
 #include <openssl/objects.h>
-/* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_OBJ,func,0)
diff --git a/src/lib/libcrypto/objects/objects.h b/src/lib/libcrypto/objects/objects.h
index 918928e2f0..fe3d7774d3 100644
--- a/src/lib/libcrypto/objects/objects.h
+++ b/src/lib/libcrypto/objects/objects.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: objects.h,v 1.17 2022/01/14 08:56:00 tb Exp $ */
+/* $OpenBSD: objects.h,v 1.18 2022/07/12 14:42:49 kn Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -1038,10 +1038,6 @@ extern int obj_cleanup_defer;
 void check_defer(int nid);
 #endif
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
 void ERR_load_OBJ_strings(void);
 /* Error codes for the OBJ functions. */
diff --git a/src/lib/libcrypto/ocsp/ocsp.h b/src/lib/libcrypto/ocsp/ocsp.h
index f869f8aa96..691ee4a3dc 100644
--- a/src/lib/libcrypto/ocsp/ocsp.h
+++ b/src/lib/libcrypto/ocsp/ocsp.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ocsp.h,v 1.19 2022/01/14 08:32:26 tb Exp $ */
+/* $OpenBSD: ocsp.h,v 1.20 2022/07/12 14:42:49 kn Exp $ */
 /* Written by Tom Titchener <Tom_Titchener@groove.net> for the OpenSSL
 * project. */
@@ -421,10 +421,6 @@ int	OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE* o, unsigned long flags);
 int     OCSP_basic_verify(OCSP_BASICRESP *bs, STACK_OF(X509) *certs,
            X509_STORE *st, unsigned long flags);
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
 void ERR_load_OCSP_strings(void);
 /* Error codes for the OCSP functions. */
diff --git a/src/lib/libcrypto/ocsp/ocsp_err.c b/src/lib/libcrypto/ocsp/ocsp_err.c
index 9e3237f6a4..7cf5b7e8a1 100644
--- a/src/lib/libcrypto/ocsp/ocsp_err.c
+++ b/src/lib/libcrypto/ocsp/ocsp_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ocsp_err.c,v 1.8 2017/01/29 17:49:23 beck Exp $ */
+/* $OpenBSD: ocsp_err.c,v 1.9 2022/07/12 14:42:49 kn Exp $ */
 /* ====================================================================
 * Copyright (c) 1999-2006 The OpenSSL Project.  All rights reserved.
 *
@@ -53,11 +53,6 @@
 *
 */
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
- */
 #include <stdio.h>
 #include <openssl/opensslconf.h>
@@ -65,7 +60,6 @@
 #include <openssl/err.h>
 #include <openssl/ocsp.h>
-/* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_OCSP,func,0)
diff --git a/src/lib/libcrypto/pem/pem.h b/src/lib/libcrypto/pem/pem.h
index 95f1e030b1..a0f7d78c01 100644
--- a/src/lib/libcrypto/pem/pem.h
+++ b/src/lib/libcrypto/pem/pem.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pem.h,v 1.23 2022/01/14 07:52:24 tb Exp $ */
+/* $OpenBSD: pem.h,v 1.24 2022/07/12 14:42:50 kn Exp $ */
 /* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -516,10 +516,6 @@ int i2b_PVK_bio(BIO *out, EVP_PKEY *pk, int enclevel, pem_password_cb *cb,
 #endif
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
 void ERR_load_PEM_strings(void);
 /* Error codes for the PEM functions. */
diff --git a/src/lib/libcrypto/pem/pem_err.c b/src/lib/libcrypto/pem/pem_err.c
index 8d3c278b54..d817cafff0 100644
--- a/src/lib/libcrypto/pem/pem_err.c
+++ b/src/lib/libcrypto/pem/pem_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pem_err.c,v 1.12 2017/01/29 17:49:23 beck Exp $ */
+/* $OpenBSD: pem_err.c,v 1.13 2022/07/12 14:42:50 kn Exp $ */
 /* ====================================================================
 * Copyright (c) 1999-2007 The OpenSSL Project.  All rights reserved.
 *
@@ -53,11 +53,6 @@
 *
 */
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
- */
 #include <stdio.h>
 #include <openssl/opensslconf.h>
@@ -65,7 +60,6 @@
 #include <openssl/err.h>
 #include <openssl/pem.h>
-/* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_PEM,func,0)
diff --git a/src/lib/libcrypto/pkcs12/pk12err.c b/src/lib/libcrypto/pkcs12/pk12err.c
index c1d075a0ff..23166bfd59 100644
--- a/src/lib/libcrypto/pkcs12/pk12err.c
+++ b/src/lib/libcrypto/pkcs12/pk12err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pk12err.c,v 1.11 2020/06/05 16:51:12 jsing Exp $ */
+/* $OpenBSD: pk12err.c,v 1.12 2022/07/12 14:42:50 kn Exp $ */
 /* ====================================================================
 * Copyright (c) 1999-2006 The OpenSSL Project.  All rights reserved.
 *
@@ -53,11 +53,6 @@
 *
 */
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
- */
 #include <stdio.h>
 #include <openssl/opensslconf.h>
@@ -65,7 +60,6 @@
 #include <openssl/err.h>
 #include <openssl/pkcs12.h>
-/* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_PKCS12,func,0)
diff --git a/src/lib/libcrypto/pkcs12/pkcs12.h b/src/lib/libcrypto/pkcs12/pkcs12.h
index 56635f9d7e..920b4be202 100644
--- a/src/lib/libcrypto/pkcs12/pkcs12.h
+++ b/src/lib/libcrypto/pkcs12/pkcs12.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkcs12.h,v 1.24 2018/05/30 15:32:11 tb Exp $ */
+/* $OpenBSD: pkcs12.h,v 1.25 2022/07/12 14:42:50 kn Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
 * project 1999.
 */
@@ -283,10 +283,6 @@ PKCS12 *d2i_PKCS12_bio(BIO *bp, PKCS12 **p12);
 PKCS12 *d2i_PKCS12_fp(FILE *fp, PKCS12 **p12);
 int PKCS12_newpass(PKCS12 *p12, const char *oldpass, const char *newpass);
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
 void ERR_load_PKCS12_strings(void);
 /* Error codes for the PKCS12 functions. */
diff --git a/src/lib/libcrypto/pkcs7/pkcs7.h b/src/lib/libcrypto/pkcs7/pkcs7.h
index 520cc3c519..1a204c2858 100644
--- a/src/lib/libcrypto/pkcs7/pkcs7.h
+++ b/src/lib/libcrypto/pkcs7/pkcs7.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkcs7.h,v 1.18 2016/12/27 16:12:47 jsing Exp $ */
+/* $OpenBSD: pkcs7.h,v 1.19 2022/07/12 14:42:50 kn Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -405,10 +405,6 @@ PKCS7 *SMIME_read_PKCS7(BIO *bio, BIO **bcont);
 BIO *BIO_new_PKCS7(BIO *out, PKCS7 *p7);
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
 void ERR_load_PKCS7_strings(void);
 /* Error codes for the PKCS7 functions. */
diff --git a/src/lib/libcrypto/pkcs7/pkcs7err.c b/src/lib/libcrypto/pkcs7/pkcs7err.c
index 251e781641..bd3791e358 100644
--- a/src/lib/libcrypto/pkcs7/pkcs7err.c
+++ b/src/lib/libcrypto/pkcs7/pkcs7err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkcs7err.c,v 1.12 2020/06/05 16:51:12 jsing Exp $ */
+/* $OpenBSD: pkcs7err.c,v 1.13 2022/07/12 14:42:50 kn Exp $ */
 /* ====================================================================
 * Copyright (c) 1999-2007 The OpenSSL Project.  All rights reserved.
 *
@@ -53,11 +53,6 @@
 *
 */
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
- */
 #include <stdio.h>
 #include <openssl/opensslconf.h>
@@ -65,7 +60,6 @@
 #include <openssl/err.h>
 #include <openssl/pkcs7.h>
-/* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_PKCS7,func,0)
diff --git a/src/lib/libcrypto/rand/rand.h b/src/lib/libcrypto/rand/rand.h
index fcb2e9218d..a0e9b47969 100644
--- a/src/lib/libcrypto/rand/rand.h
+++ b/src/lib/libcrypto/rand/rand.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rand.h,v 1.22 2014/10/22 14:02:52 jsing Exp $ */
+/* $OpenBSD: rand.h,v 1.23 2022/07/12 14:42:50 kn Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -101,10 +101,6 @@ int RAND_status(void);
 int RAND_poll(void);
 #endif
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
 void ERR_load_RAND_strings(void);
 /* Error codes for the RAND functions. (no longer used) */
diff --git a/src/lib/libcrypto/rand/rand_err.c b/src/lib/libcrypto/rand/rand_err.c
index 1ac00be773..c57b9a8d63 100644
--- a/src/lib/libcrypto/rand/rand_err.c
+++ b/src/lib/libcrypto/rand/rand_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rand_err.c,v 1.15 2017/01/29 17:49:23 beck Exp $ */
+/* $OpenBSD: rand_err.c,v 1.16 2022/07/12 14:42:50 kn Exp $ */
 /* ====================================================================
 * Copyright (c) 1999-2011 The OpenSSL Project.  All rights reserved.
 *
@@ -53,11 +53,6 @@
 *
 */
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
- */
 #include <stdio.h>
 #include <openssl/opensslconf.h>
@@ -65,7 +60,6 @@
 #include <openssl/err.h>
 #include <openssl/rand.h>
-/* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_RAND,func,0)
diff --git a/src/lib/libcrypto/rsa/rsa.h b/src/lib/libcrypto/rsa/rsa.h
index 888902d18c..73ec9d5a42 100644
--- a/src/lib/libcrypto/rsa/rsa.h
+++ b/src/lib/libcrypto/rsa/rsa.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa.h,v 1.57 2022/07/07 13:01:28 tb Exp $ */
+/* $OpenBSD: rsa.h,v 1.58 2022/07/12 14:42:50 kn Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -475,10 +475,6 @@ int RSA_meth_set_verify(RSA_METHOD *rsa, int (*verify)(int dtype,
    unsigned int siglen, const RSA *rsa));
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
 void ERR_load_RSA_strings(void);
 /* Error codes for the RSA functions. */
diff --git a/src/lib/libcrypto/rsa/rsa_err.c b/src/lib/libcrypto/rsa/rsa_err.c
index 46149370d8..79425c0f45 100644
--- a/src/lib/libcrypto/rsa/rsa_err.c
+++ b/src/lib/libcrypto/rsa/rsa_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_err.c,v 1.20 2019/11/01 15:13:05 jsing Exp $ */
+/* $OpenBSD: rsa_err.c,v 1.21 2022/07/12 14:42:50 kn Exp $ */
 /* ====================================================================
 * Copyright (c) 1999-2011 The OpenSSL Project.  All rights reserved.
 *
@@ -53,11 +53,6 @@
 *
 */
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
- */
 #include <stdio.h>
 #include <openssl/opensslconf.h>
@@ -65,7 +60,6 @@
 #include <openssl/err.h>
 #include <openssl/rsa.h>
-/* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_RSA,func,0)
diff --git a/src/lib/libcrypto/sm2/sm2.h b/src/lib/libcrypto/sm2/sm2.h
index 92eef8a6de..dee75eb68b 100644
--- a/src/lib/libcrypto/sm2/sm2.h
+++ b/src/lib/libcrypto/sm2/sm2.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: sm2.h,v 1.1.1.1 2021/08/18 16:04:32 tb Exp $ */
+/*      $OpenBSD: sm2.h,v 1.2 2022/07/12 14:42:50 kn Exp $ */
 /*
 * Copyright (c) 2017, 2019 Ribose Inc
 *
@@ -59,10 +59,6 @@ int SM2_decrypt(const EC_KEY *key, const EVP_MD *digest,
    const uint8_t *ciphertext, size_t ciphertext_len, uint8_t *ptext_buf,
    size_t *ptext_len);
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
 void ERR_load_SM2_strings(void);
 /* Error codes for the SM2 functions. */
diff --git a/src/lib/libcrypto/sm2/sm2_err.c b/src/lib/libcrypto/sm2/sm2_err.c
index d34123cbf9..a7dc1e0d9e 100644
--- a/src/lib/libcrypto/sm2/sm2_err.c
+++ b/src/lib/libcrypto/sm2/sm2_err.c
@@ -1,6 +1,5 @@
-/*      $OpenBSD: sm2_err.c,v 1.1.1.1 2021/08/18 16:04:32 tb Exp $ */
+/*      $OpenBSD: sm2_err.c,v 1.2 2022/07/12 14:42:50 kn Exp $ */
 /*
- * Generated by util/mkerr.pl DO NOT EDIT
 * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
 *
 * Licensed under the OpenSSL license (the "License").  You may not use
diff --git a/src/lib/libcrypto/ts/ts.h b/src/lib/libcrypto/ts/ts.h
index fa8eb949a4..405d29e166 100644
--- a/src/lib/libcrypto/ts/ts.h
+++ b/src/lib/libcrypto/ts/ts.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ts.h,v 1.10 2018/05/13 15:35:46 tb Exp $ */
+/* $OpenBSD: ts.h,v 1.11 2022/07/12 14:42:50 kn Exp $ */
 /* Written by Zoltan Glozik (zglozik@opentsa.org) for the OpenSSL
 * project 2002, 2003, 2004.
 */
@@ -732,11 +732,6 @@ int TS_CONF_set_tsa_name(CONF *conf, const char *section, TS_RESP_CTX *ctx);
 int TS_CONF_set_ess_cert_id_chain(CONF *conf, const char *section,
    TS_RESP_CTX *ctx);
-/* -------------------------------------------------- */
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
 void ERR_load_TS_strings(void);
 /* Error codes for the TS functions. */
diff --git a/src/lib/libcrypto/ts/ts_err.c b/src/lib/libcrypto/ts/ts_err.c
index 4b89909384..ddd532a6a7 100644
--- a/src/lib/libcrypto/ts/ts_err.c
+++ b/src/lib/libcrypto/ts/ts_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ts_err.c,v 1.5 2017/01/29 17:49:23 beck Exp $ */
+/* $OpenBSD: ts_err.c,v 1.6 2022/07/12 14:42:50 kn Exp $ */
 /* ====================================================================
 * Copyright (c) 1999-2007 The OpenSSL Project.  All rights reserved.
 *
@@ -53,11 +53,6 @@
 *
 */
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
- */
 #include <stdio.h>
 #include <openssl/opensslconf.h>
@@ -65,7 +60,6 @@
 #include <openssl/err.h>
 #include <openssl/ts.h>
-/* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_TS,func,0)
diff --git a/src/lib/libcrypto/ui/ui.h b/src/lib/libcrypto/ui/ui.h
index 5ca65b0a36..c6888d22d6 100644
--- a/src/lib/libcrypto/ui/ui.h
+++ b/src/lib/libcrypto/ui/ui.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ui.h,v 1.12 2020/09/24 19:20:32 tb Exp $ */
+/* $OpenBSD: ui.h,v 1.13 2022/07/12 14:42:50 kn Exp $ */
 /* Written by Richard Levitte (richard@levitte.org) for the OpenSSL
 * project 2001.
 */
@@ -371,11 +371,7 @@ int UI_UTIL_read_pw_string(char *buf, int length, const char *prompt,
 int UI_UTIL_read_pw(char *buf, char *buff, int size, const char *prompt,
    int verify);
-/* BEGIN ERROR CODES */
 /*
- * The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
 void ERR_load_UI_strings(void);
 /* Error codes for the UI functions. */
diff --git a/src/lib/libcrypto/ui/ui_err.c b/src/lib/libcrypto/ui/ui_err.c
index 8451d63253..691403aff6 100644
--- a/src/lib/libcrypto/ui/ui_err.c
+++ b/src/lib/libcrypto/ui/ui_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ui_err.c,v 1.9 2017/01/29 17:49:23 beck Exp $ */
+/* $OpenBSD: ui_err.c,v 1.10 2022/07/12 14:42:50 kn Exp $ */
 /* ====================================================================
 * Copyright (c) 1999-2006 The OpenSSL Project.  All rights reserved.
 *
@@ -53,11 +53,6 @@
 *
 */
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
- */
 #include <stdio.h>
 #include <openssl/opensslconf.h>
@@ -65,7 +60,6 @@
 #include <openssl/err.h>
 #include <openssl/ui.h>
-/* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_UI,func,0)
diff --git a/src/lib/libcrypto/util/mkerr.pl b/src/lib/libcrypto/util/mkerr.pl
deleted file mode 100644
index aec401c773..0000000000
--- a/src/lib/libcrypto/util/mkerr.pl
+++ /dev/null
@@ -1,810 +0,0 @@
-#!/usr/local/bin/perl -w
-my $config = "crypto/err/openssl.ec";
-my $hprefix = "openssl/";
-my $debug = 0;
-my $rebuild = 0;
-my $static = 1;
-my $recurse = 0;
-my $reindex = 0;
-my $dowrite = 0;
-my $staticloader = "";
-my $pack_errcode;
-my $load_errcode;
-my $errcount;
-while (@ARGV) {
-        my $arg = $ARGV[0];
-        if($arg eq "-conf") {
-                shift @ARGV;
-                $config = shift @ARGV;
-        } elsif($arg eq "-hprefix") {
-                shift @ARGV;
-                $hprefix = shift @ARGV;
-        } elsif($arg eq "-debug") {
-                $debug = 1;
-                shift @ARGV;
-        } elsif($arg eq "-rebuild") {
-                $rebuild = 1;
-                shift @ARGV;
-        } elsif($arg eq "-recurse") {
-                $recurse = 1;
-                shift @ARGV;
-        } elsif($arg eq "-reindex") {
-                $reindex = 1;
-                shift @ARGV;
-        } elsif($arg eq "-nostatic") {
-                $static = 0;
-                shift @ARGV;
-        } elsif($arg eq "-staticloader") {
-                $staticloader = "static ";
-                shift @ARGV;
-        } elsif($arg eq "-write") {
-                $dowrite = 1;
-                shift @ARGV;
-        } elsif($arg eq "-help" || $arg eq "-h" || $arg eq "-?" || $arg eq "--help") {
-                print STDERR <<"EOF";
-mkerr.pl [options] ...
-Options:
-  -conf F       Use the config file F instead of the default one:
-                  crypto/err/openssl.ec
-  -hprefix P    Prepend the filenames in generated #include <header>
-                statements with prefix P. Default: 'openssl/' (without
-                the quotes, naturally)
-  -debug        Turn on debugging verbose output on stderr.
-  -rebuild      Rebuild all header and C source files, irrespective of the
-                fact if any error or function codes have been added/removed.
-                Default: only update files for libraries which saw change
-                         (of course, this requires '-write' as well, or no
-                          files will be touched!)
-  -recurse      scan a preconfigured set of directories / files for error and
-                function codes:
-                  (<crypto/*.c>, <crypto/*/*.c>, <ssl/*.c>, <apps/*.c>)
-                When this option is NOT specified, the filelist is taken from
-                the commandline instead. Here, wildcards may be embedded. (Be
-                sure to escape those to prevent the shell from expanding them
-                for you when you wish mkerr.pl to do so instead.)
-                Default: take file list to scan from the command line.
-  -reindex      Discard the numeric values previously assigned to the error
-                and function codes as extracted from the scanned header files;
-                instead renumber all of them starting from 100. (Note that
-                the numbers assigned through 'R' records in the config file
-                remain intact.)
-                Default: keep previously assigned numbers. (You are warned
-                         when collisions are detected.)
-  -nostatic     Generates a different source code, where these additional 
-                functions are generated for each library specified in the
-                config file:
-                  void ERR_load_<LIB>_strings(void);
-                  void ERR_unload_<LIB>_strings(void);
-                  void ERR_<LIB>_error(int f, int r, char *fn, int ln);
-                  #define <LIB>err(f,r) ERR_<LIB>_error(f,r,__FILE__,__LINE__)
-                while the code facilitates the use of these in an environment
-                where the error support routines are dynamically loaded at 
-                runtime.
-                Default: 'static' code generation.
-  -staticloader Prefix generated functions with the 'static' scope modifier.
-                Default: don't write any scope modifier prefix.
-  -write        Actually (over)write the generated code to the header and C 
-                source files as assigned to each library through the config 
-                file.
-                Default: don't write.
-  -help / -h / -? / --help            Show this help text.
-  ...           Additional arguments are added to the file list to scan,
-                assuming '-recurse' was NOT specified on the command line.
-EOF
-                exit 1;
-        } else {
-                last;
-        }
-}
-if($recurse) {
-        @source = (<crypto/*.c>, <crypto/*/*.c>, <ssl/*.c>);
-} else {
-        @source = @ARGV;
-}
-# Read in the config file
-open(IN, "<$config") || die "Can't open config file $config";
-# Parse config file
-while(<IN>)
-{
-        if(/^L\s+(\S+)\s+(\S+)\s+(\S+)/) {
-                $hinc{$1} = $2;
-                $libinc{$2} = $1;
-                $cskip{$3} = $1;
-                if($3 ne "NONE") {
-                        $csrc{$1} = $3;
-                        $fmax{$1} = 100;
-                        $rmax{$1} = 100;
-                        $fassigned{$1} = ":";
-                        $rassigned{$1} = ":";
-                        $fnew{$1} = 0;
-                        $rnew{$1} = 0;
-                }
-        } elsif (/^F\s+(\S+)/) {
-        # Add extra function with $1
-        } elsif (/^R\s+(\S+)\s+(\S+)/) {
-                $rextra{$1} = $2;
-                $rcodes{$1} = $2;
-        }
-}
-close IN;
-# Scan each header file in turn and make a list of error codes
-# and function names
-while (($hdr, $lib) = each %libinc)
-{
-        next if($hdr eq "NONE");
-        print STDERR "Scanning header file $hdr\n" if $debug; 
-        my $line = "", $def= "", $linenr = 0, $gotfile = 0;
-        if (open(IN, "<$hdr")) {
-            $gotfile = 1;
-            while(<IN>) {
-                $linenr++;
-                print STDERR "line: $linenr\r" if $debug;
-                last if(/BEGIN\s+ERROR\s+CODES/);
-                if ($line ne '') {
-                    $_ = $line . $_;
-                    $line = '';
-                }
-                if (/\\$/) {
-                    $line = $_;
-                    next;
-                }
-                if(/\/\*/) {
-                    if (not /\*\//) {           # multiline comment...
-                        $line = $_;             # ... just accumulate
-                        next; 
-                    } else {
-                        s/\/\*.*?\*\///gs;      # wipe it
-                    }
-                }
-                if ($cpp) {
-                    $cpp++ if /^#\s*if/;
-                    $cpp-- if /^#\s*endif/;
-                    next;
-                }
-                $cpp = 1 if /^#.*ifdef.*cplusplus/;  # skip "C" declaration
-                next if (/^\#/);                      # skip preprocessor directives
-                s/{[^{}]*}//gs;                      # ignore {} blocks
-                if (/\{|\/\*/) { # Add a } so editor works...
-                    $line = $_;
-                } else {
-                    $def .= $_;
-                }
-            }
-        }
-        print STDERR "                                  \r" if $debug;
-        $defnr = 0;
-        # Delete any DECLARE_ macros
-        $def =~ s/DECLARE_\w+\([\w,\s]+\)//gs;
-        foreach (split /;/, $def) {
-            $defnr++;
-            print STDERR "def: $defnr\r" if $debug;
-            # The goal is to collect function names from function declarations.
-            s/^[\n\s]*//g;
-            s/[\n\s]*$//g;
-            # Skip over recognized non-function declarations
-            next if(/typedef\W/ or /DECLARE_STACK_OF/ or /TYPEDEF_.*_OF/);
-            # Remove STACK_OF(foo)
-            s/STACK_OF\(\w+\)/void/;
-            # Reduce argument lists to empty ()
-            # fold round brackets recursively: (t(*v)(t),t) -> (t{}{},t) -> {}
-            while(/\(.*\)/s) {
-                s/\([^\(\)]+\)/\{\}/gs;
-                s/\(\s*\*\s*(\w+)\s*\{\}\s*\)/$1/gs;    #(*f{}) -> f
-            }
-            # pretend as we didn't use curly braces: {} -> ()
-            s/\{\}/\(\)/gs;
-            if (/(\w+)\s*\(\).*/s) {    # first token prior [first] () is
-                my $name = $1;          # a function name!
-                $name =~ tr/[a-z]/[A-Z]/;
-                $ftrans{$name} = $1;
-            } elsif (/[\(\)]/ and not (/=/)) {
-                print STDERR "Header $hdr: cannot parse: $_;\n";
-            }
-        }
-        print STDERR "                                  \r" if $debug;
-        next if $reindex;
-        # Scan function and reason codes and store them: keep a note of the
-        # maximum code used.
-        if ($gotfile) {
-          while(<IN>) {
-                if(/^\#define\s+(\S+)\s+(\S+)/) {
-                        $name = $1;
-                        $code = $2;
-                        next if $name =~ /^${lib}err/;
-                        unless($name =~ /^${lib}_([RF])_(\w+)$/) {
-                                print STDERR "Invalid error code $name\n";
-                                next;
-                        }
-                        if($1 eq "R") {
-                                $rcodes{$name} = $code;
-                                if ($rassigned{$lib} =~ /:$code:/) {
-                                        print STDERR "!! ERROR: $lib reason code $code assigned twice (collision at $name)\n";
-                                        ++$errcount;
-                                }
-                                $rassigned{$lib} .= "$code:";
-                                if(!(exists $rextra{$name}) &&
-                                         ($code > $rmax{$lib}) ) {
-                                        $rmax{$lib} = $code;
-                                }
-                        } else {
-                                if ($fassigned{$lib} =~ /:$code:/) {
-                                        print STDERR "!! ERROR: $lib function code $code assigned twice (collision at $name)\n";
-                                        ++$errcount;
-                                }
-                                $fassigned{$lib} .= "$code:";
-                                if($code > $fmax{$lib}) {
-                                        $fmax{$lib} = $code;
-                                }
-                                $fcodes{$name} = $code;
-                        }
-                }
-          }
-        }
-        if ($debug) {
-                if (defined($fmax{$lib})) {
-                        print STDERR "Max function code fmax" . "{" . "$lib" . "} = $fmax{$lib}\n";
-                        $fassigned{$lib} =~ m/^:(.*):$/;
-                        @fassigned = sort {$a <=> $b} split(":", $1);
-                        print STDERR "  @fassigned\n";
-                }
-                if (defined($rmax{$lib})) {
-                        print STDERR "Max reason code rmax" . "{" . "$lib" . "} = $rmax{$lib}\n";
-                        $rassigned{$lib} =~ m/^:(.*):$/;
-                        @rassigned = sort {$a <=> $b} split(":", $1);
-                        print STDERR "  @rassigned\n";
-                }
-        }
-        if ($lib eq "SSL") {
-                if ($rmax{$lib} >= 1000) {
-                        print STDERR "!! ERROR: SSL error codes 1000+ are reserved for alerts.\n";
-                        print STDERR "!!        Any new alerts must be added to $config.\n";
-                        ++$errcount;
-                        print STDERR "\n";
-                }
-        }
-        close IN;
-}
-# Scan each C source file and look for function and reason codes
-# This is done by looking for strings that "look like" function or
-# reason codes: basically anything consisting of all upper case and
-# numerics which has _F_ or _R_ in it and which has the name of an
-# error library at the start. This seems to work fine except for the
-# oddly named structure BIO_F_CTX which needs to be ignored.
-# If a code doesn't exist in list compiled from headers then mark it
-# with the value "X" as a place holder to give it a value later.
-# Store all function and reason codes found in %ufcodes and %urcodes
-# so all those unreferenced can be printed out.
-foreach $file (@source) {
-        # Don't parse the error source file.
-        next if exists $cskip{$file};
-        print STDERR "File loaded: ".$file."\r" if $debug;
-        open(IN, "<$file") || die "Can't open source file $file\n";
-        while(<IN>) {
-                # skip obsoleted source files entirely!
-                last if(/^#error\s+obsolete/);
-                if(/(([A-Z0-9]+)_F_([A-Z0-9_]+))/) {
-                        next unless exists $csrc{$2};
-                        next if($1 eq "BIO_F_BUFFER_CTX");
-                        $ufcodes{$1} = 1;
-                        if(!exists $fcodes{$1}) {
-                                $fcodes{$1} = "X";
-                                $fnew{$2}++;
-                        }
-                        $notrans{$1} = 1 unless exists $ftrans{$3};
-                        print STDERR "Function: $1\t= $fcodes{$1} (lib: $2, name: $3)\n" if $debug; 
-                }
-                if(/(([A-Z0-9]+)_R_[A-Z0-9_]+)/) {
-                        next unless exists $csrc{$2};
-                        $urcodes{$1} = 1;
-                        if(!exists $rcodes{$1}) {
-                                $rcodes{$1} = "X";
-                                $rnew{$2}++;
-                        }
-                        print STDERR "Reason: $1\t= $rcodes{$1} (lib: $2)\n" if $debug; 
-                } 
-        }
-        close IN;
-}
-print STDERR "                                  \n" if $debug;
-# Now process each library in turn.
-foreach $lib (keys %csrc)
-{
-        my $hfile = $hinc{$lib};
-        my $cfile = $csrc{$lib};
-        if(!$fnew{$lib} && !$rnew{$lib}) {
-                print STDERR "$lib:\t\tNo new error codes\n";
-                next unless $rebuild;
-        } else {
-                print STDERR "$lib:\t\t$fnew{$lib} New Functions,";
-                print STDERR " $rnew{$lib} New Reasons.\n";
-                next unless $dowrite;
-        }
-        # If we get here then we have some new error codes so we
-        # need to rebuild the header file and C file.
-        # Make a sorted list of error and reason codes for later use.
-        my @function = sort grep(/^${lib}_/,keys %fcodes);
-        my @reasons = sort grep(/^${lib}_/,keys %rcodes);
-        # Rewrite the header file
-        if (open(IN, "<$hfile")) {
-            # Copy across the old file
-            while(<IN>) {
-                push @out, $_;
-                last if (/BEGIN ERROR CODES/);
-            }
-            close IN;
-        } else {
-            push @out,
-"/* ====================================================================\n",
-" * Copyright (c) 2001-2011 The OpenSSL Project.  All rights reserved.\n",
-" *\n",
-" * Redistribution and use in source and binary forms, with or without\n",
-" * modification, are permitted provided that the following conditions\n",
-" * are met:\n",
-" *\n",
-" * 1. Redistributions of source code must retain the above copyright\n",
-" *    notice, this list of conditions and the following disclaimer. \n",
-" *\n",
-" * 2. Redistributions in binary form must reproduce the above copyright\n",
-" *    notice, this list of conditions and the following disclaimer in\n",
-" *    the documentation and/or other materials provided with the\n",
-" *    distribution.\n",
-" *\n",
-" * 3. All advertising materials mentioning features or use of this\n",
-" *    software must display the following acknowledgment:\n",
-" *    \"This product includes software developed by the OpenSSL Project\n",
-" *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)\"\n",
-" *\n",
-" * 4. The names \"OpenSSL Toolkit\" and \"OpenSSL Project\" must not be used to\n",
-" *    endorse or promote products derived from this software without\n",
-" *    prior written permission. For written permission, please contact\n",
-" *    openssl-core\@openssl.org.\n",
-" *\n",
-" * 5. Products derived from this software may not be called \"OpenSSL\"\n",
-" *    nor may \"OpenSSL\" appear in their names without prior written\n",
-" *    permission of the OpenSSL Project.\n",
-" *\n",
-" * 6. Redistributions of any form whatsoever must retain the following\n",
-" *    acknowledgment:\n",
-" *    \"This product includes software developed by the OpenSSL Project\n",
-" *    for use in the OpenSSL Toolkit (http://www.openssl.org/)\"\n",
-" *\n",
-" * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY\n",
-" * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE\n",
-" * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR\n",
-" * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR\n",
-" * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,\n",
-" * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT\n",
-" * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;\n",
-" * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)\n",
-" * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,\n",
-" * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)\n",
-" * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED\n",
-" * OF THE POSSIBILITY OF SUCH DAMAGE.\n",
-" * ====================================================================\n",
-" *\n",
-" * This product includes cryptographic software written by Eric Young\n",
-" * (eay\@cryptsoft.com).  This product includes software written by Tim\n",
-" * Hudson (tjh\@cryptsoft.com).\n",
-" *\n",
-" */\n",
-"\n",
-"#ifndef HEADER_${lib}_ERR_H\n",
-"#define HEADER_${lib}_ERR_H\n",
-"\n",
-"#ifdef  __cplusplus\n",
-"extern \"C\" {\n",
-"#endif\n",
-"\n",
-"/* BEGIN ERROR CODES */\n";
-        }
-        open (OUT, ">$hfile") || die "Can't Open File $hfile for writing\n";
-        print OUT @out;
-        undef @out;
-        print OUT <<"EOF";
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
-EOF
-        if($static) {
-                print OUT <<"EOF";
-${staticloader}void ERR_load_${lib}_strings(void);
-EOF
-        } else {
-                print OUT <<"EOF";
-${staticloader}void ERR_load_${lib}_strings(void);
-${staticloader}void ERR_unload_${lib}_strings(void);
-${staticloader}void ERR_${lib}_error(int function, int reason, char *file, int line);
-#define ${lib}err(f,r) ERR_${lib}_error((f),(r),__FILE__,__LINE__)
-EOF
-        }
-        print OUT <<"EOF";
-/* Error codes for the $lib functions. */
-/* Function codes. */
-EOF
-        foreach $i (@function) {
-                $z=6-int(length($i)/8);
-                if($fcodes{$i} eq "X") {
-                        $fassigned{$lib} =~ m/^:([^:]*):/;
-                        $findcode = $1;
-                        if (!defined($findcode)) {
-                                $findcode = $fmax{$lib};
-                        }
-                        while ($fassigned{$lib} =~ m/:$findcode:/) {
-                                $findcode++;
-                        }
-                        $fcodes{$i} = $findcode;
-                        $fassigned{$lib} .= "$findcode:";
-                        print STDERR "New Function code $i\n" if $debug;
-                }
-                printf OUT "#define $i%s $fcodes{$i}\n","\t" x $z;
-        }
-        print OUT "\n/* Reason codes. */\n";
-        foreach $i (@reasons) {
-                $z=6-int(length($i)/8);
-                if($rcodes{$i} eq "X") {
-                        $rassigned{$lib} =~ m/^:([^:]*):/;
-                        $findcode = $1;
-                        if (!defined($findcode)) {
-                                $findcode = $rmax{$lib};
-                        }
-                        while ($rassigned{$lib} =~ m/:$findcode:/) {
-                                $findcode++;
-                        }
-                        $rcodes{$i} = $findcode;
-                        $rassigned{$lib} .= "$findcode:";
-                        print STDERR "New Reason code   $i\n" if $debug;
-                }
-                printf OUT "#define $i%s $rcodes{$i}\n","\t" x $z;
-        }
-        print OUT <<"EOF";
-#ifdef  __cplusplus
-}
-#endif
-#endif
-EOF
-        close OUT;
-        # Rewrite the C source file containing the error details.
-        # First, read any existing reason string definitions:
-        my %err_reason_strings;
-        if (open(IN,"<$cfile")) {
-                while (<IN>) {
-                        if (/\b(${lib}_R_\w*)\b.*\"(.*)\"/) {
-                                $err_reason_strings{$1} = $2;
-                        }
-                        if (/\b${lib}_F_(\w*)\b.*\"(.*)\"/) {
-                                if (!exists $ftrans{$1} && ($1 ne $2)) {
-                                        print STDERR "WARNING: Mismatched function string $2\n";
-                                        $ftrans{$1} = $2;
-                                }
-                        }
-                }
-                close(IN);
-        }
-        my $hincf;
-        if($static) {
-                $hfile =~ /([^\/]+)$/;
-                $hincf = "<${hprefix}$1>";
-        } else {
-                $hincf = "\"$hfile\"";
-        }
-        # If static we know the error code at compile time so use it
-        # in error definitions.
-        if ($static)
-                {
-                $pack_errcode = "ERR_LIB_${lib}";
-                $load_errcode = "0";
-                }
-        else
-                {
-                $pack_errcode = "0";
-                $load_errcode = "ERR_LIB_${lib}";
-                }
-        open (OUT,">$cfile") || die "Can't open $cfile for writing";
-        print OUT <<"EOF";
-/* $cfile */
-/* ====================================================================
- * Copyright (c) 1999-2011 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
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core\@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay\@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh\@cryptsoft.com).
- *
- */
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
- */
-#include <stdio.h>
-#include <openssl/err.h>
-#include $hincf
-/* BEGIN ERROR CODES */
-#ifndef OPENSSL_NO_ERR
-#define ERR_FUNC(func) ERR_PACK($pack_errcode,func,0)
-#define ERR_REASON(reason) ERR_PACK($pack_errcode,0,reason)
-static ERR_STRING_DATA ${lib}_str_functs[]=
-        {
-EOF
-        # Add each function code: if a function name is found then use it.
-        foreach $i (@function) {
-                my $fn;
-                $i =~ /^${lib}_F_(\S+)$/;
-                $fn = $1;
-                if(exists $ftrans{$fn}) {
-                        $fn = $ftrans{$fn};
-                }
-#               print OUT "{ERR_PACK($pack_errcode,$i,0),\t\"$fn\"},\n";
-                print OUT "{ERR_FUNC($i),\t\"$fn\"},\n";
-        }
-        print OUT <<"EOF";
-{0,NULL}
-        };
-static ERR_STRING_DATA ${lib}_str_reasons[]=
-        {
-EOF
-        # Add each reason code.
-        foreach $i (@reasons) {
-                my $rn;
-                my $rstr = "ERR_REASON($i)";
-                my $nspc = 0;
-                if (exists $err_reason_strings{$i}) {
-                        $rn = $err_reason_strings{$i};
-                } else {
-                        $i =~ /^${lib}_R_(\S+)$/;
-                        $rn = $1;
-                        $rn =~ tr/_[A-Z]/ [a-z]/;
-                }
-                $nspc = 40 - length($rstr) unless length($rstr) > 40;
-                $nspc = " " x $nspc;
-                print OUT "{${rstr}${nspc},\"$rn\"},\n";
-        }
-if($static) {
-        print OUT <<"EOF";
-{0,NULL}
-        };
-#endif
-${staticloader}void ERR_load_${lib}_strings(void)
-        {
-#ifndef OPENSSL_NO_ERR
-        if (ERR_func_error_string(${lib}_str_functs[0].error) == NULL)
-                {
-                ERR_load_strings($load_errcode,${lib}_str_functs);
-                ERR_load_strings($load_errcode,${lib}_str_reasons);
-                }
-#endif
-        }
-EOF
-} else {
-        print OUT <<"EOF";
-{0,NULL}
-        };
-#endif
-#ifdef ${lib}_LIB_NAME
-static ERR_STRING_DATA ${lib}_lib_name[]=
-        {
-{0      ,${lib}_LIB_NAME},
-{0,NULL}
-        };
-#endif
-static int ${lib}_lib_error_code=0;
-static int ${lib}_error_init=1;
-${staticloader}void ERR_load_${lib}_strings(void)
-        {
-        if (${lib}_lib_error_code == 0)
-                ${lib}_lib_error_code=ERR_get_next_error_library();
-        if (${lib}_error_init)
-                {
-                ${lib}_error_init=0;
-#ifndef OPENSSL_NO_ERR
-                ERR_load_strings(${lib}_lib_error_code,${lib}_str_functs);
-                ERR_load_strings(${lib}_lib_error_code,${lib}_str_reasons);
-#endif
-#ifdef ${lib}_LIB_NAME
-                ${lib}_lib_name->error = ERR_PACK(${lib}_lib_error_code,0,0);
-                ERR_load_strings(0,${lib}_lib_name);
-#endif
-                }
-        }
-${staticloader}void ERR_unload_${lib}_strings(void)
-        {
-        if (${lib}_error_init == 0)
-                {
-#ifndef OPENSSL_NO_ERR
-                ERR_unload_strings(${lib}_lib_error_code,${lib}_str_functs);
-                ERR_unload_strings(${lib}_lib_error_code,${lib}_str_reasons);
-#endif
-#ifdef ${lib}_LIB_NAME
-                ERR_unload_strings(0,${lib}_lib_name);
-#endif
-                ${lib}_error_init=1;
-                }
-        }
-${staticloader}void ERR_${lib}_error(int function, int reason, char *file, int line)
-        {
-        if (${lib}_lib_error_code == 0)
-                ${lib}_lib_error_code=ERR_get_next_error_library();
-        ERR_PUT_error(${lib}_lib_error_code,function,reason,file,line);
-        }
-EOF
-}
-        close OUT;
-        undef %err_reason_strings;
-}
-if($debug && %notrans) {
-        print STDERR "The following function codes were not translated:\n";
-        foreach(sort keys %notrans)
-        {
-                print STDERR "$_\n";
-        }
-}
-# Make a list of unreferenced function and reason codes
-foreach (keys %fcodes) {
-        push (@funref, $_) unless exists $ufcodes{$_};
-}
-foreach (keys %rcodes) {
-        push (@runref, $_) unless exists $urcodes{$_};
-}
-if($debug && defined(@funref) ) {
-        print STDERR "The following function codes were not referenced:\n";
-        foreach(sort @funref)
-        {
-                print STDERR "$_\n";
-        }
-}
-if($debug && defined(@runref) ) {
-        print STDERR "The following reason codes were not referenced:\n";
-        foreach(sort @runref)
-        {
-                print STDERR "$_\n";
-        }
-}
-if($errcount) {
-        print STDERR "There were errors, failing...\n\n";
-        exit $errcount;
-}
diff --git a/src/lib/libcrypto/x509/x509.h b/src/lib/libcrypto/x509/x509.h
index 8a78a4c38d..7795181efc 100644
--- a/src/lib/libcrypto/x509/x509.h
+++ b/src/lib/libcrypto/x509/x509.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509.h,v 1.89 2022/01/10 14:13:03 tb Exp $ */
+/* $OpenBSD: x509.h,v 1.90 2022/07/12 14:42:50 kn Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -1123,10 +1123,6 @@ int X509_TRUST_get_trust(const X509_TRUST *xp);
 int X509_up_ref(X509 *x);
 STACK_OF(X509) *X509_chain_up_ref(STACK_OF(X509) *chain);
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
 void ERR_load_X509_strings(void);
 /* Error codes for the X509 functions. */
diff --git a/src/lib/libcrypto/x509/x509_err.c b/src/lib/libcrypto/x509/x509_err.c
index a8e9155718..588ed85411 100644
--- a/src/lib/libcrypto/x509/x509_err.c
+++ b/src/lib/libcrypto/x509/x509_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509_err.c,v 1.16 2021/11/10 13:57:42 schwarze Exp $ */
+/* $OpenBSD: x509_err.c,v 1.17 2022/07/12 14:42:50 kn Exp $ */
 /* ====================================================================
 * Copyright (c) 1999-2006 The OpenSSL Project.  All rights reserved.
 *
@@ -53,11 +53,6 @@
 *
 */
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
- */
 #include <stdio.h>
 #include <openssl/opensslconf.h>
@@ -66,7 +61,6 @@
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
-/* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_X509,func,0)
diff --git a/src/lib/libcrypto/x509/x509v3.h b/src/lib/libcrypto/x509/x509v3.h
index c82ecae08a..2bc87f6047 100644
--- a/src/lib/libcrypto/x509/x509v3.h
+++ b/src/lib/libcrypto/x509/x509v3.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: x509v3.h,v 1.14 2022/01/14 09:01:36 tb Exp $ */
+/* $OpenBSD: x509v3.h,v 1.15 2022/07/12 14:42:50 kn Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
 * project 1999.
 */
@@ -1036,10 +1036,6 @@ int X509v3_addr_validate_resource_set(STACK_OF(X509) *chain, IPAddrBlocks *ext,
 #endif /* !OPENSSL_NO_RFC3779 */
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
 void ERR_load_X509V3_strings(void);
 /* Error codes for the X509V3 functions. */
diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index d9a56b1901..d475cb24ba 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl.h,v 1.219 2022/07/07 13:02:59 tb Exp $ */
+/* $OpenBSD: ssl.h,v 1.220 2022/07/12 14:42:48 kn Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
 * All rights reserved.
 *
@@ -1600,10 +1600,6 @@ void SSL_get_peer_quic_transport_params(const SSL *ssl,
    const uint8_t **out_params, size_t *out_params_len);
 #endif
-/* BEGIN ERROR CODES */
-/* The following lines are auto generated by the script mkerr.pl. Any changes
- * made after this point may be overwritten when the script is next run.
- */
 void ERR_load_SSL_strings(void);
 /* Error codes for the SSL functions. */
diff --git a/src/lib/libssl/ssl_err.c b/src/lib/libssl/ssl_err.c
index 98ac620bd7..6078378568 100644
--- a/src/lib/libssl/ssl_err.c
+++ b/src/lib/libssl/ssl_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_err.c,v 1.42 2022/06/28 20:46:45 tb Exp $ */
+/* $OpenBSD: ssl_err.c,v 1.43 2022/07/12 14:42:48 kn Exp $ */
 /* ====================================================================
 * Copyright (c) 1999-2011 The OpenSSL Project.  All rights reserved.
 *
@@ -53,11 +53,6 @@
 *
 */
-/* NOTE: this file was auto generated by the mkerr.pl script: any changes
- * made to it will be overwritten when the script next updates this file,
- * only reason strings will be preserved.
- */
 #include <stdio.h>
 #include <openssl/err.h>
@@ -66,7 +61,6 @@
 #include "ssl_locl.h"
-/* BEGIN ERROR CODES */
 #ifndef OPENSSL_NO_ERR
 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_SSL,func,0)