summaryrefslogtreecommitdiff
path: root/usr.bin/encrypt
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin/encrypt')
-rw-r--r--usr.bin/encrypt/encrypt.17
-rw-r--r--usr.bin/encrypt/encrypt.c4
2 files changed, 5 insertions, 6 deletions
diff --git a/usr.bin/encrypt/encrypt.1 b/usr.bin/encrypt/encrypt.1
index 3a1ade0f583..c8d46cb213b 100644
--- a/usr.bin/encrypt/encrypt.1
+++ b/usr.bin/encrypt/encrypt.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: encrypt.1,v 1.18 2003/06/14 23:19:18 millert Exp $
+.\" $OpenBSD: encrypt.1,v 1.19 2007/03/06 11:16:55 jmc Exp $
.\"
.\" Copyright (c) 1996, Jason Downs. All rights reserved.
.\"
@@ -31,12 +31,11 @@
.Nd encrypt passwords from the command line or standard input
.Sh SYNOPSIS
.Nm encrypt
-.Op Fl k
+.Op Fl km
.Op Fl b Ar rounds
.Op Fl c Ar class
-.Op Fl m
-.Op Fl s Ar salt
.Op Fl p | Ar string
+.Op Fl s Ar salt
.Nm makekey
.Sh DESCRIPTION
.Nm
diff --git a/usr.bin/encrypt/encrypt.c b/usr.bin/encrypt/encrypt.c
index 67221a4dae2..d66b8bfd451 100644
--- a/usr.bin/encrypt/encrypt.c
+++ b/usr.bin/encrypt/encrypt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: encrypt.c,v 1.24 2006/11/02 18:02:16 ray Exp $ */
+/* $OpenBSD: encrypt.c,v 1.25 2007/03/06 11:16:55 jmc Exp $ */
/*
* Copyright (c) 1996, Jason Downs. All rights reserved.
@@ -58,7 +58,7 @@ usage(void)
{
(void)fprintf(stderr,
- "usage: %s [-k] [-b rounds] [-c class] [-m] [-s salt] [-p | string]\n",
+ "usage: %s [-km] [-b rounds] [-c class] [-p | string] [-s salt]\n",
__progname);
exit(1);
}