diff options
author | tb <> | 2022-05-07 17:20:41 +0000 |
---|---|---|
committer | tb <> | 2022-05-07 17:20:41 +0000 |
commit | 49aada55b8a44fb296bfcfcb79d25cb8b23ed21f (patch) | |
tree | 757b8221e57c75ea0efdc737ba008f9860d9ce6f | |
parent | 8641ec0f9abee006435172c497359e61243586fb (diff) | |
download | openbsd-49aada55b8a44fb296bfcfcb79d25cb8b23ed21f.tar.gz openbsd-49aada55b8a44fb296bfcfcb79d25cb8b23ed21f.tar.bz2 openbsd-49aada55b8a44fb296bfcfcb79d25cb8b23ed21f.zip |
Sort alphabetically so that future omissions will be easier to spot.
discussed with jsing
-rw-r--r-- | src/lib/libcrypto/err/err_all.c | 70 |
1 files changed, 35 insertions, 35 deletions
diff --git a/src/lib/libcrypto/err/err_all.c b/src/lib/libcrypto/err/err_all.c index 1769658513..74d39d3074 100644 --- a/src/lib/libcrypto/err/err_all.c +++ b/src/lib/libcrypto/err/err_all.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: err_all.c,v 1.26 2022/05/06 20:49:01 tb Exp $ */ | 1 | /* $OpenBSD: err_all.c,v 1.27 2022/05/07 17:20:41 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -65,9 +65,9 @@ | |||
65 | #include <openssl/bio.h> | 65 | #include <openssl/bio.h> |
66 | #include <openssl/bn.h> | 66 | #include <openssl/bn.h> |
67 | #include <openssl/buffer.h> | 67 | #include <openssl/buffer.h> |
68 | #include <openssl/cms.h> | ||
68 | #include <openssl/comp.h> | 69 | #include <openssl/comp.h> |
69 | #include <openssl/conf.h> | 70 | #include <openssl/conf.h> |
70 | #include <openssl/cms.h> | ||
71 | #include <openssl/ct.h> | 71 | #include <openssl/ct.h> |
72 | #include <openssl/dso.h> | 72 | #include <openssl/dso.h> |
73 | #include <openssl/err.h> | 73 | #include <openssl/err.h> |
@@ -115,59 +115,59 @@ ERR_load_crypto_strings_internal(void) | |||
115 | { | 115 | { |
116 | #ifndef OPENSSL_NO_ERR | 116 | #ifndef OPENSSL_NO_ERR |
117 | ERR_load_ERR_strings_internal(); /* include error strings for SYSerr */ | 117 | ERR_load_ERR_strings_internal(); /* include error strings for SYSerr */ |
118 | |||
119 | ERR_load_ASN1_strings(); | ||
120 | ERR_load_BIO_strings(); | ||
118 | ERR_load_BN_strings(); | 121 | ERR_load_BN_strings(); |
119 | #ifndef OPENSSL_NO_RSA | 122 | ERR_load_BUF_strings(); |
120 | ERR_load_RSA_strings(); | 123 | #ifndef OPENSSL_NO_CMS |
124 | ERR_load_CMS_strings(); | ||
125 | #endif | ||
126 | #ifdef ZLIB | ||
127 | ERR_load_COMP_strings(); | ||
128 | #endif | ||
129 | ERR_load_CONF_strings(); | ||
130 | ERR_load_CRYPTO_strings(); | ||
131 | #ifndef OPENSSL_NO_CT | ||
132 | ERR_load_CT_strings(); | ||
121 | #endif | 133 | #endif |
122 | #ifndef OPENSSL_NO_DH | 134 | #ifndef OPENSSL_NO_DH |
123 | ERR_load_DH_strings(); | 135 | ERR_load_DH_strings(); |
124 | #endif | 136 | #endif |
125 | ERR_load_EVP_strings(); | ||
126 | ERR_load_BUF_strings(); | ||
127 | ERR_load_OBJ_strings(); | ||
128 | ERR_load_PEM_strings(); | ||
129 | #ifndef OPENSSL_NO_DSA | 137 | #ifndef OPENSSL_NO_DSA |
130 | ERR_load_DSA_strings(); | 138 | ERR_load_DSA_strings(); |
131 | #endif | 139 | #endif |
132 | ERR_load_X509_strings(); | 140 | ERR_load_DSO_strings(); |
133 | ERR_load_ASN1_strings(); | 141 | #ifndef OPENSSL_NO_ECDH |
134 | ERR_load_CONF_strings(); | 142 | ERR_load_ECDH_strings(); |
135 | ERR_load_CRYPTO_strings(); | ||
136 | #ifndef OPENSSL_NO_EC | ||
137 | ERR_load_EC_strings(); | ||
138 | #endif | 143 | #endif |
139 | #ifndef OPENSSL_NO_ECDSA | 144 | #ifndef OPENSSL_NO_ECDSA |
140 | ERR_load_ECDSA_strings(); | 145 | ERR_load_ECDSA_strings(); |
141 | #endif | 146 | #endif |
142 | #ifndef OPENSSL_NO_ECDH | 147 | #ifndef OPENSSL_NO_EC |
143 | ERR_load_ECDH_strings(); | 148 | ERR_load_EC_strings(); |
144 | #endif | 149 | #endif |
145 | /* skip ERR_load_SSL_strings() because it is not in this library */ | ||
146 | ERR_load_BIO_strings(); | ||
147 | ERR_load_PKCS7_strings(); | ||
148 | ERR_load_X509V3_strings(); | ||
149 | ERR_load_PKCS12_strings(); | ||
150 | ERR_load_RAND_strings(); | ||
151 | ERR_load_DSO_strings(); | ||
152 | ERR_load_TS_strings(); | ||
153 | #ifndef OPENSSL_NO_ENGINE | 150 | #ifndef OPENSSL_NO_ENGINE |
154 | ERR_load_ENGINE_strings(); | 151 | ERR_load_ENGINE_strings(); |
155 | #endif | 152 | #endif |
156 | ERR_load_OCSP_strings(); | 153 | ERR_load_EVP_strings(); |
157 | ERR_load_UI_strings(); | ||
158 | #ifdef ZLIB | ||
159 | ERR_load_COMP_strings(); | ||
160 | #endif | ||
161 | #ifndef OPENSSL_NO_GOST | 154 | #ifndef OPENSSL_NO_GOST |
162 | ERR_load_GOST_strings(); | 155 | ERR_load_GOST_strings(); |
163 | #endif | 156 | #endif |
164 | #ifndef OPENSSL_NO_CMS | ||
165 | ERR_load_CMS_strings(); | ||
166 | #endif | ||
167 | #ifndef OPENSSL_NO_CT | ||
168 | ERR_load_CT_strings(); | ||
169 | #endif | ||
170 | ERR_load_KDF_strings(); | 157 | ERR_load_KDF_strings(); |
158 | ERR_load_OBJ_strings(); | ||
159 | ERR_load_OCSP_strings(); | ||
160 | ERR_load_PEM_strings(); | ||
161 | ERR_load_PKCS12_strings(); | ||
162 | ERR_load_PKCS7_strings(); | ||
163 | ERR_load_RAND_strings(); | ||
164 | #ifndef OPENSSL_NO_RSA | ||
165 | ERR_load_RSA_strings(); | ||
166 | #endif | ||
167 | ERR_load_TS_strings(); | ||
168 | ERR_load_UI_strings(); | ||
169 | ERR_load_X509V3_strings(); | ||
170 | ERR_load_X509_strings(); | ||
171 | #endif | 171 | #endif |
172 | } | 172 | } |
173 | 173 | ||