aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/openssl/ssl/ssl_err.c
diff options
context:
space:
mode:
authorSimon L. B. Nielsen <simon@FreeBSD.org>2007-03-15 20:03:30 +0000
committerSimon L. B. Nielsen <simon@FreeBSD.org>2007-03-15 20:03:30 +0000
commit5471f83ea72e251ea1f0d04428878a74347efa0f (patch)
treee7ef8661c43c3081071230f45d641b5d8a756e55 /crypto/openssl/ssl/ssl_err.c
parent4d227dd736e57cf75f2278d8117f44dcb3defa61 (diff)
downloadsrc-5471f83ea72e251ea1f0d04428878a74347efa0f.tar.gz
src-5471f83ea72e251ea1f0d04428878a74347efa0f.zip
Vendor import of OpenSSL 0.9.8e.
Notes
Notes: svn path=/vendor-crypto/openssl/dist/; revision=167612
Diffstat (limited to 'crypto/openssl/ssl/ssl_err.c')
-rw-r--r--crypto/openssl/ssl/ssl_err.c11
1 files changed, 4 insertions, 7 deletions
diff --git a/crypto/openssl/ssl/ssl_err.c b/crypto/openssl/ssl/ssl_err.c
index 4a4ba685267e..e7f4d93c7dc4 100644
--- a/crypto/openssl/ssl/ssl_err.c
+++ b/crypto/openssl/ssl/ssl_err.c
@@ -204,7 +204,7 @@ static ERR_STRING_DATA SSL_str_functs[]=
{ERR_FUNC(SSL_F_SSL_GET_SERVER_SEND_CERT), "SSL_GET_SERVER_SEND_CERT"},
{ERR_FUNC(SSL_F_SSL_GET_SIGN_PKEY), "SSL_GET_SIGN_PKEY"},
{ERR_FUNC(SSL_F_SSL_INIT_WBIO_BUFFER), "SSL_INIT_WBIO_BUFFER"},
-{ERR_FUNC(SSL_F_SSL_LOAD_CLIENT_CA_FILE), "SSL_LOAD_CLIENT_CA_FILE"},
+{ERR_FUNC(SSL_F_SSL_LOAD_CLIENT_CA_FILE), "SSL_load_client_CA_file"},
{ERR_FUNC(SSL_F_SSL_NEW), "SSL_new"},
{ERR_FUNC(SSL_F_SSL_PEEK), "SSL_peek"},
{ERR_FUNC(SSL_F_SSL_READ), "SSL_read"},
@@ -486,15 +486,12 @@ static ERR_STRING_DATA SSL_str_reasons[]=
void ERR_load_SSL_strings(void)
{
- static int init=1;
+#ifndef OPENSSL_NO_ERR
- if (init)
+ if (ERR_func_error_string(SSL_str_functs[0].error) == NULL)
{
- init=0;
-#ifndef OPENSSL_NO_ERR
ERR_load_strings(0,SSL_str_functs);
ERR_load_strings(0,SSL_str_reasons);
-#endif
-
}
+#endif
}