bring prototypes into scope, requires movement of a large global object

out of .h file
ok jsing

8 files changed, 208 insertions, 202 deletions

diff --git a/usr.bin/openssl/asn1pars.c b/usr.bin/openssl/asn1pars.c
index 62af4f164ed..da3bf761ce4 100644
--- a/usr.bin/openssl/asn1pars.c
+++ b/usr.bin/openssl/asn1pars.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: asn1pars.c,v 1.3 2015/01/08 11:00:12 doug Exp $ */
+/* $OpenBSD: asn1pars.c,v 1.4 2015/08/19 18:25:31 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -66,6 +66,7 @@
 #include <string.h>
 
 #include "apps.h"
+#include "progs.h"
 
 #include <openssl/err.h>
 #include <openssl/evp.h>
diff --git a/usr.bin/openssl/ciphers.c b/usr.bin/openssl/ciphers.c
index fd9e839064f..18b8d3e4d95 100644
--- a/usr.bin/openssl/ciphers.c
+++ b/usr.bin/openssl/ciphers.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ciphers.c,v 1.5 2015/07/17 16:04:09 doug Exp $ */
+/* $OpenBSD: ciphers.c,v 1.6 2015/08/19 18:25:31 deraadt Exp $ */
 /*
  * Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
  *
@@ -22,6 +22,7 @@
 #include <openssl/ssl.h>
 
 #include "apps.h"
+#include "progs.h"
 
 struct {
 	int usage;
diff --git a/usr.bin/openssl/openssl.c b/usr.bin/openssl/openssl.c
index 08e22ca829f..1754b3a1079 100644
--- a/usr.bin/openssl/openssl.c
+++ b/usr.bin/openssl/openssl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: openssl.c,v 1.3 2015/03/22 10:36:22 bcook Exp $ */
+/* $OpenBSD: openssl.c,v 1.4 2015/08/19 18:25:31 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -133,6 +133,200 @@
 #include "progs.h"
 #include "s_apps.h"
 
+FUNCTION functions[] = {
+
+	/* General functions. */
+	{ FUNC_TYPE_GENERAL, "asn1parse", asn1parse_main },
+	{ FUNC_TYPE_GENERAL, "ca", ca_main },
+	{ FUNC_TYPE_GENERAL, "certhash", certhash_main },
+	{ FUNC_TYPE_GENERAL, "ciphers", ciphers_main },
+#ifndef OPENSSL_NO_CMS
+	{ FUNC_TYPE_GENERAL, "cms", cms_main },
+#endif
+	{ FUNC_TYPE_GENERAL, "crl2pkcs7", crl2pkcs7_main },
+	{ FUNC_TYPE_GENERAL, "crl", crl_main },
+	{ FUNC_TYPE_GENERAL, "dgst", dgst_main },
+	{ FUNC_TYPE_GENERAL, "enc", enc_main },
+#ifndef OPENSSL_NO_ENGINE
+	{ FUNC_TYPE_GENERAL, "engine", engine_main },
+#endif
+	{ FUNC_TYPE_GENERAL, "errstr", errstr_main },
+	{ FUNC_TYPE_GENERAL, "genpkey", genpkey_main },
+	{ FUNC_TYPE_GENERAL, "nseq", nseq_main },
+#ifndef OPENSSL_NO_OCSP
+	{ FUNC_TYPE_GENERAL, "ocsp", ocsp_main },
+#endif
+	{ FUNC_TYPE_GENERAL, "passwd", passwd_main },
+	{ FUNC_TYPE_GENERAL, "pkcs7", pkcs7_main },
+	{ FUNC_TYPE_GENERAL, "pkcs8", pkcs8_main },
+#if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_SHA1)
+	{ FUNC_TYPE_GENERAL, "pkcs12", pkcs12_main },
+#endif
+	{ FUNC_TYPE_GENERAL, "pkey", pkey_main },
+	{ FUNC_TYPE_GENERAL, "pkeyparam", pkeyparam_main },
+	{ FUNC_TYPE_GENERAL, "pkeyutl", pkeyutl_main },
+	{ FUNC_TYPE_GENERAL, "prime", prime_main },
+	{ FUNC_TYPE_GENERAL, "rand", rand_main },
+	{ FUNC_TYPE_GENERAL, "req", req_main },
+	{ FUNC_TYPE_GENERAL, "s_client", s_client_main },
+	{ FUNC_TYPE_GENERAL, "s_server", s_server_main },
+	{ FUNC_TYPE_GENERAL, "s_time", s_time_main },
+	{ FUNC_TYPE_GENERAL, "sess_id", sess_id_main },
+	{ FUNC_TYPE_GENERAL, "smime", smime_main },
+#ifndef OPENSSL_NO_SPEED
+	{ FUNC_TYPE_GENERAL, "speed", speed_main },
+#endif
+	{ FUNC_TYPE_GENERAL, "spkac", spkac_main },
+	{ FUNC_TYPE_GENERAL, "ts", ts_main },
+	{ FUNC_TYPE_GENERAL, "verify", verify_main },
+	{ FUNC_TYPE_GENERAL, "version", version_main },
+	{ FUNC_TYPE_GENERAL, "x509", x509_main },
+
+#ifndef OPENSSL_NO_DH
+	{ FUNC_TYPE_GENERAL, "dh", dh_main },
+	{ FUNC_TYPE_GENERAL, "dhparam", dhparam_main },
+	{ FUNC_TYPE_GENERAL, "gendh", gendh_main },
+#endif
+#ifndef OPENSSL_NO_DSA
+	{ FUNC_TYPE_GENERAL, "dsa", dsa_main },
+	{ FUNC_TYPE_GENERAL, "dsaparam", dsaparam_main },
+	{ FUNC_TYPE_GENERAL, "gendsa", gendsa_main },
+#endif
+#ifndef OPENSSL_NO_EC
+	{ FUNC_TYPE_GENERAL, "ec", ec_main },
+	{ FUNC_TYPE_GENERAL, "ecparam", ecparam_main },
+#endif
+#ifndef OPENSSL_NO_RSA
+	{ FUNC_TYPE_GENERAL, "genrsa", genrsa_main },
+	{ FUNC_TYPE_GENERAL, "rsa", rsa_main },
+	{ FUNC_TYPE_GENERAL, "rsautl", rsautl_main },
+#endif
+
+	/* Message Digests. */
+#ifndef OPENSSL_NO_GOST
+	{ FUNC_TYPE_MD, "gost-mac", dgst_main },
+	{ FUNC_TYPE_MD, "md_gost94", dgst_main },
+	{ FUNC_TYPE_MD, "streebog256", dgst_main },
+	{ FUNC_TYPE_MD, "streebog512", dgst_main },
+#endif
+#ifndef OPENSSL_NO_MD4
+	{ FUNC_TYPE_MD, "md4", dgst_main },
+#endif
+#ifndef OPENSSL_NO_MD5
+	{ FUNC_TYPE_MD, "md5", dgst_main },
+#endif
+#ifndef OPENSSL_NO_RIPEMD160
+	{ FUNC_TYPE_MD, "ripemd160", dgst_main },
+#endif
+#ifndef OPENSSL_NO_SHA
+	{ FUNC_TYPE_MD, "sha", dgst_main },
+#endif
+#ifndef OPENSSL_NO_SHA1
+	{ FUNC_TYPE_MD, "sha1", dgst_main },
+#endif
+#ifndef OPENSSL_NO_SHA224
+	{ FUNC_TYPE_MD, "sha224", dgst_main },
+#endif
+#ifndef OPENSSL_NO_SHA256
+	{ FUNC_TYPE_MD, "sha256", dgst_main },
+#endif
+#ifndef OPENSSL_NO_SHA384
+	{ FUNC_TYPE_MD, "sha384", dgst_main },
+#endif
+#ifndef OPENSSL_NO_SHA512
+	{ FUNC_TYPE_MD, "sha512", dgst_main },
+#endif
+#ifndef OPENSSL_NO_WHIRLPOOL
+	{ FUNC_TYPE_MD, "whirlpool", dgst_main },
+#endif
+
+	/* Ciphers. */
+	{ FUNC_TYPE_CIPHER, "base64", enc_main },
+#ifndef OPENSSL_NO_AES
+	{ FUNC_TYPE_CIPHER, "aes-128-cbc", enc_main },
+	{ FUNC_TYPE_CIPHER, "aes-128-ecb", enc_main },
+	{ FUNC_TYPE_CIPHER, "aes-192-cbc", enc_main },
+	{ FUNC_TYPE_CIPHER, "aes-192-ecb", enc_main },
+	{ FUNC_TYPE_CIPHER, "aes-256-cbc", enc_main },
+	{ FUNC_TYPE_CIPHER, "aes-256-ecb", enc_main },
+#endif
+#ifndef OPENSSL_NO_BF
+	{ FUNC_TYPE_CIPHER, "bf", enc_main },
+	{ FUNC_TYPE_CIPHER, "bf-cbc", enc_main },
+	{ FUNC_TYPE_CIPHER, "bf-ecb", enc_main },
+	{ FUNC_TYPE_CIPHER, "bf-cfb", enc_main },
+	{ FUNC_TYPE_CIPHER, "bf-ofb", enc_main },
+#endif
+#ifndef OPENSSL_NO_CAMELLIA
+	{ FUNC_TYPE_CIPHER, "camellia-128-cbc", enc_main },
+	{ FUNC_TYPE_CIPHER, "camellia-128-ecb", enc_main },
+	{ FUNC_TYPE_CIPHER, "camellia-192-cbc", enc_main },
+	{ FUNC_TYPE_CIPHER, "camellia-192-ecb", enc_main },
+	{ FUNC_TYPE_CIPHER, "camellia-256-cbc", enc_main },
+	{ FUNC_TYPE_CIPHER, "camellia-256-ecb", enc_main },
+#endif
+#ifndef OPENSSL_NO_CAST
+	{ FUNC_TYPE_CIPHER, "cast", enc_main },
+	{ FUNC_TYPE_CIPHER, "cast5-cbc", enc_main },
+	{ FUNC_TYPE_CIPHER, "cast5-ecb", enc_main },
+	{ FUNC_TYPE_CIPHER, "cast5-cfb", enc_main },
+	{ FUNC_TYPE_CIPHER, "cast5-ofb", enc_main },
+	{ FUNC_TYPE_CIPHER, "cast-cbc", enc_main },
+#endif
+#ifndef OPENSSL_NO_CHACHA
+	{ FUNC_TYPE_CIPHER, "chacha", enc_main },
+#endif
+#ifndef OPENSSL_NO_DES
+	{ FUNC_TYPE_CIPHER, "des", enc_main },
+	{ FUNC_TYPE_CIPHER, "des3", enc_main },
+	{ FUNC_TYPE_CIPHER, "desx", enc_main },
+	{ FUNC_TYPE_CIPHER, "des-ecb", enc_main },
+	{ FUNC_TYPE_CIPHER, "des-ede", enc_main },
+	{ FUNC_TYPE_CIPHER, "des-ede3", enc_main },
+	{ FUNC_TYPE_CIPHER, "des-cbc", enc_main },
+	{ FUNC_TYPE_CIPHER, "des-ede-cbc", enc_main },
+	{ FUNC_TYPE_CIPHER, "des-ede3-cbc", enc_main },
+	{ FUNC_TYPE_CIPHER, "des-cfb", enc_main },
+	{ FUNC_TYPE_CIPHER, "des-ede-cfb", enc_main },
+	{ FUNC_TYPE_CIPHER, "des-ede3-cfb", enc_main },
+	{ FUNC_TYPE_CIPHER, "des-ofb", enc_main },
+	{ FUNC_TYPE_CIPHER, "des-ede-ofb", enc_main },
+	{ FUNC_TYPE_CIPHER, "des-ede3-ofb", enc_main },
+#endif
+#ifndef OPENSSL_NO_IDEA
+	{ FUNC_TYPE_CIPHER, "idea", enc_main },
+	{ FUNC_TYPE_CIPHER, "idea-cbc", enc_main },
+	{ FUNC_TYPE_CIPHER, "idea-ecb", enc_main },
+	{ FUNC_TYPE_CIPHER, "idea-cfb", enc_main },
+	{ FUNC_TYPE_CIPHER, "idea-ofb", enc_main },
+#endif
+#ifndef OPENSSL_NO_RC2
+	{ FUNC_TYPE_CIPHER, "rc2", enc_main },
+	{ FUNC_TYPE_CIPHER, "rc2-cbc", enc_main },
+	{ FUNC_TYPE_CIPHER, "rc2-ecb", enc_main },
+	{ FUNC_TYPE_CIPHER, "rc2-cfb", enc_main },
+	{ FUNC_TYPE_CIPHER, "rc2-ofb", enc_main },
+	{ FUNC_TYPE_CIPHER, "rc2-64-cbc", enc_main },
+	{ FUNC_TYPE_CIPHER, "rc2-40-cbc", enc_main },
+#endif
+#ifndef OPENSSL_NO_RC4
+	{ FUNC_TYPE_CIPHER, "rc4", enc_main },
+	{ FUNC_TYPE_CIPHER, "rc4-40", enc_main },
+#endif
+#ifndef OPENSSL_NO_RC5
+	{ FUNC_TYPE_CIPHER, "rc5", enc_main },
+	{ FUNC_TYPE_CIPHER, "rc5-cbc", enc_main },
+	{ FUNC_TYPE_CIPHER, "rc5-ecb", enc_main },
+	{ FUNC_TYPE_CIPHER, "rc5-cfb", enc_main },
+	{ FUNC_TYPE_CIPHER, "rc5-ofb", enc_main },
+#endif
+#ifdef ZLIB
+	{ FUNC_TYPE_CIPHER, "zlib", enc_main },
+#endif
+
+	{ 0, NULL, NULL }
+};
+
 static void openssl_startup(void);
 static void openssl_shutdown(void);
 
diff --git a/usr.bin/openssl/pkcs8.c b/usr.bin/openssl/pkcs8.c
index b226a00ce68..7e590aa41d6 100644
--- a/usr.bin/openssl/pkcs8.c
+++ b/usr.bin/openssl/pkcs8.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkcs8.c,v 1.4 2015/01/08 11:06:12 doug Exp $ */
+/* $OpenBSD: pkcs8.c,v 1.5 2015/08/19 18:25:31 deraadt Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999-2004.
  */
@@ -60,6 +60,7 @@
 #include <string.h>
 
 #include "apps.h"
+#include "progs.h"
 
 #include <openssl/err.h>
 #include <openssl/evp.h>
diff --git a/usr.bin/openssl/progs.h b/usr.bin/openssl/progs.h
index 9efac556a33..1f2cfb0ba41 100644
--- a/usr.bin/openssl/progs.h
+++ b/usr.bin/openssl/progs.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: progs.h,v 1.4 2015/06/20 13:51:52 jsing Exp $ */
+/* $OpenBSD: progs.h,v 1.5 2015/08/19 18:25:31 deraadt Exp $ */
 /* Public domain */
 
 extern int asn1parse_main(int argc, char *argv[]);
@@ -61,197 +61,3 @@ typedef struct {
 	int (*func)(int argc, char *argv[]);
 } FUNCTION;
 DECLARE_LHASH_OF(FUNCTION);
-
-FUNCTION functions[] = {
-
-	/* General functions. */
-	{ FUNC_TYPE_GENERAL, "asn1parse", asn1parse_main },
-	{ FUNC_TYPE_GENERAL, "ca", ca_main },
-	{ FUNC_TYPE_GENERAL, "certhash", certhash_main },
-	{ FUNC_TYPE_GENERAL, "ciphers", ciphers_main },
-#ifndef OPENSSL_NO_CMS
-	{ FUNC_TYPE_GENERAL, "cms", cms_main },
-#endif
-	{ FUNC_TYPE_GENERAL, "crl2pkcs7", crl2pkcs7_main },
-	{ FUNC_TYPE_GENERAL, "crl", crl_main },
-	{ FUNC_TYPE_GENERAL, "dgst", dgst_main },
-	{ FUNC_TYPE_GENERAL, "enc", enc_main },
-#ifndef OPENSSL_NO_ENGINE
-	{ FUNC_TYPE_GENERAL, "engine", engine_main },
-#endif
-	{ FUNC_TYPE_GENERAL, "errstr", errstr_main },
-	{ FUNC_TYPE_GENERAL, "genpkey", genpkey_main },
-	{ FUNC_TYPE_GENERAL, "nseq", nseq_main },
-#ifndef OPENSSL_NO_OCSP
-	{ FUNC_TYPE_GENERAL, "ocsp", ocsp_main },
-#endif
-	{ FUNC_TYPE_GENERAL, "passwd", passwd_main },
-	{ FUNC_TYPE_GENERAL, "pkcs7", pkcs7_main },
-	{ FUNC_TYPE_GENERAL, "pkcs8", pkcs8_main },
-#if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_SHA1)
-	{ FUNC_TYPE_GENERAL, "pkcs12", pkcs12_main },
-#endif
-	{ FUNC_TYPE_GENERAL, "pkey", pkey_main },
-	{ FUNC_TYPE_GENERAL, "pkeyparam", pkeyparam_main },
-	{ FUNC_TYPE_GENERAL, "pkeyutl", pkeyutl_main },
-	{ FUNC_TYPE_GENERAL, "prime", prime_main },
-	{ FUNC_TYPE_GENERAL, "rand", rand_main },
-	{ FUNC_TYPE_GENERAL, "req", req_main },
-	{ FUNC_TYPE_GENERAL, "s_client", s_client_main },
-	{ FUNC_TYPE_GENERAL, "s_server", s_server_main },
-	{ FUNC_TYPE_GENERAL, "s_time", s_time_main },
-	{ FUNC_TYPE_GENERAL, "sess_id", sess_id_main },
-	{ FUNC_TYPE_GENERAL, "smime", smime_main },
-#ifndef OPENSSL_NO_SPEED
-	{ FUNC_TYPE_GENERAL, "speed", speed_main },
-#endif
-	{ FUNC_TYPE_GENERAL, "spkac", spkac_main },
-	{ FUNC_TYPE_GENERAL, "ts", ts_main },
-	{ FUNC_TYPE_GENERAL, "verify", verify_main },
-	{ FUNC_TYPE_GENERAL, "version", version_main },
-	{ FUNC_TYPE_GENERAL, "x509", x509_main },
-
-#ifndef OPENSSL_NO_DH
-	{ FUNC_TYPE_GENERAL, "dh", dh_main },
-	{ FUNC_TYPE_GENERAL, "dhparam", dhparam_main },
-	{ FUNC_TYPE_GENERAL, "gendh", gendh_main },
-#endif
-#ifndef OPENSSL_NO_DSA
-	{ FUNC_TYPE_GENERAL, "dsa", dsa_main },
-	{ FUNC_TYPE_GENERAL, "dsaparam", dsaparam_main },
-	{ FUNC_TYPE_GENERAL, "gendsa", gendsa_main },
-#endif
-#ifndef OPENSSL_NO_EC
-	{ FUNC_TYPE_GENERAL, "ec", ec_main },
-	{ FUNC_TYPE_GENERAL, "ecparam", ecparam_main },
-#endif
-#ifndef OPENSSL_NO_RSA
-	{ FUNC_TYPE_GENERAL, "genrsa", genrsa_main },
-	{ FUNC_TYPE_GENERAL, "rsa", rsa_main },
-	{ FUNC_TYPE_GENERAL, "rsautl", rsautl_main },
-#endif
-
-	/* Message Digests. */
-#ifndef OPENSSL_NO_GOST
-	{ FUNC_TYPE_MD, "gost-mac", dgst_main },
-	{ FUNC_TYPE_MD, "md_gost94", dgst_main },
-	{ FUNC_TYPE_MD, "streebog256", dgst_main },
-	{ FUNC_TYPE_MD, "streebog512", dgst_main },
-#endif
-#ifndef OPENSSL_NO_MD4
-	{ FUNC_TYPE_MD, "md4", dgst_main },
-#endif
-#ifndef OPENSSL_NO_MD5
-	{ FUNC_TYPE_MD, "md5", dgst_main },
-#endif
-#ifndef OPENSSL_NO_RIPEMD160
-	{ FUNC_TYPE_MD, "ripemd160", dgst_main },
-#endif
-#ifndef OPENSSL_NO_SHA
-	{ FUNC_TYPE_MD, "sha", dgst_main },
-#endif
-#ifndef OPENSSL_NO_SHA1
-	{ FUNC_TYPE_MD, "sha1", dgst_main },
-#endif
-#ifndef OPENSSL_NO_SHA224
-	{ FUNC_TYPE_MD, "sha224", dgst_main },
-#endif
-#ifndef OPENSSL_NO_SHA256
-	{ FUNC_TYPE_MD, "sha256", dgst_main },
-#endif
-#ifndef OPENSSL_NO_SHA384
-	{ FUNC_TYPE_MD, "sha384", dgst_main },
-#endif
-#ifndef OPENSSL_NO_SHA512
-	{ FUNC_TYPE_MD, "sha512", dgst_main },
-#endif
-#ifndef OPENSSL_NO_WHIRLPOOL
-	{ FUNC_TYPE_MD, "whirlpool", dgst_main },
-#endif
-
-	/* Ciphers. */
-	{ FUNC_TYPE_CIPHER, "base64", enc_main },
-#ifndef OPENSSL_NO_AES
-	{ FUNC_TYPE_CIPHER, "aes-128-cbc", enc_main },
-	{ FUNC_TYPE_CIPHER, "aes-128-ecb", enc_main },
-	{ FUNC_TYPE_CIPHER, "aes-192-cbc", enc_main },
-	{ FUNC_TYPE_CIPHER, "aes-192-ecb", enc_main },
-	{ FUNC_TYPE_CIPHER, "aes-256-cbc", enc_main },
-	{ FUNC_TYPE_CIPHER, "aes-256-ecb", enc_main },
-#endif
-#ifndef OPENSSL_NO_BF
-	{ FUNC_TYPE_CIPHER, "bf", enc_main },
-	{ FUNC_TYPE_CIPHER, "bf-cbc", enc_main },
-	{ FUNC_TYPE_CIPHER, "bf-ecb", enc_main },
-	{ FUNC_TYPE_CIPHER, "bf-cfb", enc_main },
-	{ FUNC_TYPE_CIPHER, "bf-ofb", enc_main },
-#endif
-#ifndef OPENSSL_NO_CAMELLIA
-	{ FUNC_TYPE_CIPHER, "camellia-128-cbc", enc_main },
-	{ FUNC_TYPE_CIPHER, "camellia-128-ecb", enc_main },
-	{ FUNC_TYPE_CIPHER, "camellia-192-cbc", enc_main },
-	{ FUNC_TYPE_CIPHER, "camellia-192-ecb", enc_main },
-	{ FUNC_TYPE_CIPHER, "camellia-256-cbc", enc_main },
-	{ FUNC_TYPE_CIPHER, "camellia-256-ecb", enc_main },
-#endif
-#ifndef OPENSSL_NO_CAST
-	{ FUNC_TYPE_CIPHER, "cast", enc_main },
-	{ FUNC_TYPE_CIPHER, "cast5-cbc", enc_main },
-	{ FUNC_TYPE_CIPHER, "cast5-ecb", enc_main },
-	{ FUNC_TYPE_CIPHER, "cast5-cfb", enc_main },
-	{ FUNC_TYPE_CIPHER, "cast5-ofb", enc_main },
-	{ FUNC_TYPE_CIPHER, "cast-cbc", enc_main },
-#endif
-#ifndef OPENSSL_NO_CHACHA
-	{ FUNC_TYPE_CIPHER, "chacha", enc_main },
-#endif
-#ifndef OPENSSL_NO_DES
-	{ FUNC_TYPE_CIPHER, "des", enc_main },
-	{ FUNC_TYPE_CIPHER, "des3", enc_main },
-	{ FUNC_TYPE_CIPHER, "desx", enc_main },
-	{ FUNC_TYPE_CIPHER, "des-ecb", enc_main },
-	{ FUNC_TYPE_CIPHER, "des-ede", enc_main },
-	{ FUNC_TYPE_CIPHER, "des-ede3", enc_main },
-	{ FUNC_TYPE_CIPHER, "des-cbc", enc_main },
-	{ FUNC_TYPE_CIPHER, "des-ede-cbc", enc_main },
-	{ FUNC_TYPE_CIPHER, "des-ede3-cbc", enc_main },
-	{ FUNC_TYPE_CIPHER, "des-cfb", enc_main },
-	{ FUNC_TYPE_CIPHER, "des-ede-cfb", enc_main },
-	{ FUNC_TYPE_CIPHER, "des-ede3-cfb", enc_main },
-	{ FUNC_TYPE_CIPHER, "des-ofb", enc_main },
-	{ FUNC_TYPE_CIPHER, "des-ede-ofb", enc_main },
-	{ FUNC_TYPE_CIPHER, "des-ede3-ofb", enc_main },
-#endif
-#ifndef OPENSSL_NO_IDEA
-	{ FUNC_TYPE_CIPHER, "idea", enc_main },
-	{ FUNC_TYPE_CIPHER, "idea-cbc", enc_main },
-	{ FUNC_TYPE_CIPHER, "idea-ecb", enc_main },
-	{ FUNC_TYPE_CIPHER, "idea-cfb", enc_main },
-	{ FUNC_TYPE_CIPHER, "idea-ofb", enc_main },
-#endif
-#ifndef OPENSSL_NO_RC2
-	{ FUNC_TYPE_CIPHER, "rc2", enc_main },
-	{ FUNC_TYPE_CIPHER, "rc2-cbc", enc_main },
-	{ FUNC_TYPE_CIPHER, "rc2-ecb", enc_main },
-	{ FUNC_TYPE_CIPHER, "rc2-cfb", enc_main },
-	{ FUNC_TYPE_CIPHER, "rc2-ofb", enc_main },
-	{ FUNC_TYPE_CIPHER, "rc2-64-cbc", enc_main },
-	{ FUNC_TYPE_CIPHER, "rc2-40-cbc", enc_main },
-#endif
-#ifndef OPENSSL_NO_RC4
-	{ FUNC_TYPE_CIPHER, "rc4", enc_main },
-	{ FUNC_TYPE_CIPHER, "rc4-40", enc_main },
-#endif
-#ifndef OPENSSL_NO_RC5
-	{ FUNC_TYPE_CIPHER, "rc5", enc_main },
-	{ FUNC_TYPE_CIPHER, "rc5-cbc", enc_main },
-	{ FUNC_TYPE_CIPHER, "rc5-ecb", enc_main },
-	{ FUNC_TYPE_CIPHER, "rc5-cfb", enc_main },
-	{ FUNC_TYPE_CIPHER, "rc5-ofb", enc_main },
-#endif
-#ifdef ZLIB
-	{ FUNC_TYPE_CIPHER, "zlib", enc_main },
-#endif
-
-	{ 0, NULL, NULL }
-};
diff --git a/usr.bin/openssl/rsa.c b/usr.bin/openssl/rsa.c
index 91a9d161fba..55b6f7399f7 100644
--- a/usr.bin/openssl/rsa.c
+++ b/usr.bin/openssl/rsa.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa.c,v 1.3 2015/01/24 05:48:39 doug Exp $ */
+/* $OpenBSD: rsa.c,v 1.4 2015/08/19 18:25:31 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -64,6 +64,7 @@
 #include <time.h>
 
 #include "apps.h"
+#include "progs.h"
 
 #include <openssl/bio.h>
 #include <openssl/bn.h>
diff --git a/usr.bin/openssl/sess_id.c b/usr.bin/openssl/sess_id.c
index cc47bad93bc..d7f33395097 100644
--- a/usr.bin/openssl/sess_id.c
+++ b/usr.bin/openssl/sess_id.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sess_id.c,v 1.4 2015/02/08 10:22:45 doug Exp $ */
+/* $OpenBSD: sess_id.c,v 1.5 2015/08/19 18:25:31 deraadt Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -61,6 +61,7 @@
 #include <string.h>
 
 #include "apps.h"
+#include "progs.h"
 
 #include <openssl/bio.h>
 #include <openssl/err.h>
diff --git a/usr.bin/openssl/spkac.c b/usr.bin/openssl/spkac.c
index 197469d6a9d..b5ce764eae1 100644
--- a/usr.bin/openssl/spkac.c
+++ b/usr.bin/openssl/spkac.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: spkac.c,v 1.3 2015/01/08 11:08:50 doug Exp $ */
+/* $OpenBSD: spkac.c,v 1.4 2015/08/19 18:25:31 deraadt Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999. Based on an original idea by Massimiliano Pala
  * (madwolf@openca.org).
@@ -63,6 +63,7 @@
 #include <time.h>
 
 #include "apps.h"
+#include "progs.h"
 
 #include <openssl/bio.h>
 #include <openssl/conf.h>