1 files changed, 53 insertions, 30 deletions

diff --git a/src/lib/libcrypto/man/des_read_pw.3 b/src/lib/libcrypto/man/des_read_pw.3
index 1f2fae984e..50c1390b35 100644
--- a/src/lib/libcrypto/man/des_read_pw.3
+++ b/src/lib/libcrypto/man/des_read_pw.3
@@ -1,29 +1,64 @@
-.\"     $OpenBSD: des_read_pw.3,v 1.4 2016/12/08 21:48:50 jmc Exp $
+.\"     $OpenBSD: des_read_pw.3,v 1.5 2016/12/10 22:01:26 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
 .\"
-.Dd $Mdocdate: December 8 2016 $
+.\" This file was written by Ulf Moeller <ulf@openssl.org> and
+.\" Richard Levitte <levitte@openssl.org>.
+.\" Copyright (c) 2000, 2001 The OpenSSL Project.  All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\"
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\"
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in
+.\"    the documentation and/or other materials provided with the
+.\"    distribution.
+.\"
+.\" 3. All advertising materials mentioning features or use of this
+.\"    software must display the following acknowledgment:
+.\"    "This product includes software developed by the OpenSSL Project
+.\"    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+.\"
+.\" 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+.\"    endorse or promote products derived from this software without
+.\"    prior written permission. For written permission, please contact
+.\"    openssl-core@openssl.org.
+.\"
+.\" 5. Products derived from this software may not be called "OpenSSL"
+.\"    nor may "OpenSSL" appear in their names without prior written
+.\"    permission of the OpenSSL Project.
+.\"
+.\" 6. Redistributions of any form whatsoever must retain the following
+.\"    acknowledgment:
+.\"    "This product includes software developed by the OpenSSL Project
+.\"    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+.\" EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+.\" ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+.\" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+.\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+.\" OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd $Mdocdate: December 10 2016 $
 .Dt DES_READ_PW 3
 .Os
 .Sh NAME
-.Nm des_read_password ,
-.Nm des_read_2passwords ,
 .Nm des_read_pw_string ,
 .Nm des_read_pw
 .Nd compatibility user interface functions
 .Sh SYNOPSIS
-.In openssl/des_old.h
-.Ft int
-.Fo des_read_password
-.Fa "DES_cblock *key"
-.Fa "const char *prompt"
-.Fa "int verify"
-.Fc
-.Ft int
-.Fo des_read_2passwords
-.Fa "DES_cblock *key1"
-.Fa "DES_cblock *key2"
-.Fa "const char *prompt"
-.Fa "int verify"
-.Fc
+.In openssl/ui_compat.h
 .Ft int
 .Fo des_read_pw_string
 .Fa "char *buf"
@@ -78,18 +113,6 @@ is set.
 It is available in the MIT Kerberos library as well,
 and is also available under the name
 .Xr EVP_read_pw_string 3 .
-.Pp
-.Fn des_read_password
-calls
-.Fn des_read_pw
-and converts the password to a DES key by calling
-.Xr DES_string_to_key 3 ;
-.Fn des_read_2passwords
-operates in the same way as
-.Fn des_read_password
-except that it generates two keys by using the
-.Xr DES_string_to_2key 3
-function.
 .Sh SEE ALSO
 .Xr UI_new 3
 .Sh AUTHORS