diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/usr.bin/openssl/genpkey.c | 3 | ||||
| -rw-r--r-- | src/usr.bin/openssl/pkcs8.c | 3 | ||||
| -rw-r--r-- | src/usr.bin/openssl/pkey.c | 3 | ||||
| -rw-r--r-- | src/usr.bin/openssl/pkeyparam.c | 3 | ||||
| -rw-r--r-- | src/usr.bin/openssl/pkeyutl.c | 4 | ||||
| -rw-r--r-- | src/usr.bin/openssl/rsautl.c | 3 |
6 files changed, 6 insertions, 13 deletions
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 @@ | |||
| 1 | /* $OpenBSD: genpkey.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */ | 1 | /* $OpenBSD: genpkey.c,v 1.3 2014/08/28 14:25:48 jsing 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 2006 | 3 | * project 2006 |
| 4 | */ | 4 | */ |
| @@ -97,7 +97,6 @@ genpkey_main(int argc, char **argv) | |||
| 97 | 97 | ||
| 98 | outformat = FORMAT_PEM; | 98 | outformat = FORMAT_PEM; |
| 99 | 99 | ||
| 100 | OpenSSL_add_all_algorithms(); | ||
| 101 | args = argv + 1; | 100 | args = argv + 1; |
| 102 | while (!badarg && *args && *args[0] == '-') { | 101 | while (!badarg && *args && *args[0] == '-') { |
| 103 | if (!strcmp(*args, "-outform")) { | 102 | 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 @@ | |||
| 1 | /* $OpenBSD: pkcs8.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */ | 1 | /* $OpenBSD: pkcs8.c,v 1.3 2014/08/28 14:25:48 jsing 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 | */ |
| @@ -95,7 +95,6 @@ pkcs8_main(int argc, char **argv) | |||
| 95 | informat = FORMAT_PEM; | 95 | informat = FORMAT_PEM; |
| 96 | outformat = FORMAT_PEM; | 96 | outformat = FORMAT_PEM; |
| 97 | 97 | ||
| 98 | OpenSSL_add_all_algorithms(); | ||
| 99 | args = argv + 1; | 98 | args = argv + 1; |
| 100 | while (!badarg && *args && *args[0] == '-') { | 99 | while (!badarg && *args && *args[0] == '-') { |
| 101 | if (!strcmp(*args, "-v2")) { | 100 | 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 @@ | |||
| 1 | /* $OpenBSD: pkey.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */ | 1 | /* $OpenBSD: pkey.c,v 1.3 2014/08/28 14:25:48 jsing 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 2006 | 3 | * project 2006 |
| 4 | */ | 4 | */ |
| @@ -88,7 +88,6 @@ pkey_main(int argc, char **argv) | |||
| 88 | informat = FORMAT_PEM; | 88 | informat = FORMAT_PEM; |
| 89 | outformat = FORMAT_PEM; | 89 | outformat = FORMAT_PEM; |
| 90 | 90 | ||
| 91 | OpenSSL_add_all_algorithms(); | ||
| 92 | args = argv + 1; | 91 | args = argv + 1; |
| 93 | while (!badarg && *args && *args[0] == '-') { | 92 | while (!badarg && *args && *args[0] == '-') { |
| 94 | if (!strcmp(*args, "-inform")) { | 93 | 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 @@ | |||
| 1 | /* $OpenBSD: pkeyparam.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */ | 1 | /* $OpenBSD: pkeyparam.c,v 1.3 2014/08/28 14:25:48 jsing 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 2006 | 3 | * project 2006 |
| 4 | */ | 4 | */ |
| @@ -80,7 +80,6 @@ pkeyparam_main(int argc, char **argv) | |||
| 80 | #endif | 80 | #endif |
| 81 | int ret = 1; | 81 | int ret = 1; |
| 82 | 82 | ||
| 83 | OpenSSL_add_all_algorithms(); | ||
| 84 | args = argv + 1; | 83 | args = argv + 1; |
| 85 | while (!badarg && *args && *args[0] == '-') { | 84 | while (!badarg && *args && *args[0] == '-') { |
| 86 | if (!strcmp(*args, "-in")) { | 85 | 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 @@ | |||
| 1 | /* $OpenBSD: pkeyutl.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */ | 1 | /* $OpenBSD: pkeyutl.c,v 1.3 2014/08/28 14:25:48 jsing 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 2006. | 3 | * project 2006. |
| 4 | */ | 4 | */ |
| @@ -106,8 +106,6 @@ pkeyutl_main(int argc, char **argv) | |||
| 106 | argc--; | 106 | argc--; |
| 107 | argv++; | 107 | argv++; |
| 108 | 108 | ||
| 109 | OpenSSL_add_all_algorithms(); | ||
| 110 | |||
| 111 | while (argc >= 1) { | 109 | while (argc >= 1) { |
| 112 | if (!strcmp(*argv, "-in")) { | 110 | if (!strcmp(*argv, "-in")) { |
| 113 | if (--argc < 1) | 111 | 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 @@ | |||
| 1 | /* $OpenBSD: rsautl.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */ | 1 | /* $OpenBSD: rsautl.c,v 1.3 2014/08/28 14:25:48 jsing 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 2000. | 3 | * project 2000. |
| 4 | */ | 4 | */ |
| @@ -107,7 +107,6 @@ rsautl_main(int argc, char **argv) | |||
| 107 | argc--; | 107 | argc--; |
| 108 | argv++; | 108 | argv++; |
| 109 | 109 | ||
| 110 | OpenSSL_add_all_algorithms(); | ||
| 111 | pad = RSA_PKCS1_PADDING; | 110 | pad = RSA_PKCS1_PADDING; |
| 112 | 111 | ||
| 113 | while (argc >= 1) { | 112 | while (argc >= 1) { |
