From 8b50cac1a4b61fa1ae7e8b76cc77085fd8e089a4 Mon Sep 17 00:00:00 2001 From: tb Date: Sat, 7 May 2022 17:20:41 +0000 Subject: [PATCH] Sort alphabetically so that future omissions will be easier to spot. discussed with jsing --- lib/libcrypto/err/err_all.c | 70 ++++++++++++++++++------------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/lib/libcrypto/err/err_all.c b/lib/libcrypto/err/err_all.c index 17696585131..74d39d3074f 100644 --- a/lib/libcrypto/err/err_all.c +++ b/lib/libcrypto/err/err_all.c @@ -1,4 +1,4 @@ -/* $OpenBSD: err_all.c,v 1.26 2022/05/06 20:49:01 tb Exp $ */ +/* $OpenBSD: err_all.c,v 1.27 2022/05/07 17:20:41 tb Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -65,9 +65,9 @@ #include #include #include +#include #include #include -#include #include #include #include @@ -115,59 +115,59 @@ ERR_load_crypto_strings_internal(void) { #ifndef OPENSSL_NO_ERR ERR_load_ERR_strings_internal(); /* include error strings for SYSerr */ + + ERR_load_ASN1_strings(); + ERR_load_BIO_strings(); ERR_load_BN_strings(); -#ifndef OPENSSL_NO_RSA - ERR_load_RSA_strings(); + ERR_load_BUF_strings(); +#ifndef OPENSSL_NO_CMS + ERR_load_CMS_strings(); +#endif +#ifdef ZLIB + ERR_load_COMP_strings(); +#endif + ERR_load_CONF_strings(); + ERR_load_CRYPTO_strings(); +#ifndef OPENSSL_NO_CT + ERR_load_CT_strings(); #endif #ifndef OPENSSL_NO_DH ERR_load_DH_strings(); #endif - ERR_load_EVP_strings(); - ERR_load_BUF_strings(); - ERR_load_OBJ_strings(); - ERR_load_PEM_strings(); #ifndef OPENSSL_NO_DSA ERR_load_DSA_strings(); #endif - ERR_load_X509_strings(); - ERR_load_ASN1_strings(); - ERR_load_CONF_strings(); - ERR_load_CRYPTO_strings(); -#ifndef OPENSSL_NO_EC - ERR_load_EC_strings(); + ERR_load_DSO_strings(); +#ifndef OPENSSL_NO_ECDH + ERR_load_ECDH_strings(); #endif #ifndef OPENSSL_NO_ECDSA ERR_load_ECDSA_strings(); #endif -#ifndef OPENSSL_NO_ECDH - ERR_load_ECDH_strings(); +#ifndef OPENSSL_NO_EC + ERR_load_EC_strings(); #endif - /* skip ERR_load_SSL_strings() because it is not in this library */ - ERR_load_BIO_strings(); - ERR_load_PKCS7_strings(); - ERR_load_X509V3_strings(); - ERR_load_PKCS12_strings(); - ERR_load_RAND_strings(); - ERR_load_DSO_strings(); - ERR_load_TS_strings(); #ifndef OPENSSL_NO_ENGINE ERR_load_ENGINE_strings(); #endif - ERR_load_OCSP_strings(); - ERR_load_UI_strings(); -#ifdef ZLIB - ERR_load_COMP_strings(); -#endif + ERR_load_EVP_strings(); #ifndef OPENSSL_NO_GOST ERR_load_GOST_strings(); -#endif -#ifndef OPENSSL_NO_CMS - ERR_load_CMS_strings(); -#endif -#ifndef OPENSSL_NO_CT - ERR_load_CT_strings(); #endif ERR_load_KDF_strings(); + ERR_load_OBJ_strings(); + ERR_load_OCSP_strings(); + ERR_load_PEM_strings(); + ERR_load_PKCS12_strings(); + ERR_load_PKCS7_strings(); + ERR_load_RAND_strings(); +#ifndef OPENSSL_NO_RSA + ERR_load_RSA_strings(); +#endif + ERR_load_TS_strings(); + ERR_load_UI_strings(); + ERR_load_X509V3_strings(); + ERR_load_X509_strings(); #endif } -- 2.20.1