mirror of
https://abf.rosa.ru/djam/libressl.git
synced 2025-02-23 16:12:53 +00:00
58 lines
2.1 KiB
Diff
58 lines
2.1 KiB
Diff
From c3d4e71233267840d28afd8f8e5dfe96934517c1 Mon Sep 17 00:00:00 2001
|
|
From: schwarze <>
|
|
Date: Thu, 4 Jun 2020 20:06:04 +0000
|
|
Subject: [PATCH 07/87] minor polishing: * below SEE ALSO, point to the most
|
|
similar function that is not deprecated * add a comment saying why
|
|
ERR_load_ERR_strings() is intentionally undocumented * update the comment
|
|
specifying the merge status
|
|
|
|
---
|
|
src/lib/libcrypto/man/ERR_load_crypto_strings.3 | 14 ++++++++++----
|
|
1 file changed, 10 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/lib/libcrypto/man/ERR_load_crypto_strings.3 b/src/lib/libcrypto/man/ERR_load_crypto_strings.3
|
|
index e3d60527d..4ad12659a 100644
|
|
--- a/src/lib/libcrypto/man/ERR_load_crypto_strings.3
|
|
+++ b/src/lib/libcrypto/man/ERR_load_crypto_strings.3
|
|
@@ -1,5 +1,6 @@
|
|
-.\" $OpenBSD: ERR_load_crypto_strings.3,v 1.8 2019/06/14 13:41:31 schwarze Exp $
|
|
-.\" OpenSSL a528d4f0 Oct 27 13:40:11 2015 -0400
|
|
+.\" $OpenBSD: ERR_load_crypto_strings.3,v 1.9 2020/06/04 20:06:04 schwarze Exp $
|
|
+.\" full merge up to: OpenSSL f672aee4 Feb 9 11:52:40 2016 -0500
|
|
+.\" selective merge up to: OpenSSL b3696a55 Sep 2 09:35:50 2017 -0400
|
|
.\"
|
|
.\" This file is a derived work.
|
|
.\" The changes are covered by the following Copyright and license:
|
|
@@ -65,7 +66,7 @@
|
|
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
|
.\" OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
.\"
|
|
-.Dd $Mdocdate: June 14 2019 $
|
|
+.Dd $Mdocdate: June 4 2020 $
|
|
.Dt ERR_LOAD_CRYPTO_STRINGS 3
|
|
.Os
|
|
.Sh NAME
|
|
@@ -73,6 +74,10 @@
|
|
.Nm ERR_free_strings ,
|
|
.Nm SSL_load_error_strings
|
|
.Nd load and free OpenSSL error strings
|
|
+.\" The function ERR_load_ERR_strings() is intentionally undocumented
|
|
+.\" because it is merely a subroutine of ERR_load_crypto_strings(3)
|
|
+.\" and should not have been made a part of the API.
|
|
+.\" The same applies to the other ERR_load_*_strings() functions.
|
|
.Sh SYNOPSIS
|
|
.In openssl/err.h
|
|
.Ft void
|
|
@@ -102,7 +107,8 @@ If the error strings were already loaded before, no action occurs.
|
|
frees all previously loaded error strings.
|
|
.Sh SEE ALSO
|
|
.Xr ERR 3 ,
|
|
-.Xr ERR_error_string 3
|
|
+.Xr ERR_error_string 3 ,
|
|
+.Xr OPENSSL_config 3
|
|
.Sh HISTORY
|
|
.Fn ERR_load_crypto_strings
|
|
and
|
|
--
|
|
2.17.1
|
|
|