===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/encrypt/encrypt.1,v
retrieving revision 1.24
retrieving revision 1.25
diff -c -r1.24 -r1.25
*** src/usr.bin/encrypt/encrypt.1	2014/09/03 07:47:50	1.24
--- src/usr.bin/encrypt/encrypt.1	2014/12/24 22:04:26	1.25
***************
*** 1,4 ****
! .\"	$OpenBSD: encrypt.1,v 1.24 2014/09/03 07:47:50 giovanni Exp $
  .\"
  .\" Copyright (c) 1996, Jason Downs.  All rights reserved.
  .\"
--- 1,4 ----
! .\"	$OpenBSD: encrypt.1,v 1.25 2014/12/24 22:04:26 tedu Exp $
  .\"
  .\" Copyright (c) 1996, Jason Downs.  All rights reserved.
  .\"
***************
*** 23,29 ****
  .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  .\" SUCH DAMAGE.
  .\"
! .Dd $Mdocdate: September 3 2014 $
  .Dt ENCRYPT 1
  .Os
  .Sh NAME
--- 23,29 ----
  .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  .\" SUCH DAMAGE.
  .\"
! .Dd $Mdocdate: December 24 2014 $
  .Dt ENCRYPT 1
  .Os
  .Sh NAME
***************
*** 31,42 ****
  .Nd encrypt passwords from the command line or standard input
  .Sh SYNOPSIS
  .Nm encrypt
- .Op Fl k
  .Op Fl b Ar rounds
  .Op Fl c Ar class
  .Op Fl p | Ar string
- .Op Fl s Ar salt
- .Nm makekey
  .Sh DESCRIPTION
  .Nm
  prints the encrypted form of
--- 31,39 ----
***************
*** 44,55 ****
  to the standard output.
  This is mostly useful for encrypting passwords from within scripts.
  .Pp
- When invoked as
- .Nm makekey ,
- a single combined key and salt are read from standard
- input and the DES encrypted result is written to standard output without a
- terminating newline.
- .Pp
  The options are as follows:
  .Bl -tag -width Ds
  .It Fl b Ar rounds
--- 41,46 ----
***************
*** 62,84 ****
  See
  .Xr login.conf 5
  for more information.
- .It Fl k
- Run in
- .Nm makekey
- compatible mode.
  .It Fl p
  Prompt for a single string with echo turned off.
- .It Fl s Ar salt
- Encrypt the string using DES, with the specified
- .Ar salt .
  .El
  .Pp
  If no
  .Ar string
  is specified,
  .Nm
! reads one string per line from standard input, encrypting each one
! with the chosen algorithm from above.
  In the case where no specific algorithm or specific user login class was given
  as a command line option, the algorithm specified in the default class in
  .Pa /etc/login.conf
--- 53,67 ----
  See
  .Xr login.conf 5
  for more information.
  .It Fl p
  Prompt for a single string with echo turned off.
  .El
  .Pp
  If no
  .Ar string
  is specified,
  .Nm
! reads one string per line from standard input, encrypting each one.
  In the case where no specific algorithm or specific user login class was given
  as a command line option, the algorithm specified in the default class in
  .Pa /etc/login.conf
***************
*** 96,109 ****
  .It Pa /etc/login.conf
  .El
  .Sh SEE ALSO
! .Xr crypt 3 ,
  .Xr login.conf 5
  .Sh HISTORY
  .Nm
  first appeared in
  .Ox 1.2 .
- .Pp
- A
- .Nm makekey
- command appeared in
- .At v7 .
--- 79,87 ----
  .It Pa /etc/login.conf
  .El
  .Sh SEE ALSO
! .Xr crypt_newhash 3 ,
  .Xr login.conf 5
  .Sh HISTORY
  .Nm
  first appeared in
  .Ox 1.2 .