From 8e6e28726f906fbe995c6de7cd80d82e57955744 Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Thu, 28 Aug 2014 14:25:48 +0000
Subject: OpenSSL_add_all_algorithms() is called from openssl_startup() - it
does not need to also be called from some of the applications.
---
src/usr.bin/openssl/genpkey.c | 3 +--
src/usr.bin/openssl/pkcs8.c | 3 +--
src/usr.bin/openssl/pkey.c | 3 +--
src/usr.bin/openssl/pkeyparam.c | 3 +--
src/usr.bin/openssl/pkeyutl.c | 4 +---
src/usr.bin/openssl/rsautl.c | 3 +--
6 files changed, 6 insertions(+), 13 deletions(-)
(limited to 'src')
diff --git a/src/usr.bin/openssl/genpkey.c b/src/usr.bin/openssl/genpkey.c
index 09b130e83a..882d0ba13d 100644
--- a/src/usr.bin/openssl/genpkey.c
+++ b/src/usr.bin/openssl/genpkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: genpkey.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
+/* $OpenBSD: genpkey.c,v 1.3 2014/08/28 14:25:48 jsing Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 2006
*/
@@ -97,7 +97,6 @@ genpkey_main(int argc, char **argv)
outformat = FORMAT_PEM;
- OpenSSL_add_all_algorithms();
args = argv + 1;
while (!badarg && *args && *args[0] == '-') {
if (!strcmp(*args, "-outform")) {
diff --git a/src/usr.bin/openssl/pkcs8.c b/src/usr.bin/openssl/pkcs8.c
index c2aefdc152..25ffb363ee 100644
--- a/src/usr.bin/openssl/pkcs8.c
+++ b/src/usr.bin/openssl/pkcs8.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkcs8.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
+/* $OpenBSD: pkcs8.c,v 1.3 2014/08/28 14:25:48 jsing Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 1999-2004.
*/
@@ -95,7 +95,6 @@ pkcs8_main(int argc, char **argv)
informat = FORMAT_PEM;
outformat = FORMAT_PEM;
- OpenSSL_add_all_algorithms();
args = argv + 1;
while (!badarg && *args && *args[0] == '-') {
if (!strcmp(*args, "-v2")) {
diff --git a/src/usr.bin/openssl/pkey.c b/src/usr.bin/openssl/pkey.c
index 4fbc722329..3c4013e7c1 100644
--- a/src/usr.bin/openssl/pkey.c
+++ b/src/usr.bin/openssl/pkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkey.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
+/* $OpenBSD: pkey.c,v 1.3 2014/08/28 14:25:48 jsing Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 2006
*/
@@ -88,7 +88,6 @@ pkey_main(int argc, char **argv)
informat = FORMAT_PEM;
outformat = FORMAT_PEM;
- OpenSSL_add_all_algorithms();
args = argv + 1;
while (!badarg && *args && *args[0] == '-') {
if (!strcmp(*args, "-inform")) {
diff --git a/src/usr.bin/openssl/pkeyparam.c b/src/usr.bin/openssl/pkeyparam.c
index 1e60430b26..d9e4085e25 100644
--- a/src/usr.bin/openssl/pkeyparam.c
+++ b/src/usr.bin/openssl/pkeyparam.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkeyparam.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
+/* $OpenBSD: pkeyparam.c,v 1.3 2014/08/28 14:25:48 jsing Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 2006
*/
@@ -80,7 +80,6 @@ pkeyparam_main(int argc, char **argv)
#endif
int ret = 1;
- OpenSSL_add_all_algorithms();
args = argv + 1;
while (!badarg && *args && *args[0] == '-') {
if (!strcmp(*args, "-in")) {
diff --git a/src/usr.bin/openssl/pkeyutl.c b/src/usr.bin/openssl/pkeyutl.c
index f233d76dda..f1658dd6aa 100644
--- a/src/usr.bin/openssl/pkeyutl.c
+++ b/src/usr.bin/openssl/pkeyutl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pkeyutl.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
+/* $OpenBSD: pkeyutl.c,v 1.3 2014/08/28 14:25:48 jsing Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 2006.
*/
@@ -106,8 +106,6 @@ pkeyutl_main(int argc, char **argv)
argc--;
argv++;
- OpenSSL_add_all_algorithms();
-
while (argc >= 1) {
if (!strcmp(*argv, "-in")) {
if (--argc < 1)
diff --git a/src/usr.bin/openssl/rsautl.c b/src/usr.bin/openssl/rsautl.c
index 322403064d..95776d250b 100644
--- a/src/usr.bin/openssl/rsautl.c
+++ b/src/usr.bin/openssl/rsautl.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsautl.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */
+/* $OpenBSD: rsautl.c,v 1.3 2014/08/28 14:25:48 jsing Exp $ */
/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
* project 2000.
*/
@@ -107,7 +107,6 @@ rsautl_main(int argc, char **argv)
argc--;
argv++;
- OpenSSL_add_all_algorithms();
pad = RSA_PKCS1_PADDING;
while (argc >= 1) {
--
cgit v1.2.3-55-g6feb