diff options
author | jsing <> | 2014-08-28 14:23:52 +0000 |
---|---|---|
committer | jsing <> | 2014-08-28 14:23:52 +0000 |
commit | 3a2884e89a931573761460cdda84faf509e7ecd3 (patch) | |
tree | 5ac74b73de2223699514f57dae53d0bee08b0eb0 /src/usr.bin/openssl/pkcs12.c | |
parent | 31c9e04aeb255ae1ae51c6f06be5e4714c9e9054 (diff) | |
download | openbsd-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/pkcs12.c')
-rw-r--r-- | src/usr.bin/openssl/pkcs12.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/usr.bin/openssl/pkcs12.c b/src/usr.bin/openssl/pkcs12.c index 77b7c31d01..41924a9698 100644 --- a/src/usr.bin/openssl/pkcs12.c +++ b/src/usr.bin/openssl/pkcs12.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pkcs12.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */ | 1 | /* $OpenBSD: pkcs12.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. | 3 | * project. |
4 | */ | 4 | */ |
@@ -386,9 +386,6 @@ pkcs12_main(int argc, char **argv) | |||
386 | mpass = macpass; | 386 | mpass = macpass; |
387 | } | 387 | } |
388 | 388 | ||
389 | ERR_load_crypto_strings(); | ||
390 | |||
391 | |||
392 | if (!infile) | 389 | if (!infile) |
393 | in = BIO_new_fp(stdin, BIO_NOCLOSE); | 390 | in = BIO_new_fp(stdin, BIO_NOCLOSE); |
394 | else | 391 | else |