summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschwarze <>2020-06-19 17:17:13 +0000
committerschwarze <>2020-06-19 17:17:13 +0000
commitfaae55c9b393e2dcc156eb7b14185e156ea09be8 (patch)
treebf897b143daffb1c523dda715461d7a99f172462
parent9b779c0e9513364c0e4a0f40beb17632fb84d568 (diff)
downloadopenbsd-faae55c9b393e2dcc156eb7b14185e156ea09be8.tar.gz
openbsd-faae55c9b393e2dcc156eb7b14185e156ea09be8.tar.bz2
openbsd-faae55c9b393e2dcc156eb7b14185e156ea09be8.zip
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
-rw-r--r--src/lib/libcrypto/man/UI_new.35
-rw-r--r--src/lib/libcrypto/man/des_read_pw.312
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 @@
1.\" $OpenBSD: UI_new.3,v 1.9 2019/06/10 09:49:48 schwarze Exp $ 1.\" $OpenBSD: UI_new.3,v 1.10 2020/06/19 17:17:13 schwarze Exp $
2.\" full merge up to: OpenSSL 78b19e90 Jan 11 00:12:01 2017 +0100 2.\" full merge up to: OpenSSL 78b19e90 Jan 11 00:12:01 2017 +0100
3.\" selective merge up to: OpenSSL 61f805c1 Jan 16 01:01:46 2018 +0800 3.\" selective merge up to: OpenSSL 61f805c1 Jan 16 01:01:46 2018 +0800
4.\" 4.\"
@@ -49,7 +49,7 @@
49.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 49.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
50.\" OF THE POSSIBILITY OF SUCH DAMAGE. 50.\" OF THE POSSIBILITY OF SUCH DAMAGE.
51.\" 51.\"
52.Dd $Mdocdate: June 10 2019 $ 52.Dd $Mdocdate: June 19 2020 $
53.Dt UI_NEW 3 53.Dt UI_NEW 3
54.Os 54.Os
55.Sh NAME 55.Sh NAME
@@ -502,7 +502,6 @@ is called with an explicit
502argument. 502argument.
503.Sh SEE ALSO 503.Sh SEE ALSO
504.Xr crypto 3 , 504.Xr crypto 3 ,
505.Xr des_read_pw 3 ,
506.Xr UI_create_method 3 , 505.Xr UI_create_method 3 ,
507.Xr UI_get_string_type 3 , 506.Xr UI_get_string_type 3 ,
508.Xr UI_UTIL_read_pw 3 507.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 @@
1.\" $OpenBSD: des_read_pw.3,v 1.9 2020/06/15 15:25:46 tb Exp $ 1.\" $OpenBSD: des_read_pw.3,v 1.10 2020/06/19 17:17:13 schwarze Exp $
2.\" OpenSSL doc/crypto/ui_compat.pod May 14 11:28:00 2006 +0000 2.\" OpenSSL doc/crypto/ui_compat.pod May 14 11:28:00 2006 +0000
3.\" OpenSSL doc/crypto/des.pod 2a9aca32 Oct 25 08:44:10 2001 +0000 3.\" OpenSSL doc/crypto/des.pod 2a9aca32 Oct 25 08:44:10 2001 +0000
4.\" 4.\"
@@ -50,7 +50,7 @@
50.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED 50.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
51.\" OF THE POSSIBILITY OF SUCH DAMAGE. 51.\" OF THE POSSIBILITY OF SUCH DAMAGE.
52.\" 52.\"
53.Dd $Mdocdate: June 15 2020 $ 53.Dd $Mdocdate: June 19 2020 $
54.Dt DES_READ_PW 3 54.Dt DES_READ_PW 3
55.Os 55.Os
56.Sh NAME 56.Sh NAME
@@ -93,6 +93,11 @@
93.Fa "int verify" 93.Fa "int verify"
94.Fc 94.Fc
95.Sh DESCRIPTION 95.Sh DESCRIPTION
96These functions are deprecated.
97Use
98.Xr UI_UTIL_read_pw 3
99instead.
100.Pp
96The DES library contained a few routines to prompt for passwords. 101The DES library contained a few routines to prompt for passwords.
97These aren't necessarily dependent on DES, and have therefore become 102These aren't necessarily dependent on DES, and have therefore become
98part of the UI compatibility library. 103part of the UI compatibility library.
@@ -162,7 +167,8 @@ is less than or equal to
162or if the user entered a password shorter than 167or if the user entered a password shorter than
163.Fa min_length . 168.Fa min_length .
164.Sh SEE ALSO 169.Sh SEE ALSO
165.Xr UI_new 3 170.Xr UI_new 3 ,
171.Xr UI_UTIL_read_pw 3
166.Sh HISTORY 172.Sh HISTORY
167.Fn des_read_pw_string 173.Fn des_read_pw_string
168appeared in SSLeay 0.4 or earlier. 174appeared in SSLeay 0.4 or earlier.