Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/usr.bin/pwhash Add NetBSD RCS Id. Sort options.
details: https://anonhg.NetBSD.org/src/rev/39ef9952fbb4
branches: trunk
changeset: 537517:39ef9952fbb4
user: wiz <wiz%NetBSD.org@localhost>
date: Wed Oct 02 07:35:29 2002 +0000
description:
Add NetBSD RCS Id. Sort options.
diffstat:
usr.bin/pwhash/pwhash.1 | 15 ++++++++-------
usr.bin/pwhash/pwhash.c | 3 ++-
2 files changed, 10 insertions(+), 8 deletions(-)
diffs (68 lines):
diff -r 62b62343630f -r 39ef9952fbb4 usr.bin/pwhash/pwhash.1
--- a/usr.bin/pwhash/pwhash.1 Wed Oct 02 06:56:24 2002 +0000
+++ b/usr.bin/pwhash/pwhash.1 Wed Oct 02 07:35:29 2002 +0000
@@ -1,3 +1,4 @@
+.\" $NetBSD: pwhash.1,v 1.2 2002/10/02 07:35:29 wiz Exp $
.\" $OpenBSD: encrypt.1,v 1.16 2000/11/09 17:52:07 aaron Exp $
.\"
.\" Copyright (c) 1996, Jason Downs. All rights reserved.
@@ -23,7 +24,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd May 18, 1999
+.Dd October 2, 2002
.Dt PWHASH 1
.Os
.Sh NAME
@@ -31,11 +32,11 @@
.Nd hashes passwords from the command line or standard input
.Sh SYNOPSIS
.Nm pwhash
+.Op Fl b Ar rounds
.Op Fl k
-.Op Fl b Ar rounds
.Op Fl m
+.Op Fl p | Ar string
.Op Fl s Ar salt
-.Op Fl p | Ar string
.Sh DESCRIPTION
.Nm
prints the encrypted form of
@@ -45,15 +46,15 @@
.Pp
The options are as follows:
.Bl -tag -width Ds
+.It Fl b Ar rounds
+Encrypt the string using Blowfish hashing with the specified
+.Ar rounds .
.It Fl k
Run in
-.Nm makekey
+.Xr makekey 8
compatible mode; 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.
-.It Fl b Ar rounds
-Encrypt the string using Blowfish hashing with the specified
-.Ar rounds .
.It Fl m
Encrypt the string using MD5.
.It Fl p
diff -r 62b62343630f -r 39ef9952fbb4 usr.bin/pwhash/pwhash.c
--- a/usr.bin/pwhash/pwhash.c Wed Oct 02 06:56:24 2002 +0000
+++ b/usr.bin/pwhash/pwhash.c Wed Oct 02 07:35:29 2002 +0000
@@ -1,3 +1,4 @@
+/* $NetBSD: pwhash.c,v 1.2 2002/10/02 07:35:30 wiz Exp $ */
/* $OpenBSD: encrypt.c,v 1.16 2002/02/16 21:27:45 millert Exp $ */
/*
@@ -58,7 +59,7 @@
{
(void)fprintf(stderr,
- "usage: %s [-k] [-b rounds] [-m] [-s salt] [-p | string]\n",
+ "usage: %s [-b rounds] [-k] [-m] [-s salt] [-p | string]\n",
__progname);
exit(1);
}
Home |
Main Index |
Thread Index |
Old Index