From ee426d13f921036b32c78826daf81cc9b127b538 Mon Sep 17 00:00:00 2001
From: jsing <jsing@openbsd.org>
Date: Thu, 26 Jan 2017 09:16:01 +0000
Subject: Merge the single two line function from ssl_err2.c into ssl_err.c.

ok beck@
---
 lib/libssl/ssl_err.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'lib/libssl/ssl_err.c')

diff --git a/lib/libssl/ssl_err.c b/lib/libssl/ssl_err.c
index efe3e9473f1..967811f1fe5 100644
--- a/lib/libssl/ssl_err.c
+++ b/lib/libssl/ssl_err.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_err.c,v 1.30 2017/01/26 07:20:57 beck Exp $ */
+/* $OpenBSD: ssl_err.c,v 1.31 2017/01/26 09:16:01 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 1999-2011 The OpenSSL Project.  All rights reserved.
  *
@@ -607,10 +607,18 @@ void
 ERR_load_SSL_strings(void)
 {
 #ifndef OPENSSL_NO_ERR
-
 	if (ERR_func_error_string(SSL_str_functs[0].error) == NULL) {
 		ERR_load_strings(0, SSL_str_functs);
 		ERR_load_strings(0, SSL_str_reasons);
 	}
 #endif
 }
+
+void
+SSL_load_error_strings(void)
+{
+#ifndef OPENSSL_NO_ERR
+	ERR_load_crypto_strings();
+	ERR_load_SSL_strings();
+#endif
+}
-- 
cgit v1.2.3-59-g8ed1b