summaryrefslogtreecommitdiff
path: root/src/usr.bin/openssl/pkcs8.c
diff options
context:
space:
mode:
authorjsing <>2014-08-28 14:23:52 +0000
committerjsing <>2014-08-28 14:23:52 +0000
commit3a2884e89a931573761460cdda84faf509e7ecd3 (patch)
tree5ac74b73de2223699514f57dae53d0bee08b0eb0 /src/usr.bin/openssl/pkcs8.c
parent31c9e04aeb255ae1ae51c6f06be5e4714c9e9054 (diff)
downloadopenbsd-3a2884e89a931573761460cdda84faf509e7ecd3.tar.gz
openbsd-3a2884e89a931573761460cdda84faf509e7ecd3.tar.bz2
openbsd-3a2884e89a931573761460cdda84faf509e7ecd3.zip
openssl_setup() calls SSL_load_error_strings(), which happens to call
ERR_load_crypto_strings() - as such, we do not need to call the same function from most of the applications.
Diffstat (limited to 'src/usr.bin/openssl/pkcs8.c')
-rw-r--r--src/usr.bin/openssl/pkcs8.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/usr.bin/openssl/pkcs8.c b/src/usr.bin/openssl/pkcs8.c
index 1715fe1d6b..c2aefdc152 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.1 2014/08/26 17:47:25 jsing Exp $ */ 1/* $OpenBSD: pkcs8.c,v 1.2 2014/08/28 14:23:52 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 ERR_load_crypto_strings();
99 OpenSSL_add_all_algorithms(); 98 OpenSSL_add_all_algorithms();
100 args = argv + 1; 99 args = argv + 1;
101 while (!badarg && *args && *args[0] == '-') { 100 while (!badarg && *args && *args[0] == '-') {