summaryrefslogtreecommitdiff
path: root/src/lib/libssl/ssl_err.c
diff options
context:
space:
mode:
authorjsing <>2017-01-26 09:16:01 +0000
committerjsing <>2017-01-26 09:16:01 +0000
commita2e1efdba084d65702b419bc510c30a144eb5d7f (patch)
tree00943a6e9696cfc99849db4f702c78deee67e2ca /src/lib/libssl/ssl_err.c
parentfc4d35f62860a7daabfcbb2bd8d1f61ed368a0fc (diff)
downloadopenbsd-a2e1efdba084d65702b419bc510c30a144eb5d7f.tar.gz
openbsd-a2e1efdba084d65702b419bc510c30a144eb5d7f.tar.bz2
openbsd-a2e1efdba084d65702b419bc510c30a144eb5d7f.zip
Merge the single two line function from ssl_err2.c into ssl_err.c.
ok beck@
Diffstat (limited to 'src/lib/libssl/ssl_err.c')
-rw-r--r--src/lib/libssl/ssl_err.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/lib/libssl/ssl_err.c b/src/lib/libssl/ssl_err.c
index efe3e9473f..967811f1fe 100644
--- a/src/lib/libssl/ssl_err.c
+++ b/src/lib/libssl/ssl_err.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssl_err.c,v 1.30 2017/01/26 07:20:57 beck Exp $ */ 1/* $OpenBSD: ssl_err.c,v 1.31 2017/01/26 09:16:01 jsing Exp $ */
2/* ==================================================================== 2/* ====================================================================
3 * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 1999-2011 The OpenSSL Project. All rights reserved.
4 * 4 *
@@ -607,10 +607,18 @@ void
607ERR_load_SSL_strings(void) 607ERR_load_SSL_strings(void)
608{ 608{
609#ifndef OPENSSL_NO_ERR 609#ifndef OPENSSL_NO_ERR
610
611 if (ERR_func_error_string(SSL_str_functs[0].error) == NULL) { 610 if (ERR_func_error_string(SSL_str_functs[0].error) == NULL) {
612 ERR_load_strings(0, SSL_str_functs); 611 ERR_load_strings(0, SSL_str_functs);
613 ERR_load_strings(0, SSL_str_reasons); 612 ERR_load_strings(0, SSL_str_reasons);
614 } 613 }
615#endif 614#endif
616} 615}
616
617void
618SSL_load_error_strings(void)
619{
620#ifndef OPENSSL_NO_ERR
621 ERR_load_crypto_strings();
622 ERR_load_SSL_strings();
623#endif
624}