summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorderaadt <>2015-08-19 18:25:31 +0000
committerderaadt <>2015-08-19 18:25:31 +0000
commit0e889cf1500dcc11cc9011a890b5cf7665b14bef (patch)
tree4dd2e1ed4371a029d61ada8e510e7ace4f672ad6 /src
parent13757ff35aab44e1c38d969b3e78d8029b01eb32 (diff)
downloadopenbsd-0e889cf1500dcc11cc9011a890b5cf7665b14bef.tar.gz
openbsd-0e889cf1500dcc11cc9011a890b5cf7665b14bef.tar.bz2
openbsd-0e889cf1500dcc11cc9011a890b5cf7665b14bef.zip
bring prototypes into scope, requires movement of a large global object
out of .h file ok jsing
Diffstat (limited to 'src')
-rw-r--r--src/usr.bin/openssl/asn1pars.c3
-rw-r--r--src/usr.bin/openssl/ciphers.c3
-rw-r--r--src/usr.bin/openssl/openssl.c196
-rw-r--r--src/usr.bin/openssl/pkcs8.c3
-rw-r--r--src/usr.bin/openssl/progs.h196
-rw-r--r--src/usr.bin/openssl/rsa.c3
-rw-r--r--src/usr.bin/openssl/sess_id.c3
-rw-r--r--src/usr.bin/openssl/spkac.c3
8 files changed, 208 insertions, 202 deletions
diff --git a/src/usr.bin/openssl/asn1pars.c b/src/usr.bin/openssl/asn1pars.c
index 62af4f164e..da3bf761ce 100644
--- a/src/usr.bin/openssl/asn1pars.c
+++ b/src/usr.bin/openssl/asn1pars.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: asn1pars.c,v 1.3 2015/01/08 11:00:12 doug Exp $ */ 1/* $OpenBSD: asn1pars.c,v 1.4 2015/08/19 18:25:31 deraadt 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 *
@@ -66,6 +66,7 @@
66#include <string.h> 66#include <string.h>
67 67
68#include "apps.h" 68#include "apps.h"
69#include "progs.h"
69 70
70#include <openssl/err.h> 71#include <openssl/err.h>
71#include <openssl/evp.h> 72#include <openssl/evp.h>
diff --git a/src/usr.bin/openssl/ciphers.c b/src/usr.bin/openssl/ciphers.c
index fd9e839064..18b8d3e4d9 100644
--- a/src/usr.bin/openssl/ciphers.c
+++ b/src/usr.bin/openssl/ciphers.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ciphers.c,v 1.5 2015/07/17 16:04:09 doug Exp $ */ 1/* $OpenBSD: ciphers.c,v 1.6 2015/08/19 18:25:31 deraadt Exp $ */
2/* 2/*
3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> 3 * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
4 * 4 *
@@ -22,6 +22,7 @@
22#include <openssl/ssl.h> 22#include <openssl/ssl.h>
23 23
24#include "apps.h" 24#include "apps.h"
25#include "progs.h"
25 26
26struct { 27struct {
27 int usage; 28 int usage;
diff --git a/src/usr.bin/openssl/openssl.c b/src/usr.bin/openssl/openssl.c
index 08e22ca829..1754b3a107 100644
--- a/src/usr.bin/openssl/openssl.c
+++ b/src/usr.bin/openssl/openssl.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: openssl.c,v 1.3 2015/03/22 10:36:22 bcook Exp $ */ 1/* $OpenBSD: openssl.c,v 1.4 2015/08/19 18:25:31 deraadt 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 *
@@ -133,6 +133,200 @@
133#include "progs.h" 133#include "progs.h"
134#include "s_apps.h" 134#include "s_apps.h"
135 135
136FUNCTION functions[] = {
137
138 /* General functions. */
139 { FUNC_TYPE_GENERAL, "asn1parse", asn1parse_main },
140 { FUNC_TYPE_GENERAL, "ca", ca_main },
141 { FUNC_TYPE_GENERAL, "certhash", certhash_main },
142 { FUNC_TYPE_GENERAL, "ciphers", ciphers_main },
143#ifndef OPENSSL_NO_CMS
144 { FUNC_TYPE_GENERAL, "cms", cms_main },
145#endif
146 { FUNC_TYPE_GENERAL, "crl2pkcs7", crl2pkcs7_main },
147 { FUNC_TYPE_GENERAL, "crl", crl_main },
148 { FUNC_TYPE_GENERAL, "dgst", dgst_main },
149 { FUNC_TYPE_GENERAL, "enc", enc_main },
150#ifndef OPENSSL_NO_ENGINE
151 { FUNC_TYPE_GENERAL, "engine", engine_main },
152#endif
153 { FUNC_TYPE_GENERAL, "errstr", errstr_main },
154 { FUNC_TYPE_GENERAL, "genpkey", genpkey_main },
155 { FUNC_TYPE_GENERAL, "nseq", nseq_main },
156#ifndef OPENSSL_NO_OCSP
157 { FUNC_TYPE_GENERAL, "ocsp", ocsp_main },
158#endif
159 { FUNC_TYPE_GENERAL, "passwd", passwd_main },
160 { FUNC_TYPE_GENERAL, "pkcs7", pkcs7_main },
161 { FUNC_TYPE_GENERAL, "pkcs8", pkcs8_main },
162#if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_SHA1)
163 { FUNC_TYPE_GENERAL, "pkcs12", pkcs12_main },
164#endif
165 { FUNC_TYPE_GENERAL, "pkey", pkey_main },
166 { FUNC_TYPE_GENERAL, "pkeyparam", pkeyparam_main },
167 { FUNC_TYPE_GENERAL, "pkeyutl", pkeyutl_main },
168 { FUNC_TYPE_GENERAL, "prime", prime_main },
169 { FUNC_TYPE_GENERAL, "rand", rand_main },
170 { FUNC_TYPE_GENERAL, "req", req_main },
171 { FUNC_TYPE_GENERAL, "s_client", s_client_main },
172 { FUNC_TYPE_GENERAL, "s_server", s_server_main },
173 { FUNC_TYPE_GENERAL, "s_time", s_time_main },
174 { FUNC_TYPE_GENERAL, "sess_id", sess_id_main },
175 { FUNC_TYPE_GENERAL, "smime", smime_main },
176#ifndef OPENSSL_NO_SPEED
177 { FUNC_TYPE_GENERAL, "speed", speed_main },
178#endif
179 { FUNC_TYPE_GENERAL, "spkac", spkac_main },
180 { FUNC_TYPE_GENERAL, "ts", ts_main },
181 { FUNC_TYPE_GENERAL, "verify", verify_main },
182 { FUNC_TYPE_GENERAL, "version", version_main },
183 { FUNC_TYPE_GENERAL, "x509", x509_main },
184
185#ifndef OPENSSL_NO_DH
186 { FUNC_TYPE_GENERAL, "dh", dh_main },
187 { FUNC_TYPE_GENERAL, "dhparam", dhparam_main },
188 { FUNC_TYPE_GENERAL, "gendh", gendh_main },
189#endif
190#ifndef OPENSSL_NO_DSA
191 { FUNC_TYPE_GENERAL, "dsa", dsa_main },
192 { FUNC_TYPE_GENERAL, "dsaparam", dsaparam_main },
193 { FUNC_TYPE_GENERAL, "gendsa", gendsa_main },
194#endif
195#ifndef OPENSSL_NO_EC
196 { FUNC_TYPE_GENERAL, "ec", ec_main },
197 { FUNC_TYPE_GENERAL, "ecparam", ecparam_main },
198#endif
199#ifndef OPENSSL_NO_RSA
200 { FUNC_TYPE_GENERAL, "genrsa", genrsa_main },
201 { FUNC_TYPE_GENERAL, "rsa", rsa_main },
202 { FUNC_TYPE_GENERAL, "rsautl", rsautl_main },
203#endif
204
205 /* Message Digests. */
206#ifndef OPENSSL_NO_GOST
207 { FUNC_TYPE_MD, "gost-mac", dgst_main },
208 { FUNC_TYPE_MD, "md_gost94", dgst_main },
209 { FUNC_TYPE_MD, "streebog256", dgst_main },
210 { FUNC_TYPE_MD, "streebog512", dgst_main },
211#endif
212#ifndef OPENSSL_NO_MD4
213 { FUNC_TYPE_MD, "md4", dgst_main },
214#endif
215#ifndef OPENSSL_NO_MD5
216 { FUNC_TYPE_MD, "md5", dgst_main },
217#endif
218#ifndef OPENSSL_NO_RIPEMD160
219 { FUNC_TYPE_MD, "ripemd160", dgst_main },
220#endif
221#ifndef OPENSSL_NO_SHA
222 { FUNC_TYPE_MD, "sha", dgst_main },
223#endif
224#ifndef OPENSSL_NO_SHA1
225 { FUNC_TYPE_MD, "sha1", dgst_main },
226#endif
227#ifndef OPENSSL_NO_SHA224
228 { FUNC_TYPE_MD, "sha224", dgst_main },
229#endif
230#ifndef OPENSSL_NO_SHA256
231 { FUNC_TYPE_MD, "sha256", dgst_main },
232#endif
233#ifndef OPENSSL_NO_SHA384
234 { FUNC_TYPE_MD, "sha384", dgst_main },
235#endif
236#ifndef OPENSSL_NO_SHA512
237 { FUNC_TYPE_MD, "sha512", dgst_main },
238#endif
239#ifndef OPENSSL_NO_WHIRLPOOL
240 { FUNC_TYPE_MD, "whirlpool", dgst_main },
241#endif
242
243 /* Ciphers. */
244 { FUNC_TYPE_CIPHER, "base64", enc_main },
245#ifndef OPENSSL_NO_AES
246 { FUNC_TYPE_CIPHER, "aes-128-cbc", enc_main },
247 { FUNC_TYPE_CIPHER, "aes-128-ecb", enc_main },
248 { FUNC_TYPE_CIPHER, "aes-192-cbc", enc_main },
249 { FUNC_TYPE_CIPHER, "aes-192-ecb", enc_main },
250 { FUNC_TYPE_CIPHER, "aes-256-cbc", enc_main },
251 { FUNC_TYPE_CIPHER, "aes-256-ecb", enc_main },
252#endif
253#ifndef OPENSSL_NO_BF
254 { FUNC_TYPE_CIPHER, "bf", enc_main },
255 { FUNC_TYPE_CIPHER, "bf-cbc", enc_main },
256 { FUNC_TYPE_CIPHER, "bf-ecb", enc_main },
257 { FUNC_TYPE_CIPHER, "bf-cfb", enc_main },
258 { FUNC_TYPE_CIPHER, "bf-ofb", enc_main },
259#endif
260#ifndef OPENSSL_NO_CAMELLIA
261 { FUNC_TYPE_CIPHER, "camellia-128-cbc", enc_main },
262 { FUNC_TYPE_CIPHER, "camellia-128-ecb", enc_main },
263 { FUNC_TYPE_CIPHER, "camellia-192-cbc", enc_main },
264 { FUNC_TYPE_CIPHER, "camellia-192-ecb", enc_main },
265 { FUNC_TYPE_CIPHER, "camellia-256-cbc", enc_main },
266 { FUNC_TYPE_CIPHER, "camellia-256-ecb", enc_main },
267#endif
268#ifndef OPENSSL_NO_CAST
269 { FUNC_TYPE_CIPHER, "cast", enc_main },
270 { FUNC_TYPE_CIPHER, "cast5-cbc", enc_main },
271 { FUNC_TYPE_CIPHER, "cast5-ecb", enc_main },
272 { FUNC_TYPE_CIPHER, "cast5-cfb", enc_main },
273 { FUNC_TYPE_CIPHER, "cast5-ofb", enc_main },
274 { FUNC_TYPE_CIPHER, "cast-cbc", enc_main },
275#endif
276#ifndef OPENSSL_NO_CHACHA
277 { FUNC_TYPE_CIPHER, "chacha", enc_main },
278#endif
279#ifndef OPENSSL_NO_DES
280 { FUNC_TYPE_CIPHER, "des", enc_main },
281 { FUNC_TYPE_CIPHER, "des3", enc_main },
282 { FUNC_TYPE_CIPHER, "desx", enc_main },
283 { FUNC_TYPE_CIPHER, "des-ecb", enc_main },
284 { FUNC_TYPE_CIPHER, "des-ede", enc_main },
285 { FUNC_TYPE_CIPHER, "des-ede3", enc_main },
286 { FUNC_TYPE_CIPHER, "des-cbc", enc_main },
287 { FUNC_TYPE_CIPHER, "des-ede-cbc", enc_main },
288 { FUNC_TYPE_CIPHER, "des-ede3-cbc", enc_main },
289 { FUNC_TYPE_CIPHER, "des-cfb", enc_main },
290 { FUNC_TYPE_CIPHER, "des-ede-cfb", enc_main },
291 { FUNC_TYPE_CIPHER, "des-ede3-cfb", enc_main },
292 { FUNC_TYPE_CIPHER, "des-ofb", enc_main },
293 { FUNC_TYPE_CIPHER, "des-ede-ofb", enc_main },
294 { FUNC_TYPE_CIPHER, "des-ede3-ofb", enc_main },
295#endif
296#ifndef OPENSSL_NO_IDEA
297 { FUNC_TYPE_CIPHER, "idea", enc_main },
298 { FUNC_TYPE_CIPHER, "idea-cbc", enc_main },
299 { FUNC_TYPE_CIPHER, "idea-ecb", enc_main },
300 { FUNC_TYPE_CIPHER, "idea-cfb", enc_main },
301 { FUNC_TYPE_CIPHER, "idea-ofb", enc_main },
302#endif
303#ifndef OPENSSL_NO_RC2
304 { FUNC_TYPE_CIPHER, "rc2", enc_main },
305 { FUNC_TYPE_CIPHER, "rc2-cbc", enc_main },
306 { FUNC_TYPE_CIPHER, "rc2-ecb", enc_main },
307 { FUNC_TYPE_CIPHER, "rc2-cfb", enc_main },
308 { FUNC_TYPE_CIPHER, "rc2-ofb", enc_main },
309 { FUNC_TYPE_CIPHER, "rc2-64-cbc", enc_main },
310 { FUNC_TYPE_CIPHER, "rc2-40-cbc", enc_main },
311#endif
312#ifndef OPENSSL_NO_RC4
313 { FUNC_TYPE_CIPHER, "rc4", enc_main },
314 { FUNC_TYPE_CIPHER, "rc4-40", enc_main },
315#endif
316#ifndef OPENSSL_NO_RC5
317 { FUNC_TYPE_CIPHER, "rc5", enc_main },
318 { FUNC_TYPE_CIPHER, "rc5-cbc", enc_main },
319 { FUNC_TYPE_CIPHER, "rc5-ecb", enc_main },
320 { FUNC_TYPE_CIPHER, "rc5-cfb", enc_main },
321 { FUNC_TYPE_CIPHER, "rc5-ofb", enc_main },
322#endif
323#ifdef ZLIB
324 { FUNC_TYPE_CIPHER, "zlib", enc_main },
325#endif
326
327 { 0, NULL, NULL }
328};
329
136static void openssl_startup(void); 330static void openssl_startup(void);
137static void openssl_shutdown(void); 331static void openssl_shutdown(void);
138 332
diff --git a/src/usr.bin/openssl/pkcs8.c b/src/usr.bin/openssl/pkcs8.c
index b226a00ce6..7e590aa41d 100644
--- a/src/usr.bin/openssl/pkcs8.c
+++ b/src/usr.bin/openssl/pkcs8.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: pkcs8.c,v 1.4 2015/01/08 11:06:12 doug Exp $ */ 1/* $OpenBSD: pkcs8.c,v 1.5 2015/08/19 18:25:31 deraadt Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999-2004. 3 * project 1999-2004.
4 */ 4 */
@@ -60,6 +60,7 @@
60#include <string.h> 60#include <string.h>
61 61
62#include "apps.h" 62#include "apps.h"
63#include "progs.h"
63 64
64#include <openssl/err.h> 65#include <openssl/err.h>
65#include <openssl/evp.h> 66#include <openssl/evp.h>
diff --git a/src/usr.bin/openssl/progs.h b/src/usr.bin/openssl/progs.h
index 9efac556a3..1f2cfb0ba4 100644
--- a/src/usr.bin/openssl/progs.h
+++ b/src/usr.bin/openssl/progs.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: progs.h,v 1.4 2015/06/20 13:51:52 jsing Exp $ */ 1/* $OpenBSD: progs.h,v 1.5 2015/08/19 18:25:31 deraadt Exp $ */
2/* Public domain */ 2/* Public domain */
3 3
4extern int asn1parse_main(int argc, char *argv[]); 4extern int asn1parse_main(int argc, char *argv[]);
@@ -61,197 +61,3 @@ typedef struct {
61 int (*func)(int argc, char *argv[]); 61 int (*func)(int argc, char *argv[]);
62} FUNCTION; 62} FUNCTION;
63DECLARE_LHASH_OF(FUNCTION); 63DECLARE_LHASH_OF(FUNCTION);
64
65FUNCTION functions[] = {
66
67 /* General functions. */
68 { FUNC_TYPE_GENERAL, "asn1parse", asn1parse_main },
69 { FUNC_TYPE_GENERAL, "ca", ca_main },
70 { FUNC_TYPE_GENERAL, "certhash", certhash_main },
71 { FUNC_TYPE_GENERAL, "ciphers", ciphers_main },
72#ifndef OPENSSL_NO_CMS
73 { FUNC_TYPE_GENERAL, "cms", cms_main },
74#endif
75 { FUNC_TYPE_GENERAL, "crl2pkcs7", crl2pkcs7_main },
76 { FUNC_TYPE_GENERAL, "crl", crl_main },
77 { FUNC_TYPE_GENERAL, "dgst", dgst_main },
78 { FUNC_TYPE_GENERAL, "enc", enc_main },
79#ifndef OPENSSL_NO_ENGINE
80 { FUNC_TYPE_GENERAL, "engine", engine_main },
81#endif
82 { FUNC_TYPE_GENERAL, "errstr", errstr_main },
83 { FUNC_TYPE_GENERAL, "genpkey", genpkey_main },
84 { FUNC_TYPE_GENERAL, "nseq", nseq_main },
85#ifndef OPENSSL_NO_OCSP
86 { FUNC_TYPE_GENERAL, "ocsp", ocsp_main },
87#endif
88 { FUNC_TYPE_GENERAL, "passwd", passwd_main },
89 { FUNC_TYPE_GENERAL, "pkcs7", pkcs7_main },
90 { FUNC_TYPE_GENERAL, "pkcs8", pkcs8_main },
91#if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_SHA1)
92 { FUNC_TYPE_GENERAL, "pkcs12", pkcs12_main },
93#endif
94 { FUNC_TYPE_GENERAL, "pkey", pkey_main },
95 { FUNC_TYPE_GENERAL, "pkeyparam", pkeyparam_main },
96 { FUNC_TYPE_GENERAL, "pkeyutl", pkeyutl_main },
97 { FUNC_TYPE_GENERAL, "prime", prime_main },
98 { FUNC_TYPE_GENERAL, "rand", rand_main },
99 { FUNC_TYPE_GENERAL, "req", req_main },
100 { FUNC_TYPE_GENERAL, "s_client", s_client_main },
101 { FUNC_TYPE_GENERAL, "s_server", s_server_main },
102 { FUNC_TYPE_GENERAL, "s_time", s_time_main },
103 { FUNC_TYPE_GENERAL, "sess_id", sess_id_main },
104 { FUNC_TYPE_GENERAL, "smime", smime_main },
105#ifndef OPENSSL_NO_SPEED
106 { FUNC_TYPE_GENERAL, "speed", speed_main },
107#endif
108 { FUNC_TYPE_GENERAL, "spkac", spkac_main },
109 { FUNC_TYPE_GENERAL, "ts", ts_main },
110 { FUNC_TYPE_GENERAL, "verify", verify_main },
111 { FUNC_TYPE_GENERAL, "version", version_main },
112 { FUNC_TYPE_GENERAL, "x509", x509_main },
113
114#ifndef OPENSSL_NO_DH
115 { FUNC_TYPE_GENERAL, "dh", dh_main },
116 { FUNC_TYPE_GENERAL, "dhparam", dhparam_main },
117 { FUNC_TYPE_GENERAL, "gendh", gendh_main },
118#endif
119#ifndef OPENSSL_NO_DSA
120 { FUNC_TYPE_GENERAL, "dsa", dsa_main },
121 { FUNC_TYPE_GENERAL, "dsaparam", dsaparam_main },
122 { FUNC_TYPE_GENERAL, "gendsa", gendsa_main },
123#endif
124#ifndef OPENSSL_NO_EC
125 { FUNC_TYPE_GENERAL, "ec", ec_main },
126 { FUNC_TYPE_GENERAL, "ecparam", ecparam_main },
127#endif
128#ifndef OPENSSL_NO_RSA
129 { FUNC_TYPE_GENERAL, "genrsa", genrsa_main },
130 { FUNC_TYPE_GENERAL, "rsa", rsa_main },
131 { FUNC_TYPE_GENERAL, "rsautl", rsautl_main },
132#endif
133
134 /* Message Digests. */
135#ifndef OPENSSL_NO_GOST
136 { FUNC_TYPE_MD, "gost-mac", dgst_main },
137 { FUNC_TYPE_MD, "md_gost94", dgst_main },
138 { FUNC_TYPE_MD, "streebog256", dgst_main },
139 { FUNC_TYPE_MD, "streebog512", dgst_main },
140#endif
141#ifndef OPENSSL_NO_MD4
142 { FUNC_TYPE_MD, "md4", dgst_main },
143#endif
144#ifndef OPENSSL_NO_MD5
145 { FUNC_TYPE_MD, "md5", dgst_main },
146#endif
147#ifndef OPENSSL_NO_RIPEMD160
148 { FUNC_TYPE_MD, "ripemd160", dgst_main },
149#endif
150#ifndef OPENSSL_NO_SHA
151 { FUNC_TYPE_MD, "sha", dgst_main },
152#endif
153#ifndef OPENSSL_NO_SHA1
154 { FUNC_TYPE_MD, "sha1", dgst_main },
155#endif
156#ifndef OPENSSL_NO_SHA224
157 { FUNC_TYPE_MD, "sha224", dgst_main },
158#endif
159#ifndef OPENSSL_NO_SHA256
160 { FUNC_TYPE_MD, "sha256", dgst_main },
161#endif
162#ifndef OPENSSL_NO_SHA384
163 { FUNC_TYPE_MD, "sha384", dgst_main },
164#endif
165#ifndef OPENSSL_NO_SHA512
166 { FUNC_TYPE_MD, "sha512", dgst_main },
167#endif
168#ifndef OPENSSL_NO_WHIRLPOOL
169 { FUNC_TYPE_MD, "whirlpool", dgst_main },
170#endif
171
172 /* Ciphers. */
173 { FUNC_TYPE_CIPHER, "base64", enc_main },
174#ifndef OPENSSL_NO_AES
175 { FUNC_TYPE_CIPHER, "aes-128-cbc", enc_main },
176 { FUNC_TYPE_CIPHER, "aes-128-ecb", enc_main },
177 { FUNC_TYPE_CIPHER, "aes-192-cbc", enc_main },
178 { FUNC_TYPE_CIPHER, "aes-192-ecb", enc_main },
179 { FUNC_TYPE_CIPHER, "aes-256-cbc", enc_main },
180 { FUNC_TYPE_CIPHER, "aes-256-ecb", enc_main },
181#endif
182#ifndef OPENSSL_NO_BF
183 { FUNC_TYPE_CIPHER, "bf", enc_main },
184 { FUNC_TYPE_CIPHER, "bf-cbc", enc_main },
185 { FUNC_TYPE_CIPHER, "bf-ecb", enc_main },
186 { FUNC_TYPE_CIPHER, "bf-cfb", enc_main },
187 { FUNC_TYPE_CIPHER, "bf-ofb", enc_main },
188#endif
189#ifndef OPENSSL_NO_CAMELLIA
190 { FUNC_TYPE_CIPHER, "camellia-128-cbc", enc_main },
191 { FUNC_TYPE_CIPHER, "camellia-128-ecb", enc_main },
192 { FUNC_TYPE_CIPHER, "camellia-192-cbc", enc_main },
193 { FUNC_TYPE_CIPHER, "camellia-192-ecb", enc_main },
194 { FUNC_TYPE_CIPHER, "camellia-256-cbc", enc_main },
195 { FUNC_TYPE_CIPHER, "camellia-256-ecb", enc_main },
196#endif
197#ifndef OPENSSL_NO_CAST
198 { FUNC_TYPE_CIPHER, "cast", enc_main },
199 { FUNC_TYPE_CIPHER, "cast5-cbc", enc_main },
200 { FUNC_TYPE_CIPHER, "cast5-ecb", enc_main },
201 { FUNC_TYPE_CIPHER, "cast5-cfb", enc_main },
202 { FUNC_TYPE_CIPHER, "cast5-ofb", enc_main },
203 { FUNC_TYPE_CIPHER, "cast-cbc", enc_main },
204#endif
205#ifndef OPENSSL_NO_CHACHA
206 { FUNC_TYPE_CIPHER, "chacha", enc_main },
207#endif
208#ifndef OPENSSL_NO_DES
209 { FUNC_TYPE_CIPHER, "des", enc_main },
210 { FUNC_TYPE_CIPHER, "des3", enc_main },
211 { FUNC_TYPE_CIPHER, "desx", enc_main },
212 { FUNC_TYPE_CIPHER, "des-ecb", enc_main },
213 { FUNC_TYPE_CIPHER, "des-ede", enc_main },
214 { FUNC_TYPE_CIPHER, "des-ede3", enc_main },
215 { FUNC_TYPE_CIPHER, "des-cbc", enc_main },
216 { FUNC_TYPE_CIPHER, "des-ede-cbc", enc_main },
217 { FUNC_TYPE_CIPHER, "des-ede3-cbc", enc_main },
218 { FUNC_TYPE_CIPHER, "des-cfb", enc_main },
219 { FUNC_TYPE_CIPHER, "des-ede-cfb", enc_main },
220 { FUNC_TYPE_CIPHER, "des-ede3-cfb", enc_main },
221 { FUNC_TYPE_CIPHER, "des-ofb", enc_main },
222 { FUNC_TYPE_CIPHER, "des-ede-ofb", enc_main },
223 { FUNC_TYPE_CIPHER, "des-ede3-ofb", enc_main },
224#endif
225#ifndef OPENSSL_NO_IDEA
226 { FUNC_TYPE_CIPHER, "idea", enc_main },
227 { FUNC_TYPE_CIPHER, "idea-cbc", enc_main },
228 { FUNC_TYPE_CIPHER, "idea-ecb", enc_main },
229 { FUNC_TYPE_CIPHER, "idea-cfb", enc_main },
230 { FUNC_TYPE_CIPHER, "idea-ofb", enc_main },
231#endif
232#ifndef OPENSSL_NO_RC2
233 { FUNC_TYPE_CIPHER, "rc2", enc_main },
234 { FUNC_TYPE_CIPHER, "rc2-cbc", enc_main },
235 { FUNC_TYPE_CIPHER, "rc2-ecb", enc_main },
236 { FUNC_TYPE_CIPHER, "rc2-cfb", enc_main },
237 { FUNC_TYPE_CIPHER, "rc2-ofb", enc_main },
238 { FUNC_TYPE_CIPHER, "rc2-64-cbc", enc_main },
239 { FUNC_TYPE_CIPHER, "rc2-40-cbc", enc_main },
240#endif
241#ifndef OPENSSL_NO_RC4
242 { FUNC_TYPE_CIPHER, "rc4", enc_main },
243 { FUNC_TYPE_CIPHER, "rc4-40", enc_main },
244#endif
245#ifndef OPENSSL_NO_RC5
246 { FUNC_TYPE_CIPHER, "rc5", enc_main },
247 { FUNC_TYPE_CIPHER, "rc5-cbc", enc_main },
248 { FUNC_TYPE_CIPHER, "rc5-ecb", enc_main },
249 { FUNC_TYPE_CIPHER, "rc5-cfb", enc_main },
250 { FUNC_TYPE_CIPHER, "rc5-ofb", enc_main },
251#endif
252#ifdef ZLIB
253 { FUNC_TYPE_CIPHER, "zlib", enc_main },
254#endif
255
256 { 0, NULL, NULL }
257};
diff --git a/src/usr.bin/openssl/rsa.c b/src/usr.bin/openssl/rsa.c
index 91a9d161fb..55b6f7399f 100644
--- a/src/usr.bin/openssl/rsa.c
+++ b/src/usr.bin/openssl/rsa.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: rsa.c,v 1.3 2015/01/24 05:48:39 doug Exp $ */ 1/* $OpenBSD: rsa.c,v 1.4 2015/08/19 18:25:31 deraadt 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 *
@@ -64,6 +64,7 @@
64#include <time.h> 64#include <time.h>
65 65
66#include "apps.h" 66#include "apps.h"
67#include "progs.h"
67 68
68#include <openssl/bio.h> 69#include <openssl/bio.h>
69#include <openssl/bn.h> 70#include <openssl/bn.h>
diff --git a/src/usr.bin/openssl/sess_id.c b/src/usr.bin/openssl/sess_id.c
index cc47bad93b..d7f3339509 100644
--- a/src/usr.bin/openssl/sess_id.c
+++ b/src/usr.bin/openssl/sess_id.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sess_id.c,v 1.4 2015/02/08 10:22:45 doug Exp $ */ 1/* $OpenBSD: sess_id.c,v 1.5 2015/08/19 18:25:31 deraadt 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 *
@@ -61,6 +61,7 @@
61#include <string.h> 61#include <string.h>
62 62
63#include "apps.h" 63#include "apps.h"
64#include "progs.h"
64 65
65#include <openssl/bio.h> 66#include <openssl/bio.h>
66#include <openssl/err.h> 67#include <openssl/err.h>
diff --git a/src/usr.bin/openssl/spkac.c b/src/usr.bin/openssl/spkac.c
index 197469d6a9..b5ce764eae 100644
--- a/src/usr.bin/openssl/spkac.c
+++ b/src/usr.bin/openssl/spkac.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: spkac.c,v 1.3 2015/01/08 11:08:50 doug Exp $ */ 1/* $OpenBSD: spkac.c,v 1.4 2015/08/19 18:25:31 deraadt Exp $ */
2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL 2/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
3 * project 1999. Based on an original idea by Massimiliano Pala 3 * project 1999. Based on an original idea by Massimiliano Pala
4 * (madwolf@openca.org). 4 * (madwolf@openca.org).
@@ -63,6 +63,7 @@
63#include <time.h> 63#include <time.h>
64 64
65#include "apps.h" 65#include "apps.h"
66#include "progs.h"
66 67
67#include <openssl/bio.h> 68#include <openssl/bio.h>
68#include <openssl/conf.h> 69#include <openssl/conf.h>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-03-23 12:43:19 +0000