From faae55c9b393e2dcc156eb7b14185e156ea09be8 Mon Sep 17 00:00:00 2001
From: schwarze <>
Date: Fri, 19 Jun 2020 17:17:13 +0000
Subject: mark the functions documented in des_read_pw(3) as deprecated and
 point to UI_UTIL_read_pw(3) instead; tb@ agrees with the general direction

---
 src/lib/libcrypto/man/UI_new.3      |  5 ++---
 src/lib/libcrypto/man/des_read_pw.3 | 12 +++++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/lib/libcrypto/man/UI_new.3 b/src/lib/libcrypto/man/UI_new.3
index c5b204bdec..ab7dfb36ec 100644
--- a/src/lib/libcrypto/man/UI_new.3
+++ b/src/lib/libcrypto/man/UI_new.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: UI_new.3,v 1.9 2019/06/10 09:49:48 schwarze Exp $
+.\" $OpenBSD: UI_new.3,v 1.10 2020/06/19 17:17:13 schwarze Exp $
 .\" full merge up to: OpenSSL 78b19e90 Jan 11 00:12:01 2017 +0100
 .\" selective merge up to: OpenSSL 61f805c1 Jan 16 01:01:46 2018 +0800
 .\"
@@ -49,7 +49,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 10 2019 $
+.Dd $Mdocdate: June 19 2020 $
 .Dt UI_NEW 3
 .Os
 .Sh NAME
@@ -502,7 +502,6 @@ is called with an explicit
 argument.
 .Sh SEE ALSO
 .Xr crypto 3 ,
-.Xr des_read_pw 3 ,
 .Xr UI_create_method 3 ,
 .Xr UI_get_string_type 3 ,
 .Xr UI_UTIL_read_pw 3
diff --git a/src/lib/libcrypto/man/des_read_pw.3 b/src/lib/libcrypto/man/des_read_pw.3
index 55d36ef721..30ae099dc6 100644
--- a/src/lib/libcrypto/man/des_read_pw.3
+++ b/src/lib/libcrypto/man/des_read_pw.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: des_read_pw.3,v 1.9 2020/06/15 15:25:46 tb Exp $
+.\"	$OpenBSD: des_read_pw.3,v 1.10 2020/06/19 17:17:13 schwarze Exp $
 .\"	OpenSSL doc/crypto/ui_compat.pod May 14 11:28:00 2006 +0000
 .\"	OpenSSL doc/crypto/des.pod 2a9aca32 Oct 25 08:44:10 2001 +0000
 .\"
@@ -50,7 +50,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: June 15 2020 $
+.Dd $Mdocdate: June 19 2020 $
 .Dt DES_READ_PW 3
 .Os
 .Sh NAME
@@ -93,6 +93,11 @@
 .Fa "int verify"
 .Fc
 .Sh DESCRIPTION
+These functions are deprecated.
+Use
+.Xr UI_UTIL_read_pw 3
+instead.
+.Pp
 The DES library contained a few routines to prompt for passwords.
 These aren't necessarily dependent on DES, and have therefore become
 part of the UI compatibility library.
@@ -162,7 +167,8 @@ is less than or equal to
 or if the user entered a password shorter than
 .Fa min_length .
 .Sh SEE ALSO
-.Xr UI_new 3
+.Xr UI_new 3 ,
+.Xr UI_UTIL_read_pw 3
 .Sh HISTORY
 .Fn des_read_pw_string
 appeared in SSLeay 0.4 or earlier.
-- 
cgit v1.2.3-55-g6feb