summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2015-02-07 03:23:05 +0000
committerjsing <>2015-02-07 03:23:05 +0000
commit7bfdcd18a000040874a054d8608346a86c85afc4 (patch)
treebd184b3174c38facc132be380541fc2d914a2c89 /src
parentd740eaab5e7724508dd84cde4e4268f487ee22e2 (diff)
downloadopenbsd-7bfdcd18a000040874a054d8608346a86c85afc4.tar.gz
openbsd-7bfdcd18a000040874a054d8608346a86c85afc4.tar.bz2
openbsd-7bfdcd18a000040874a054d8608346a86c85afc4.zip
Combine c_allc.c and c_alld.c into c_all.c - there is not much point having
this split across files, especially when two of them have less code than license text. ok bcook@ beck@ doug@ miod@
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/crypto/Makefile4
-rw-r--r--src/lib/libcrypto/evp/c_all.c234
-rw-r--r--src/lib/libcrypto/evp/c_allc.c234
-rw-r--r--src/lib/libcrypto/evp/c_alld.c123
-rw-r--r--src/lib/libssl/src/crypto/evp/c_all.c234
-rw-r--r--src/lib/libssl/src/crypto/evp/c_allc.c234
-rw-r--r--src/lib/libssl/src/crypto/evp/c_alld.c123
7 files changed, 462 insertions, 724 deletions
diff --git a/src/lib/libcrypto/crypto/Makefile b/src/lib/libcrypto/crypto/Makefile
index 84b8a6e953..292bd8997d 100644
--- a/src/lib/libcrypto/crypto/Makefile
+++ b/src/lib/libcrypto/crypto/Makefile
@@ -1,4 +1,4 @@
1# $OpenBSD: Makefile,v 1.52 2015/01/22 09:06:39 reyk Exp $ 1# $OpenBSD: Makefile,v 1.53 2015/02/07 03:23:05 jsing Exp $
2 2
3LIB= crypto 3LIB= crypto
4 4
@@ -149,7 +149,7 @@ SRCS+= m_null.c m_md4.c m_md5.c m_sha.c m_sha1.c m_wp.c
149SRCS+= m_dss.c m_dss1.c m_mdc2.c m_ripemd.c m_ecdsa.c 149SRCS+= m_dss.c m_dss1.c m_mdc2.c m_ripemd.c m_ecdsa.c
150SRCS+= p_open.c p_seal.c p_sign.c p_verify.c p_lib.c p_enc.c p_dec.c 150SRCS+= p_open.c p_seal.c p_sign.c p_verify.c p_lib.c p_enc.c p_dec.c
151SRCS+= bio_md.c bio_b64.c bio_enc.c evp_err.c e_null.c 151SRCS+= bio_md.c bio_b64.c bio_enc.c evp_err.c e_null.c
152SRCS+= c_all.c c_allc.c c_alld.c evp_lib.c 152SRCS+= c_all.c evp_lib.c
153SRCS+= evp_pkey.c evp_pbe.c p5_crpt.c p5_crpt2.c 153SRCS+= evp_pkey.c evp_pbe.c p5_crpt.c p5_crpt2.c
154SRCS+= e_old.c pmeth_lib.c pmeth_fn.c pmeth_gn.c m_sigver.c 154SRCS+= e_old.c pmeth_lib.c pmeth_fn.c pmeth_gn.c m_sigver.c
155SRCS+= e_aes_cbc_hmac_sha1.c e_rc4_hmac_md5.c 155SRCS+= e_aes_cbc_hmac_sha1.c e_rc4_hmac_md5.c
diff --git a/src/lib/libcrypto/evp/c_all.c b/src/lib/libcrypto/evp/c_all.c
index d5afe8e94d..a8593c16b2 100644
--- a/src/lib/libcrypto/evp/c_all.c
+++ b/src/lib/libcrypto/evp/c_all.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: c_all.c,v 1.14 2014/07/10 22:45:57 jsing Exp $ */ 1/* $OpenBSD: c_all.c,v 1.15 2015/02/07 03:23:05 jsing 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 *
@@ -62,12 +62,238 @@
62 62
63#include <openssl/conf.h> 63#include <openssl/conf.h>
64#include <openssl/evp.h> 64#include <openssl/evp.h>
65#include <openssl/objects.h>
65 66
66#ifndef OPENSSL_NO_ENGINE 67#include "cryptlib.h"
67#include <openssl/engine.h> 68
69void
70OpenSSL_add_all_ciphers(void)
71{
72#ifndef OPENSSL_NO_DES
73 EVP_add_cipher(EVP_des_cfb());
74 EVP_add_cipher(EVP_des_cfb1());
75 EVP_add_cipher(EVP_des_cfb8());
76 EVP_add_cipher(EVP_des_ede_cfb());
77 EVP_add_cipher(EVP_des_ede3_cfb());
78 EVP_add_cipher(EVP_des_ede3_cfb1());
79 EVP_add_cipher(EVP_des_ede3_cfb8());
80
81 EVP_add_cipher(EVP_des_ofb());
82 EVP_add_cipher(EVP_des_ede_ofb());
83 EVP_add_cipher(EVP_des_ede3_ofb());
84
85 EVP_add_cipher(EVP_desx_cbc());
86 EVP_add_cipher_alias(SN_desx_cbc, "DESX");
87 EVP_add_cipher_alias(SN_desx_cbc, "desx");
88
89 EVP_add_cipher(EVP_des_cbc());
90 EVP_add_cipher_alias(SN_des_cbc, "DES");
91 EVP_add_cipher_alias(SN_des_cbc, "des");
92 EVP_add_cipher(EVP_des_ede_cbc());
93 EVP_add_cipher(EVP_des_ede3_cbc());
94 EVP_add_cipher_alias(SN_des_ede3_cbc, "DES3");
95 EVP_add_cipher_alias(SN_des_ede3_cbc, "des3");
96
97 EVP_add_cipher(EVP_des_ecb());
98 EVP_add_cipher(EVP_des_ede());
99 EVP_add_cipher(EVP_des_ede3());
68#endif 100#endif
69 101
70#include "cryptlib.h" 102#ifndef OPENSSL_NO_RC4
103 EVP_add_cipher(EVP_rc4());
104 EVP_add_cipher(EVP_rc4_40());
105#ifndef OPENSSL_NO_MD5
106 EVP_add_cipher(EVP_rc4_hmac_md5());
107#endif
108#endif
109
110#ifndef OPENSSL_NO_IDEA
111 EVP_add_cipher(EVP_idea_ecb());
112 EVP_add_cipher(EVP_idea_cfb());
113 EVP_add_cipher(EVP_idea_ofb());
114 EVP_add_cipher(EVP_idea_cbc());
115 EVP_add_cipher_alias(SN_idea_cbc, "IDEA");
116 EVP_add_cipher_alias(SN_idea_cbc, "idea");
117#endif
118
119#ifndef OPENSSL_NO_RC2
120 EVP_add_cipher(EVP_rc2_ecb());
121 EVP_add_cipher(EVP_rc2_cfb());
122 EVP_add_cipher(EVP_rc2_ofb());
123 EVP_add_cipher(EVP_rc2_cbc());
124 EVP_add_cipher(EVP_rc2_40_cbc());
125 EVP_add_cipher(EVP_rc2_64_cbc());
126 EVP_add_cipher_alias(SN_rc2_cbc, "RC2");
127 EVP_add_cipher_alias(SN_rc2_cbc, "rc2");
128#endif
129
130#ifndef OPENSSL_NO_BF
131 EVP_add_cipher(EVP_bf_ecb());
132 EVP_add_cipher(EVP_bf_cfb());
133 EVP_add_cipher(EVP_bf_ofb());
134 EVP_add_cipher(EVP_bf_cbc());
135 EVP_add_cipher_alias(SN_bf_cbc, "BF");
136 EVP_add_cipher_alias(SN_bf_cbc, "bf");
137 EVP_add_cipher_alias(SN_bf_cbc, "blowfish");
138#endif
139
140#ifndef OPENSSL_NO_CAST
141 EVP_add_cipher(EVP_cast5_ecb());
142 EVP_add_cipher(EVP_cast5_cfb());
143 EVP_add_cipher(EVP_cast5_ofb());
144 EVP_add_cipher(EVP_cast5_cbc());
145 EVP_add_cipher_alias(SN_cast5_cbc, "CAST");
146 EVP_add_cipher_alias(SN_cast5_cbc, "cast");
147 EVP_add_cipher_alias(SN_cast5_cbc, "CAST-cbc");
148 EVP_add_cipher_alias(SN_cast5_cbc, "cast-cbc");
149#endif
150
151#ifndef OPENSSL_NO_RC5
152 EVP_add_cipher(EVP_rc5_32_12_16_ecb());
153 EVP_add_cipher(EVP_rc5_32_12_16_cfb());
154 EVP_add_cipher(EVP_rc5_32_12_16_ofb());
155 EVP_add_cipher(EVP_rc5_32_12_16_cbc());
156 EVP_add_cipher_alias(SN_rc5_cbc, "rc5");
157 EVP_add_cipher_alias(SN_rc5_cbc, "RC5");
158#endif
159
160#ifndef OPENSSL_NO_AES
161 EVP_add_cipher(EVP_aes_128_ecb());
162 EVP_add_cipher(EVP_aes_128_cbc());
163 EVP_add_cipher(EVP_aes_128_cfb());
164 EVP_add_cipher(EVP_aes_128_cfb1());
165 EVP_add_cipher(EVP_aes_128_cfb8());
166 EVP_add_cipher(EVP_aes_128_ofb());
167 EVP_add_cipher(EVP_aes_128_ctr());
168 EVP_add_cipher(EVP_aes_128_gcm());
169 EVP_add_cipher(EVP_aes_128_xts());
170 EVP_add_cipher_alias(SN_aes_128_cbc, "AES128");
171 EVP_add_cipher_alias(SN_aes_128_cbc, "aes128");
172 EVP_add_cipher(EVP_aes_192_ecb());
173 EVP_add_cipher(EVP_aes_192_cbc());
174 EVP_add_cipher(EVP_aes_192_cfb());
175 EVP_add_cipher(EVP_aes_192_cfb1());
176 EVP_add_cipher(EVP_aes_192_cfb8());
177 EVP_add_cipher(EVP_aes_192_ofb());
178 EVP_add_cipher(EVP_aes_192_ctr());
179 EVP_add_cipher(EVP_aes_192_gcm());
180 EVP_add_cipher_alias(SN_aes_192_cbc, "AES192");
181 EVP_add_cipher_alias(SN_aes_192_cbc, "aes192");
182 EVP_add_cipher(EVP_aes_256_ecb());
183 EVP_add_cipher(EVP_aes_256_cbc());
184 EVP_add_cipher(EVP_aes_256_cfb());
185 EVP_add_cipher(EVP_aes_256_cfb1());
186 EVP_add_cipher(EVP_aes_256_cfb8());
187 EVP_add_cipher(EVP_aes_256_ofb());
188 EVP_add_cipher(EVP_aes_256_ctr());
189 EVP_add_cipher(EVP_aes_256_gcm());
190 EVP_add_cipher(EVP_aes_256_xts());
191 EVP_add_cipher_alias(SN_aes_256_cbc, "AES256");
192 EVP_add_cipher_alias(SN_aes_256_cbc, "aes256");
193#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1)
194 EVP_add_cipher(EVP_aes_128_cbc_hmac_sha1());
195 EVP_add_cipher(EVP_aes_256_cbc_hmac_sha1());
196#endif
197#endif
198
199#ifndef OPENSSL_NO_CAMELLIA
200 EVP_add_cipher(EVP_camellia_128_ecb());
201 EVP_add_cipher(EVP_camellia_128_cbc());
202 EVP_add_cipher(EVP_camellia_128_cfb());
203 EVP_add_cipher(EVP_camellia_128_cfb1());
204 EVP_add_cipher(EVP_camellia_128_cfb8());
205 EVP_add_cipher(EVP_camellia_128_ofb());
206 EVP_add_cipher_alias(SN_camellia_128_cbc, "CAMELLIA128");
207 EVP_add_cipher_alias(SN_camellia_128_cbc, "camellia128");
208 EVP_add_cipher(EVP_camellia_192_ecb());
209 EVP_add_cipher(EVP_camellia_192_cbc());
210 EVP_add_cipher(EVP_camellia_192_cfb());
211 EVP_add_cipher(EVP_camellia_192_cfb1());
212 EVP_add_cipher(EVP_camellia_192_cfb8());
213 EVP_add_cipher(EVP_camellia_192_ofb());
214 EVP_add_cipher_alias(SN_camellia_192_cbc, "CAMELLIA192");
215 EVP_add_cipher_alias(SN_camellia_192_cbc, "camellia192");
216 EVP_add_cipher(EVP_camellia_256_ecb());
217 EVP_add_cipher(EVP_camellia_256_cbc());
218 EVP_add_cipher(EVP_camellia_256_cfb());
219 EVP_add_cipher(EVP_camellia_256_cfb1());
220 EVP_add_cipher(EVP_camellia_256_cfb8());
221 EVP_add_cipher(EVP_camellia_256_ofb());
222 EVP_add_cipher_alias(SN_camellia_256_cbc, "CAMELLIA256");
223 EVP_add_cipher_alias(SN_camellia_256_cbc, "camellia256");
224#endif
225
226#ifndef OPENSSL_NO_CHACHA
227 EVP_add_cipher(EVP_chacha20());
228#endif
229
230#ifndef OPENSSL_NO_GOST
231 EVP_add_cipher(EVP_gost2814789_ecb());
232 EVP_add_cipher(EVP_gost2814789_cfb64());
233 EVP_add_cipher(EVP_gost2814789_cnt());
234#endif
235}
236
237void
238OpenSSL_add_all_digests(void)
239{
240#ifndef OPENSSL_NO_MD4
241 EVP_add_digest(EVP_md4());
242#endif
243
244#ifndef OPENSSL_NO_MD5
245 EVP_add_digest(EVP_md5());
246 EVP_add_digest_alias(SN_md5, "ssl2-md5");
247 EVP_add_digest_alias(SN_md5, "ssl3-md5");
248#endif
249
250#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA0)
251 EVP_add_digest(EVP_sha());
252#ifndef OPENSSL_NO_DSA
253 EVP_add_digest(EVP_dss());
254#endif
255#endif
256#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1)
257 EVP_add_digest(EVP_sha1());
258 EVP_add_digest_alias(SN_sha1, "ssl3-sha1");
259 EVP_add_digest_alias(SN_sha1WithRSAEncryption, SN_sha1WithRSA);
260#ifndef OPENSSL_NO_DSA
261 EVP_add_digest(EVP_dss1());
262 EVP_add_digest_alias(SN_dsaWithSHA1, SN_dsaWithSHA1_2);
263 EVP_add_digest_alias(SN_dsaWithSHA1, "DSS1");
264 EVP_add_digest_alias(SN_dsaWithSHA1, "dss1");
265#endif
266#ifndef OPENSSL_NO_ECDSA
267 EVP_add_digest(EVP_ecdsa());
268#endif
269#endif
270
271#ifndef OPENSSL_NO_GOST
272 EVP_add_digest(EVP_gostr341194());
273 EVP_add_digest(EVP_gost2814789imit());
274 EVP_add_digest(EVP_streebog256());
275 EVP_add_digest(EVP_streebog512());
276#endif
277#if !defined(OPENSSL_NO_MDC2) && !defined(OPENSSL_NO_DES)
278 EVP_add_digest(EVP_mdc2());
279#endif
280#ifndef OPENSSL_NO_RIPEMD
281 EVP_add_digest(EVP_ripemd160());
282 EVP_add_digest_alias(SN_ripemd160, "ripemd");
283 EVP_add_digest_alias(SN_ripemd160, "rmd160");
284#endif
285#ifndef OPENSSL_NO_SHA256
286 EVP_add_digest(EVP_sha224());
287 EVP_add_digest(EVP_sha256());
288#endif
289#ifndef OPENSSL_NO_SHA512
290 EVP_add_digest(EVP_sha384());
291 EVP_add_digest(EVP_sha512());
292#endif
293#ifndef OPENSSL_NO_WHIRLPOOL
294 EVP_add_digest(EVP_whirlpool());
295#endif
296}
71 297
72void 298void
73OPENSSL_add_all_algorithms_noconf(void) 299OPENSSL_add_all_algorithms_noconf(void)
diff --git a/src/lib/libcrypto/evp/c_allc.c b/src/lib/libcrypto/evp/c_allc.c
deleted file mode 100644
index 26a5cc6179..0000000000
--- a/src/lib/libcrypto/evp/c_allc.c
+++ /dev/null
@@ -1,234 +0,0 @@
1/* $OpenBSD: c_allc.c,v 1.14 2014/11/09 19:17:13 miod Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved.
4 *
5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL.
8 *
9 * This library is free for commercial and non-commercial use as long as
10 * the following conditions are aheared to. The following conditions
11 * apply to all code found in this distribution, be it the RC4, RSA,
12 * lhash, DES, etc., code; not just the SSL code. The SSL documentation
13 * included with this distribution is covered by the same copyright terms
14 * except that the holder is Tim Hudson (tjh@cryptsoft.com).
15 *
16 * Copyright remains Eric Young's, and as such any Copyright notices in
17 * the code are not to be removed.
18 * If this package is used in a product, Eric Young should be given attribution
19 * as the author of the parts of the library used.
20 * This can be in the form of a textual message at program startup or
21 * in documentation (online or textual) provided with the package.
22 *
23 * Redistribution and use in source and binary forms, with or without
24 * modification, are permitted provided that the following conditions
25 * are met:
26 * 1. Redistributions of source code must retain the copyright
27 * notice, this list of conditions and the following disclaimer.
28 * 2. Redistributions in binary form must reproduce the above copyright
29 * notice, this list of conditions and the following disclaimer in the
30 * documentation and/or other materials provided with the distribution.
31 * 3. All advertising materials mentioning features or use of this software
32 * must display the following acknowledgement:
33 * "This product includes cryptographic software written by
34 * Eric Young (eay@cryptsoft.com)"
35 * The word 'cryptographic' can be left out if the rouines from the library
36 * being used are not cryptographic related :-).
37 * 4. If you include any Windows specific code (or a derivative thereof) from
38 * the apps directory (application code) you must include an acknowledgement:
39 * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
40 *
41 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
42 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
43 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
44 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
45 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
46 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
47 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
48 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
49 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
50 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
51 * SUCH DAMAGE.
52 *
53 * The licence and distribution terms for any publically available version or
54 * derivative of this code cannot be changed. i.e. this code cannot simply be
55 * copied and put under another distribution licence
56 * [including the GNU Public Licence.]
57 */
58
59#include <stdio.h>
60
61#include <openssl/opensslconf.h>
62
63#include <openssl/evp.h>
64#include <openssl/objects.h>
65#include <openssl/pkcs12.h>
66
67void
68OpenSSL_add_all_ciphers(void)
69{
70
71#ifndef OPENSSL_NO_DES
72 EVP_add_cipher(EVP_des_cfb());
73 EVP_add_cipher(EVP_des_cfb1());
74 EVP_add_cipher(EVP_des_cfb8());
75 EVP_add_cipher(EVP_des_ede_cfb());
76 EVP_add_cipher(EVP_des_ede3_cfb());
77 EVP_add_cipher(EVP_des_ede3_cfb1());
78 EVP_add_cipher(EVP_des_ede3_cfb8());
79
80 EVP_add_cipher(EVP_des_ofb());
81 EVP_add_cipher(EVP_des_ede_ofb());
82 EVP_add_cipher(EVP_des_ede3_ofb());
83
84 EVP_add_cipher(EVP_desx_cbc());
85 EVP_add_cipher_alias(SN_desx_cbc, "DESX");
86 EVP_add_cipher_alias(SN_desx_cbc, "desx");
87
88 EVP_add_cipher(EVP_des_cbc());
89 EVP_add_cipher_alias(SN_des_cbc, "DES");
90 EVP_add_cipher_alias(SN_des_cbc, "des");
91 EVP_add_cipher(EVP_des_ede_cbc());
92 EVP_add_cipher(EVP_des_ede3_cbc());
93 EVP_add_cipher_alias(SN_des_ede3_cbc, "DES3");
94 EVP_add_cipher_alias(SN_des_ede3_cbc, "des3");
95
96 EVP_add_cipher(EVP_des_ecb());
97 EVP_add_cipher(EVP_des_ede());
98 EVP_add_cipher(EVP_des_ede3());
99#endif
100
101#ifndef OPENSSL_NO_RC4
102 EVP_add_cipher(EVP_rc4());
103 EVP_add_cipher(EVP_rc4_40());
104#ifndef OPENSSL_NO_MD5
105 EVP_add_cipher(EVP_rc4_hmac_md5());
106#endif
107#endif
108
109#ifndef OPENSSL_NO_IDEA
110 EVP_add_cipher(EVP_idea_ecb());
111 EVP_add_cipher(EVP_idea_cfb());
112 EVP_add_cipher(EVP_idea_ofb());
113 EVP_add_cipher(EVP_idea_cbc());
114 EVP_add_cipher_alias(SN_idea_cbc, "IDEA");
115 EVP_add_cipher_alias(SN_idea_cbc, "idea");
116#endif
117
118#ifndef OPENSSL_NO_RC2
119 EVP_add_cipher(EVP_rc2_ecb());
120 EVP_add_cipher(EVP_rc2_cfb());
121 EVP_add_cipher(EVP_rc2_ofb());
122 EVP_add_cipher(EVP_rc2_cbc());
123 EVP_add_cipher(EVP_rc2_40_cbc());
124 EVP_add_cipher(EVP_rc2_64_cbc());
125 EVP_add_cipher_alias(SN_rc2_cbc, "RC2");
126 EVP_add_cipher_alias(SN_rc2_cbc, "rc2");
127#endif
128
129#ifndef OPENSSL_NO_BF
130 EVP_add_cipher(EVP_bf_ecb());
131 EVP_add_cipher(EVP_bf_cfb());
132 EVP_add_cipher(EVP_bf_ofb());
133 EVP_add_cipher(EVP_bf_cbc());
134 EVP_add_cipher_alias(SN_bf_cbc, "BF");
135 EVP_add_cipher_alias(SN_bf_cbc, "bf");
136 EVP_add_cipher_alias(SN_bf_cbc, "blowfish");
137#endif
138
139#ifndef OPENSSL_NO_CAST
140 EVP_add_cipher(EVP_cast5_ecb());
141 EVP_add_cipher(EVP_cast5_cfb());
142 EVP_add_cipher(EVP_cast5_ofb());
143 EVP_add_cipher(EVP_cast5_cbc());
144 EVP_add_cipher_alias(SN_cast5_cbc, "CAST");
145 EVP_add_cipher_alias(SN_cast5_cbc, "cast");
146 EVP_add_cipher_alias(SN_cast5_cbc, "CAST-cbc");
147 EVP_add_cipher_alias(SN_cast5_cbc, "cast-cbc");
148#endif
149
150#ifndef OPENSSL_NO_RC5
151 EVP_add_cipher(EVP_rc5_32_12_16_ecb());
152 EVP_add_cipher(EVP_rc5_32_12_16_cfb());
153 EVP_add_cipher(EVP_rc5_32_12_16_ofb());
154 EVP_add_cipher(EVP_rc5_32_12_16_cbc());
155 EVP_add_cipher_alias(SN_rc5_cbc, "rc5");
156 EVP_add_cipher_alias(SN_rc5_cbc, "RC5");
157#endif
158
159#ifndef OPENSSL_NO_AES
160 EVP_add_cipher(EVP_aes_128_ecb());
161 EVP_add_cipher(EVP_aes_128_cbc());
162 EVP_add_cipher(EVP_aes_128_cfb());
163 EVP_add_cipher(EVP_aes_128_cfb1());
164 EVP_add_cipher(EVP_aes_128_cfb8());
165 EVP_add_cipher(EVP_aes_128_ofb());
166 EVP_add_cipher(EVP_aes_128_ctr());
167 EVP_add_cipher(EVP_aes_128_gcm());
168 EVP_add_cipher(EVP_aes_128_xts());
169 EVP_add_cipher_alias(SN_aes_128_cbc, "AES128");
170 EVP_add_cipher_alias(SN_aes_128_cbc, "aes128");
171 EVP_add_cipher(EVP_aes_192_ecb());
172 EVP_add_cipher(EVP_aes_192_cbc());
173 EVP_add_cipher(EVP_aes_192_cfb());
174 EVP_add_cipher(EVP_aes_192_cfb1());
175 EVP_add_cipher(EVP_aes_192_cfb8());
176 EVP_add_cipher(EVP_aes_192_ofb());
177 EVP_add_cipher(EVP_aes_192_ctr());
178 EVP_add_cipher(EVP_aes_192_gcm());
179 EVP_add_cipher_alias(SN_aes_192_cbc, "AES192");
180 EVP_add_cipher_alias(SN_aes_192_cbc, "aes192");
181 EVP_add_cipher(EVP_aes_256_ecb());
182 EVP_add_cipher(EVP_aes_256_cbc());
183 EVP_add_cipher(EVP_aes_256_cfb());
184 EVP_add_cipher(EVP_aes_256_cfb1());
185 EVP_add_cipher(EVP_aes_256_cfb8());
186 EVP_add_cipher(EVP_aes_256_ofb());
187 EVP_add_cipher(EVP_aes_256_ctr());
188 EVP_add_cipher(EVP_aes_256_gcm());
189 EVP_add_cipher(EVP_aes_256_xts());
190 EVP_add_cipher_alias(SN_aes_256_cbc, "AES256");
191 EVP_add_cipher_alias(SN_aes_256_cbc, "aes256");
192#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1)
193 EVP_add_cipher(EVP_aes_128_cbc_hmac_sha1());
194 EVP_add_cipher(EVP_aes_256_cbc_hmac_sha1());
195#endif
196#endif
197
198#ifndef OPENSSL_NO_CAMELLIA
199 EVP_add_cipher(EVP_camellia_128_ecb());
200 EVP_add_cipher(EVP_camellia_128_cbc());
201 EVP_add_cipher(EVP_camellia_128_cfb());
202 EVP_add_cipher(EVP_camellia_128_cfb1());
203 EVP_add_cipher(EVP_camellia_128_cfb8());
204 EVP_add_cipher(EVP_camellia_128_ofb());
205 EVP_add_cipher_alias(SN_camellia_128_cbc, "CAMELLIA128");
206 EVP_add_cipher_alias(SN_camellia_128_cbc, "camellia128");
207 EVP_add_cipher(EVP_camellia_192_ecb());
208 EVP_add_cipher(EVP_camellia_192_cbc());
209 EVP_add_cipher(EVP_camellia_192_cfb());
210 EVP_add_cipher(EVP_camellia_192_cfb1());
211 EVP_add_cipher(EVP_camellia_192_cfb8());
212 EVP_add_cipher(EVP_camellia_192_ofb());
213 EVP_add_cipher_alias(SN_camellia_192_cbc, "CAMELLIA192");
214 EVP_add_cipher_alias(SN_camellia_192_cbc, "camellia192");
215 EVP_add_cipher(EVP_camellia_256_ecb());
216 EVP_add_cipher(EVP_camellia_256_cbc());
217 EVP_add_cipher(EVP_camellia_256_cfb());
218 EVP_add_cipher(EVP_camellia_256_cfb1());
219 EVP_add_cipher(EVP_camellia_256_cfb8());
220 EVP_add_cipher(EVP_camellia_256_ofb());
221 EVP_add_cipher_alias(SN_camellia_256_cbc, "CAMELLIA256");
222 EVP_add_cipher_alias(SN_camellia_256_cbc, "camellia256");
223#endif
224
225#ifndef OPENSSL_NO_CHACHA
226 EVP_add_cipher(EVP_chacha20());
227#endif
228
229#ifndef OPENSSL_NO_GOST
230 EVP_add_cipher(EVP_gost2814789_ecb());
231 EVP_add_cipher(EVP_gost2814789_cfb64());
232 EVP_add_cipher(EVP_gost2814789_cnt());
233#endif
234}
diff --git a/src/lib/libcrypto/evp/c_alld.c b/src/lib/libcrypto/evp/c_alld.c
deleted file mode 100644
index 99da8acdae..0000000000
--- a/src/lib/libcrypto/evp/c_alld.c
+++ /dev/null
@@ -1,123 +0,0 @@
1/* $OpenBSD: c_alld.c,v 1.12 2014/11/09 19:17:13 miod Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved.
4 *
5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL.
8 *
9 * This library is free for commercial and non-commercial use as long as
10 * the following conditions are aheared to. The following conditions
11 * apply to all code found in this distribution, be it the RC4, RSA,
12 * lhash, DES, etc., code; not just the SSL code. The SSL documentation
13 * included with this distribution is covered by the same copyright terms
14 * except that the holder is Tim Hudson (tjh@cryptsoft.com).
15 *
16 * Copyright remains Eric Young's, and as such any Copyright notices in
17 * the code are not to be removed.
18 * If this package is used in a product, Eric Young should be given attribution
19 * as the author of the parts of the library used.
20 * This can be in the form of a textual message at program startup or
21 * in documentation (online or textual) provided with the package.
22 *
23 * Redistribution and use in source and binary forms, with or without
24 * modification, are permitted provided that the following conditions
25 * are met:
26 * 1. Redistributions of source code must retain the copyright
27 * notice, this list of conditions and the following disclaimer.
28 * 2. Redistributions in binary form must reproduce the above copyright
29 * notice, this list of conditions and the following disclaimer in the
30 * documentation and/or other materials provided with the distribution.
31 * 3. All advertising materials mentioning features or use of this software
32 * must display the following acknowledgement:
33 * "This product includes cryptographic software written by
34 * Eric Young (eay@cryptsoft.com)"
35 * The word 'cryptographic' can be left out if the rouines from the library
36 * being used are not cryptographic related :-).
37 * 4. If you include any Windows specific code (or a derivative thereof) from
38 * the apps directory (application code) you must include an acknowledgement:
39 * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
40 *
41 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
42 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
43 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
44 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
45 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
46 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
47 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
48 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
49 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
50 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
51 * SUCH DAMAGE.
52 *
53 * The licence and distribution terms for any publically available version or
54 * derivative of this code cannot be changed. i.e. this code cannot simply be
55 * copied and put under another distribution licence
56 * [including the GNU Public Licence.]
57 */
58
59#include <stdio.h>
60
61#include <openssl/opensslconf.h>
62
63#include <openssl/evp.h>
64#include <openssl/objects.h>
65#include <openssl/pkcs12.h>
66
67void
68OpenSSL_add_all_digests(void)
69{
70#ifndef OPENSSL_NO_MD4
71 EVP_add_digest(EVP_md4());
72#endif
73#ifndef OPENSSL_NO_MD5
74 EVP_add_digest(EVP_md5());
75 EVP_add_digest_alias(SN_md5, "ssl2-md5");
76 EVP_add_digest_alias(SN_md5, "ssl3-md5");
77#endif
78#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA0)
79 EVP_add_digest(EVP_sha());
80#ifndef OPENSSL_NO_DSA
81 EVP_add_digest(EVP_dss());
82#endif
83#endif
84#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1)
85 EVP_add_digest(EVP_sha1());
86 EVP_add_digest_alias(SN_sha1, "ssl3-sha1");
87 EVP_add_digest_alias(SN_sha1WithRSAEncryption, SN_sha1WithRSA);
88#ifndef OPENSSL_NO_DSA
89 EVP_add_digest(EVP_dss1());
90 EVP_add_digest_alias(SN_dsaWithSHA1, SN_dsaWithSHA1_2);
91 EVP_add_digest_alias(SN_dsaWithSHA1, "DSS1");
92 EVP_add_digest_alias(SN_dsaWithSHA1, "dss1");
93#endif
94#ifndef OPENSSL_NO_ECDSA
95 EVP_add_digest(EVP_ecdsa());
96#endif
97#endif
98#ifndef OPENSSL_NO_GOST
99 EVP_add_digest(EVP_gostr341194());
100 EVP_add_digest(EVP_gost2814789imit());
101 EVP_add_digest(EVP_streebog256());
102 EVP_add_digest(EVP_streebog512());
103#endif
104#if !defined(OPENSSL_NO_MDC2) && !defined(OPENSSL_NO_DES)
105 EVP_add_digest(EVP_mdc2());
106#endif
107#ifndef OPENSSL_NO_RIPEMD
108 EVP_add_digest(EVP_ripemd160());
109 EVP_add_digest_alias(SN_ripemd160, "ripemd");
110 EVP_add_digest_alias(SN_ripemd160, "rmd160");
111#endif
112#ifndef OPENSSL_NO_SHA256
113 EVP_add_digest(EVP_sha224());
114 EVP_add_digest(EVP_sha256());
115#endif
116#ifndef OPENSSL_NO_SHA512
117 EVP_add_digest(EVP_sha384());
118 EVP_add_digest(EVP_sha512());
119#endif
120#ifndef OPENSSL_NO_WHIRLPOOL
121 EVP_add_digest(EVP_whirlpool());
122#endif
123}
diff --git a/src/lib/libssl/src/crypto/evp/c_all.c b/src/lib/libssl/src/crypto/evp/c_all.c
index d5afe8e94d..a8593c16b2 100644
--- a/src/lib/libssl/src/crypto/evp/c_all.c
+++ b/src/lib/libssl/src/crypto/evp/c_all.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: c_all.c,v 1.14 2014/07/10 22:45:57 jsing Exp $ */ 1/* $OpenBSD: c_all.c,v 1.15 2015/02/07 03:23:05 jsing 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 *
@@ -62,12 +62,238 @@
62 62
63#include <openssl/conf.h> 63#include <openssl/conf.h>
64#include <openssl/evp.h> 64#include <openssl/evp.h>
65#include <openssl/objects.h>
65 66
66#ifndef OPENSSL_NO_ENGINE 67#include "cryptlib.h"
67#include <openssl/engine.h> 68
69void
70OpenSSL_add_all_ciphers(void)
71{
72#ifndef OPENSSL_NO_DES
73 EVP_add_cipher(EVP_des_cfb());
74 EVP_add_cipher(EVP_des_cfb1());
75 EVP_add_cipher(EVP_des_cfb8());
76 EVP_add_cipher(EVP_des_ede_cfb());
77 EVP_add_cipher(EVP_des_ede3_cfb());
78 EVP_add_cipher(EVP_des_ede3_cfb1());
79 EVP_add_cipher(EVP_des_ede3_cfb8());
80
81 EVP_add_cipher(EVP_des_ofb());
82 EVP_add_cipher(EVP_des_ede_ofb());
83 EVP_add_cipher(EVP_des_ede3_ofb());
84
85 EVP_add_cipher(EVP_desx_cbc());
86 EVP_add_cipher_alias(SN_desx_cbc, "DESX");
87 EVP_add_cipher_alias(SN_desx_cbc, "desx");
88
89 EVP_add_cipher(EVP_des_cbc());
90 EVP_add_cipher_alias(SN_des_cbc, "DES");
91 EVP_add_cipher_alias(SN_des_cbc, "des");
92 EVP_add_cipher(EVP_des_ede_cbc());
93 EVP_add_cipher(EVP_des_ede3_cbc());
94 EVP_add_cipher_alias(SN_des_ede3_cbc, "DES3");
95 EVP_add_cipher_alias(SN_des_ede3_cbc, "des3");
96
97 EVP_add_cipher(EVP_des_ecb());
98 EVP_add_cipher(EVP_des_ede());
99 EVP_add_cipher(EVP_des_ede3());
68#endif 100#endif
69 101
70#include "cryptlib.h" 102#ifndef OPENSSL_NO_RC4
103 EVP_add_cipher(EVP_rc4());
104 EVP_add_cipher(EVP_rc4_40());
105#ifndef OPENSSL_NO_MD5
106 EVP_add_cipher(EVP_rc4_hmac_md5());
107#endif
108#endif
109
110#ifndef OPENSSL_NO_IDEA
111 EVP_add_cipher(EVP_idea_ecb());
112 EVP_add_cipher(EVP_idea_cfb());
113 EVP_add_cipher(EVP_idea_ofb());
114 EVP_add_cipher(EVP_idea_cbc());
115 EVP_add_cipher_alias(SN_idea_cbc, "IDEA");
116 EVP_add_cipher_alias(SN_idea_cbc, "idea");
117#endif
118
119#ifndef OPENSSL_NO_RC2
120 EVP_add_cipher(EVP_rc2_ecb());
121 EVP_add_cipher(EVP_rc2_cfb());
122 EVP_add_cipher(EVP_rc2_ofb());
123 EVP_add_cipher(EVP_rc2_cbc());
124 EVP_add_cipher(EVP_rc2_40_cbc());
125 EVP_add_cipher(EVP_rc2_64_cbc());
126 EVP_add_cipher_alias(SN_rc2_cbc, "RC2");
127 EVP_add_cipher_alias(SN_rc2_cbc, "rc2");
128#endif
129
130#ifndef OPENSSL_NO_BF
131 EVP_add_cipher(EVP_bf_ecb());
132 EVP_add_cipher(EVP_bf_cfb());
133 EVP_add_cipher(EVP_bf_ofb());
134 EVP_add_cipher(EVP_bf_cbc());
135 EVP_add_cipher_alias(SN_bf_cbc, "BF");
136 EVP_add_cipher_alias(SN_bf_cbc, "bf");
137 EVP_add_cipher_alias(SN_bf_cbc, "blowfish");
138#endif
139
140#ifndef OPENSSL_NO_CAST
141 EVP_add_cipher(EVP_cast5_ecb());
142 EVP_add_cipher(EVP_cast5_cfb());
143 EVP_add_cipher(EVP_cast5_ofb());
144 EVP_add_cipher(EVP_cast5_cbc());
145 EVP_add_cipher_alias(SN_cast5_cbc, "CAST");
146 EVP_add_cipher_alias(SN_cast5_cbc, "cast");
147 EVP_add_cipher_alias(SN_cast5_cbc, "CAST-cbc");
148 EVP_add_cipher_alias(SN_cast5_cbc, "cast-cbc");
149#endif
150
151#ifndef OPENSSL_NO_RC5
152 EVP_add_cipher(EVP_rc5_32_12_16_ecb());
153 EVP_add_cipher(EVP_rc5_32_12_16_cfb());
154 EVP_add_cipher(EVP_rc5_32_12_16_ofb());
155 EVP_add_cipher(EVP_rc5_32_12_16_cbc());
156 EVP_add_cipher_alias(SN_rc5_cbc, "rc5");
157 EVP_add_cipher_alias(SN_rc5_cbc, "RC5");
158#endif
159
160#ifndef OPENSSL_NO_AES
161 EVP_add_cipher(EVP_aes_128_ecb());
162 EVP_add_cipher(EVP_aes_128_cbc());
163 EVP_add_cipher(EVP_aes_128_cfb());
164 EVP_add_cipher(EVP_aes_128_cfb1());
165 EVP_add_cipher(EVP_aes_128_cfb8());
166 EVP_add_cipher(EVP_aes_128_ofb());
167 EVP_add_cipher(EVP_aes_128_ctr());
168 EVP_add_cipher(EVP_aes_128_gcm());
169 EVP_add_cipher(EVP_aes_128_xts());
170 EVP_add_cipher_alias(SN_aes_128_cbc, "AES128");
171 EVP_add_cipher_alias(SN_aes_128_cbc, "aes128");
172 EVP_add_cipher(EVP_aes_192_ecb());
173 EVP_add_cipher(EVP_aes_192_cbc());
174 EVP_add_cipher(EVP_aes_192_cfb());
175 EVP_add_cipher(EVP_aes_192_cfb1());
176 EVP_add_cipher(EVP_aes_192_cfb8());
177 EVP_add_cipher(EVP_aes_192_ofb());
178 EVP_add_cipher(EVP_aes_192_ctr());
179 EVP_add_cipher(EVP_aes_192_gcm());
180 EVP_add_cipher_alias(SN_aes_192_cbc, "AES192");
181 EVP_add_cipher_alias(SN_aes_192_cbc, "aes192");
182 EVP_add_cipher(EVP_aes_256_ecb());
183 EVP_add_cipher(EVP_aes_256_cbc());
184 EVP_add_cipher(EVP_aes_256_cfb());
185 EVP_add_cipher(EVP_aes_256_cfb1());
186 EVP_add_cipher(EVP_aes_256_cfb8());
187 EVP_add_cipher(EVP_aes_256_ofb());
188 EVP_add_cipher(EVP_aes_256_ctr());
189 EVP_add_cipher(EVP_aes_256_gcm());
190 EVP_add_cipher(EVP_aes_256_xts());
191 EVP_add_cipher_alias(SN_aes_256_cbc, "AES256");
192 EVP_add_cipher_alias(SN_aes_256_cbc, "aes256");
193#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1)
194 EVP_add_cipher(EVP_aes_128_cbc_hmac_sha1());
195 EVP_add_cipher(EVP_aes_256_cbc_hmac_sha1());
196#endif
197#endif
198
199#ifndef OPENSSL_NO_CAMELLIA
200 EVP_add_cipher(EVP_camellia_128_ecb());
201 EVP_add_cipher(EVP_camellia_128_cbc());
202 EVP_add_cipher(EVP_camellia_128_cfb());
203 EVP_add_cipher(EVP_camellia_128_cfb1());
204 EVP_add_cipher(EVP_camellia_128_cfb8());
205 EVP_add_cipher(EVP_camellia_128_ofb());
206 EVP_add_cipher_alias(SN_camellia_128_cbc, "CAMELLIA128");
207 EVP_add_cipher_alias(SN_camellia_128_cbc, "camellia128");
208 EVP_add_cipher(EVP_camellia_192_ecb());
209 EVP_add_cipher(EVP_camellia_192_cbc());
210 EVP_add_cipher(EVP_camellia_192_cfb());
211 EVP_add_cipher(EVP_camellia_192_cfb1());
212 EVP_add_cipher(EVP_camellia_192_cfb8());
213 EVP_add_cipher(EVP_camellia_192_ofb());
214 EVP_add_cipher_alias(SN_camellia_192_cbc, "CAMELLIA192");
215 EVP_add_cipher_alias(SN_camellia_192_cbc, "camellia192");
216 EVP_add_cipher(EVP_camellia_256_ecb());
217 EVP_add_cipher(EVP_camellia_256_cbc());
218 EVP_add_cipher(EVP_camellia_256_cfb());
219 EVP_add_cipher(EVP_camellia_256_cfb1());
220 EVP_add_cipher(EVP_camellia_256_cfb8());
221 EVP_add_cipher(EVP_camellia_256_ofb());
222 EVP_add_cipher_alias(SN_camellia_256_cbc, "CAMELLIA256");
223 EVP_add_cipher_alias(SN_camellia_256_cbc, "camellia256");
224#endif
225
226#ifndef OPENSSL_NO_CHACHA
227 EVP_add_cipher(EVP_chacha20());
228#endif
229
230#ifndef OPENSSL_NO_GOST
231 EVP_add_cipher(EVP_gost2814789_ecb());
232 EVP_add_cipher(EVP_gost2814789_cfb64());
233 EVP_add_cipher(EVP_gost2814789_cnt());
234#endif
235}
236
237void
238OpenSSL_add_all_digests(void)
239{
240#ifndef OPENSSL_NO_MD4
241 EVP_add_digest(EVP_md4());
242#endif
243
244#ifndef OPENSSL_NO_MD5
245 EVP_add_digest(EVP_md5());
246 EVP_add_digest_alias(SN_md5, "ssl2-md5");
247 EVP_add_digest_alias(SN_md5, "ssl3-md5");
248#endif
249
250#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA0)
251 EVP_add_digest(EVP_sha());
252#ifndef OPENSSL_NO_DSA
253 EVP_add_digest(EVP_dss());
254#endif
255#endif
256#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1)
257 EVP_add_digest(EVP_sha1());
258 EVP_add_digest_alias(SN_sha1, "ssl3-sha1");
259 EVP_add_digest_alias(SN_sha1WithRSAEncryption, SN_sha1WithRSA);
260#ifndef OPENSSL_NO_DSA
261 EVP_add_digest(EVP_dss1());
262 EVP_add_digest_alias(SN_dsaWithSHA1, SN_dsaWithSHA1_2);
263 EVP_add_digest_alias(SN_dsaWithSHA1, "DSS1");
264 EVP_add_digest_alias(SN_dsaWithSHA1, "dss1");
265#endif
266#ifndef OPENSSL_NO_ECDSA
267 EVP_add_digest(EVP_ecdsa());
268#endif
269#endif
270
271#ifndef OPENSSL_NO_GOST
272 EVP_add_digest(EVP_gostr341194());
273 EVP_add_digest(EVP_gost2814789imit());
274 EVP_add_digest(EVP_streebog256());
275 EVP_add_digest(EVP_streebog512());
276#endif
277#if !defined(OPENSSL_NO_MDC2) && !defined(OPENSSL_NO_DES)
278 EVP_add_digest(EVP_mdc2());
279#endif
280#ifndef OPENSSL_NO_RIPEMD
281 EVP_add_digest(EVP_ripemd160());
282 EVP_add_digest_alias(SN_ripemd160, "ripemd");
283 EVP_add_digest_alias(SN_ripemd160, "rmd160");
284#endif
285#ifndef OPENSSL_NO_SHA256
286 EVP_add_digest(EVP_sha224());
287 EVP_add_digest(EVP_sha256());
288#endif
289#ifndef OPENSSL_NO_SHA512
290 EVP_add_digest(EVP_sha384());
291 EVP_add_digest(EVP_sha512());
292#endif
293#ifndef OPENSSL_NO_WHIRLPOOL
294 EVP_add_digest(EVP_whirlpool());
295#endif
296}
71 297
72void 298void
73OPENSSL_add_all_algorithms_noconf(void) 299OPENSSL_add_all_algorithms_noconf(void)
diff --git a/src/lib/libssl/src/crypto/evp/c_allc.c b/src/lib/libssl/src/crypto/evp/c_allc.c
deleted file mode 100644
index 26a5cc6179..0000000000
--- a/src/lib/libssl/src/crypto/evp/c_allc.c
+++ /dev/null
@@ -1,234 +0,0 @@
1/* $OpenBSD: c_allc.c,v 1.14 2014/11/09 19:17:13 miod Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved.
4 *
5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL.
8 *
9 * This library is free for commercial and non-commercial use as long as
10 * the following conditions are aheared to. The following conditions
11 * apply to all code found in this distribution, be it the RC4, RSA,
12 * lhash, DES, etc., code; not just the SSL code. The SSL documentation
13 * included with this distribution is covered by the same copyright terms
14 * except that the holder is Tim Hudson (tjh@cryptsoft.com).
15 *
16 * Copyright remains Eric Young's, and as such any Copyright notices in
17 * the code are not to be removed.
18 * If this package is used in a product, Eric Young should be given attribution
19 * as the author of the parts of the library used.
20 * This can be in the form of a textual message at program startup or
21 * in documentation (online or textual) provided with the package.
22 *
23 * Redistribution and use in source and binary forms, with or without
24 * modification, are permitted provided that the following conditions
25 * are met:
26 * 1. Redistributions of source code must retain the copyright
27 * notice, this list of conditions and the following disclaimer.
28 * 2. Redistributions in binary form must reproduce the above copyright
29 * notice, this list of conditions and the following disclaimer in the
30 * documentation and/or other materials provided with the distribution.
31 * 3. All advertising materials mentioning features or use of this software
32 * must display the following acknowledgement:
33 * "This product includes cryptographic software written by
34 * Eric Young (eay@cryptsoft.com)"
35 * The word 'cryptographic' can be left out if the rouines from the library
36 * being used are not cryptographic related :-).
37 * 4. If you include any Windows specific code (or a derivative thereof) from
38 * the apps directory (application code) you must include an acknowledgement:
39 * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
40 *
41 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
42 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
43 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
44 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
45 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
46 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
47 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
48 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
49 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
50 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
51 * SUCH DAMAGE.
52 *
53 * The licence and distribution terms for any publically available version or
54 * derivative of this code cannot be changed. i.e. this code cannot simply be
55 * copied and put under another distribution licence
56 * [including the GNU Public Licence.]
57 */
58
59#include <stdio.h>
60
61#include <openssl/opensslconf.h>
62
63#include <openssl/evp.h>
64#include <openssl/objects.h>
65#include <openssl/pkcs12.h>
66
67void
68OpenSSL_add_all_ciphers(void)
69{
70
71#ifndef OPENSSL_NO_DES
72 EVP_add_cipher(EVP_des_cfb());
73 EVP_add_cipher(EVP_des_cfb1());
74 EVP_add_cipher(EVP_des_cfb8());
75 EVP_add_cipher(EVP_des_ede_cfb());
76 EVP_add_cipher(EVP_des_ede3_cfb());
77 EVP_add_cipher(EVP_des_ede3_cfb1());
78 EVP_add_cipher(EVP_des_ede3_cfb8());
79
80 EVP_add_cipher(EVP_des_ofb());
81 EVP_add_cipher(EVP_des_ede_ofb());
82 EVP_add_cipher(EVP_des_ede3_ofb());
83
84 EVP_add_cipher(EVP_desx_cbc());
85 EVP_add_cipher_alias(SN_desx_cbc, "DESX");
86 EVP_add_cipher_alias(SN_desx_cbc, "desx");
87
88 EVP_add_cipher(EVP_des_cbc());
89 EVP_add_cipher_alias(SN_des_cbc, "DES");
90 EVP_add_cipher_alias(SN_des_cbc, "des");
91 EVP_add_cipher(EVP_des_ede_cbc());
92 EVP_add_cipher(EVP_des_ede3_cbc());
93 EVP_add_cipher_alias(SN_des_ede3_cbc, "DES3");
94 EVP_add_cipher_alias(SN_des_ede3_cbc, "des3");
95
96 EVP_add_cipher(EVP_des_ecb());
97 EVP_add_cipher(EVP_des_ede());
98 EVP_add_cipher(EVP_des_ede3());
99#endif
100
101#ifndef OPENSSL_NO_RC4
102 EVP_add_cipher(EVP_rc4());
103 EVP_add_cipher(EVP_rc4_40());
104#ifndef OPENSSL_NO_MD5
105 EVP_add_cipher(EVP_rc4_hmac_md5());
106#endif
107#endif
108
109#ifndef OPENSSL_NO_IDEA
110 EVP_add_cipher(EVP_idea_ecb());
111 EVP_add_cipher(EVP_idea_cfb());
112 EVP_add_cipher(EVP_idea_ofb());
113 EVP_add_cipher(EVP_idea_cbc());
114 EVP_add_cipher_alias(SN_idea_cbc, "IDEA");
115 EVP_add_cipher_alias(SN_idea_cbc, "idea");
116#endif
117
118#ifndef OPENSSL_NO_RC2
119 EVP_add_cipher(EVP_rc2_ecb());
120 EVP_add_cipher(EVP_rc2_cfb());
121 EVP_add_cipher(EVP_rc2_ofb());
122 EVP_add_cipher(EVP_rc2_cbc());
123 EVP_add_cipher(EVP_rc2_40_cbc());
124 EVP_add_cipher(EVP_rc2_64_cbc());
125 EVP_add_cipher_alias(SN_rc2_cbc, "RC2");
126 EVP_add_cipher_alias(SN_rc2_cbc, "rc2");
127#endif
128
129#ifndef OPENSSL_NO_BF
130 EVP_add_cipher(EVP_bf_ecb());
131 EVP_add_cipher(EVP_bf_cfb());
132 EVP_add_cipher(EVP_bf_ofb());
133 EVP_add_cipher(EVP_bf_cbc());
134 EVP_add_cipher_alias(SN_bf_cbc, "BF");
135 EVP_add_cipher_alias(SN_bf_cbc, "bf");
136 EVP_add_cipher_alias(SN_bf_cbc, "blowfish");
137#endif
138
139#ifndef OPENSSL_NO_CAST
140 EVP_add_cipher(EVP_cast5_ecb());
141 EVP_add_cipher(EVP_cast5_cfb());
142 EVP_add_cipher(EVP_cast5_ofb());
143 EVP_add_cipher(EVP_cast5_cbc());
144 EVP_add_cipher_alias(SN_cast5_cbc, "CAST");
145 EVP_add_cipher_alias(SN_cast5_cbc, "cast");
146 EVP_add_cipher_alias(SN_cast5_cbc, "CAST-cbc");
147 EVP_add_cipher_alias(SN_cast5_cbc, "cast-cbc");
148#endif
149
150#ifndef OPENSSL_NO_RC5
151 EVP_add_cipher(EVP_rc5_32_12_16_ecb());
152 EVP_add_cipher(EVP_rc5_32_12_16_cfb());
153 EVP_add_cipher(EVP_rc5_32_12_16_ofb());
154 EVP_add_cipher(EVP_rc5_32_12_16_cbc());
155 EVP_add_cipher_alias(SN_rc5_cbc, "rc5");
156 EVP_add_cipher_alias(SN_rc5_cbc, "RC5");
157#endif
158
159#ifndef OPENSSL_NO_AES
160 EVP_add_cipher(EVP_aes_128_ecb());
161 EVP_add_cipher(EVP_aes_128_cbc());
162 EVP_add_cipher(EVP_aes_128_cfb());
163 EVP_add_cipher(EVP_aes_128_cfb1());
164 EVP_add_cipher(EVP_aes_128_cfb8());
165 EVP_add_cipher(EVP_aes_128_ofb());
166 EVP_add_cipher(EVP_aes_128_ctr());
167 EVP_add_cipher(EVP_aes_128_gcm());
168 EVP_add_cipher(EVP_aes_128_xts());
169 EVP_add_cipher_alias(SN_aes_128_cbc, "AES128");
170 EVP_add_cipher_alias(SN_aes_128_cbc, "aes128");
171 EVP_add_cipher(EVP_aes_192_ecb());
172 EVP_add_cipher(EVP_aes_192_cbc());
173 EVP_add_cipher(EVP_aes_192_cfb());
174 EVP_add_cipher(EVP_aes_192_cfb1());
175 EVP_add_cipher(EVP_aes_192_cfb8());
176 EVP_add_cipher(EVP_aes_192_ofb());
177 EVP_add_cipher(EVP_aes_192_ctr());
178 EVP_add_cipher(EVP_aes_192_gcm());
179 EVP_add_cipher_alias(SN_aes_192_cbc, "AES192");
180 EVP_add_cipher_alias(SN_aes_192_cbc, "aes192");
181 EVP_add_cipher(EVP_aes_256_ecb());
182 EVP_add_cipher(EVP_aes_256_cbc());
183 EVP_add_cipher(EVP_aes_256_cfb());
184 EVP_add_cipher(EVP_aes_256_cfb1());
185 EVP_add_cipher(EVP_aes_256_cfb8());
186 EVP_add_cipher(EVP_aes_256_ofb());
187 EVP_add_cipher(EVP_aes_256_ctr());
188 EVP_add_cipher(EVP_aes_256_gcm());
189 EVP_add_cipher(EVP_aes_256_xts());
190 EVP_add_cipher_alias(SN_aes_256_cbc, "AES256");
191 EVP_add_cipher_alias(SN_aes_256_cbc, "aes256");
192#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1)
193 EVP_add_cipher(EVP_aes_128_cbc_hmac_sha1());
194 EVP_add_cipher(EVP_aes_256_cbc_hmac_sha1());
195#endif
196#endif
197
198#ifndef OPENSSL_NO_CAMELLIA
199 EVP_add_cipher(EVP_camellia_128_ecb());
200 EVP_add_cipher(EVP_camellia_128_cbc());
201 EVP_add_cipher(EVP_camellia_128_cfb());
202 EVP_add_cipher(EVP_camellia_128_cfb1());
203 EVP_add_cipher(EVP_camellia_128_cfb8());
204 EVP_add_cipher(EVP_camellia_128_ofb());
205 EVP_add_cipher_alias(SN_camellia_128_cbc, "CAMELLIA128");
206 EVP_add_cipher_alias(SN_camellia_128_cbc, "camellia128");
207 EVP_add_cipher(EVP_camellia_192_ecb());
208 EVP_add_cipher(EVP_camellia_192_cbc());
209 EVP_add_cipher(EVP_camellia_192_cfb());
210 EVP_add_cipher(EVP_camellia_192_cfb1());
211 EVP_add_cipher(EVP_camellia_192_cfb8());
212 EVP_add_cipher(EVP_camellia_192_ofb());
213 EVP_add_cipher_alias(SN_camellia_192_cbc, "CAMELLIA192");
214 EVP_add_cipher_alias(SN_camellia_192_cbc, "camellia192");
215 EVP_add_cipher(EVP_camellia_256_ecb());
216 EVP_add_cipher(EVP_camellia_256_cbc());
217 EVP_add_cipher(EVP_camellia_256_cfb());
218 EVP_add_cipher(EVP_camellia_256_cfb1());
219 EVP_add_cipher(EVP_camellia_256_cfb8());
220 EVP_add_cipher(EVP_camellia_256_ofb());
221 EVP_add_cipher_alias(SN_camellia_256_cbc, "CAMELLIA256");
222 EVP_add_cipher_alias(SN_camellia_256_cbc, "camellia256");
223#endif
224
225#ifndef OPENSSL_NO_CHACHA
226 EVP_add_cipher(EVP_chacha20());
227#endif
228
229#ifndef OPENSSL_NO_GOST
230 EVP_add_cipher(EVP_gost2814789_ecb());
231 EVP_add_cipher(EVP_gost2814789_cfb64());
232 EVP_add_cipher(EVP_gost2814789_cnt());
233#endif
234}
diff --git a/src/lib/libssl/src/crypto/evp/c_alld.c b/src/lib/libssl/src/crypto/evp/c_alld.c
deleted file mode 100644
index 99da8acdae..0000000000
--- a/src/lib/libssl/src/crypto/evp/c_alld.c
+++ /dev/null
@@ -1,123 +0,0 @@
1/* $OpenBSD: c_alld.c,v 1.12 2014/11/09 19:17:13 miod Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved.
4 *
5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL.
8 *
9 * This library is free for commercial and non-commercial use as long as
10 * the following conditions are aheared to. The following conditions
11 * apply to all code found in this distribution, be it the RC4, RSA,
12 * lhash, DES, etc., code; not just the SSL code. The SSL documentation
13 * included with this distribution is covered by the same copyright terms
14 * except that the holder is Tim Hudson (tjh@cryptsoft.com).
15 *
16 * Copyright remains Eric Young's, and as such any Copyright notices in
17 * the code are not to be removed.
18 * If this package is used in a product, Eric Young should be given attribution
19 * as the author of the parts of the library used.
20 * This can be in the form of a textual message at program startup or
21 * in documentation (online or textual) provided with the package.
22 *
23 * Redistribution and use in source and binary forms, with or without
24 * modification, are permitted provided that the following conditions
25 * are met:
26 * 1. Redistributions of source code must retain the copyright
27 * notice, this list of conditions and the following disclaimer.
28 * 2. Redistributions in binary form must reproduce the above copyright
29 * notice, this list of conditions and the following disclaimer in the
30 * documentation and/or other materials provided with the distribution.
31 * 3. All advertising materials mentioning features or use of this software
32 * must display the following acknowledgement:
33 * "This product includes cryptographic software written by
34 * Eric Young (eay@cryptsoft.com)"
35 * The word 'cryptographic' can be left out if the rouines from the library
36 * being used are not cryptographic related :-).
37 * 4. If you include any Windows specific code (or a derivative thereof) from
38 * the apps directory (application code) you must include an acknowledgement:
39 * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
40 *
41 * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
42 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
43 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
44 * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
45 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
46 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
47 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
48 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
49 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
50 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
51 * SUCH DAMAGE.
52 *
53 * The licence and distribution terms for any publically available version or
54 * derivative of this code cannot be changed. i.e. this code cannot simply be
55 * copied and put under another distribution licence
56 * [including the GNU Public Licence.]
57 */
58
59#include <stdio.h>
60
61#include <openssl/opensslconf.h>
62
63#include <openssl/evp.h>
64#include <openssl/objects.h>
65#include <openssl/pkcs12.h>
66
67void
68OpenSSL_add_all_digests(void)
69{
70#ifndef OPENSSL_NO_MD4
71 EVP_add_digest(EVP_md4());
72#endif
73#ifndef OPENSSL_NO_MD5
74 EVP_add_digest(EVP_md5());
75 EVP_add_digest_alias(SN_md5, "ssl2-md5");
76 EVP_add_digest_alias(SN_md5, "ssl3-md5");
77#endif
78#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA0)
79 EVP_add_digest(EVP_sha());
80#ifndef OPENSSL_NO_DSA
81 EVP_add_digest(EVP_dss());
82#endif
83#endif
84#if !defined(OPENSSL_NO_SHA) && !defined(OPENSSL_NO_SHA1)
85 EVP_add_digest(EVP_sha1());
86 EVP_add_digest_alias(SN_sha1, "ssl3-sha1");
87 EVP_add_digest_alias(SN_sha1WithRSAEncryption, SN_sha1WithRSA);
88#ifndef OPENSSL_NO_DSA
89 EVP_add_digest(EVP_dss1());
90 EVP_add_digest_alias(SN_dsaWithSHA1, SN_dsaWithSHA1_2);
91 EVP_add_digest_alias(SN_dsaWithSHA1, "DSS1");
92 EVP_add_digest_alias(SN_dsaWithSHA1, "dss1");
93#endif
94#ifndef OPENSSL_NO_ECDSA
95 EVP_add_digest(EVP_ecdsa());
96#endif
97#endif
98#ifndef OPENSSL_NO_GOST
99 EVP_add_digest(EVP_gostr341194());
100 EVP_add_digest(EVP_gost2814789imit());
101 EVP_add_digest(EVP_streebog256());
102 EVP_add_digest(EVP_streebog512());
103#endif
104#if !defined(OPENSSL_NO_MDC2) && !defined(OPENSSL_NO_DES)
105 EVP_add_digest(EVP_mdc2());
106#endif
107#ifndef OPENSSL_NO_RIPEMD
108 EVP_add_digest(EVP_ripemd160());
109 EVP_add_digest_alias(SN_ripemd160, "ripemd");
110 EVP_add_digest_alias(SN_ripemd160, "rmd160");
111#endif
112#ifndef OPENSSL_NO_SHA256
113 EVP_add_digest(EVP_sha224());
114 EVP_add_digest(EVP_sha256());
115#endif
116#ifndef OPENSSL_NO_SHA512
117 EVP_add_digest(EVP_sha384());
118 EVP_add_digest(EVP_sha512());
119#endif
120#ifndef OPENSSL_NO_WHIRLPOOL
121 EVP_add_digest(EVP_whirlpool());
122#endif
123}
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-21 00:41:03 +0000