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/pkcs7.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/pkcs7.c')
-rw-r--r-- | src/usr.bin/openssl/pkcs7.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/usr.bin/openssl/pkcs7.c b/src/usr.bin/openssl/pkcs7.c index 2c2af168a9..70b58d8b84 100644 --- a/src/usr.bin/openssl/pkcs7.c +++ b/src/usr.bin/openssl/pkcs7.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: pkcs7.c,v 1.1 2014/08/26 17:47:25 jsing Exp $ */ | 1 | /* $OpenBSD: pkcs7.c,v 1.2 2014/08/28 14:23:52 jsing Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -159,7 +159,6 @@ bad: | |||
159 | ret = 1; | 159 | ret = 1; |
160 | goto end; | 160 | goto end; |
161 | } | 161 | } |
162 | ERR_load_crypto_strings(); | ||
163 | 162 | ||
164 | #ifndef OPENSSL_NO_ENGINE | 163 | #ifndef OPENSSL_NO_ENGINE |
165 | setup_engine(bio_err, engine, 0); | 164 | setup_engine(bio_err, engine, 0); |