sync man page with new usage restrictions

4 files changed, 23 insertions, 31 deletions

diff --git a/bin/md5/Makefile b/bin/md5/Makefile
index 0c8a5ebdc48..2257f5bcb6e 100644
--- a/bin/md5/Makefile
+++ b/bin/md5/Makefile
@@ -1,9 +1,9 @@
-#	$OpenBSD: Makefile,v 1.5 1997/07/17 05:45:01 millert Exp $
+#	$OpenBSD: Makefile,v 1.6 2001/06/03 17:51:29 millert Exp $
 
 PROG=	md5
 MAN=	md5.1 sha1.1 rmd160.1
 LINKS=	${BINDIR}/md5 ${BINDIR}/sha1 \
 	${BINDIR}/md5 ${BINDIR}/rmd160
-COPTS+=	-Wall -Wconversion -Wmissing-prototypes -Werror
+COPTS+=	-ansi -Wall -Wconversion -Wmissing-prototypes -Werror
 
 .include <bsd.prog.mk>
diff --git a/bin/md5/md5.1 b/bin/md5/md5.1
index 3d41d226705..88185b62197 100644
--- a/bin/md5/md5.1
+++ b/bin/md5/md5.1
@@ -1,6 +1,6 @@
-.\"	$OpenBSD: md5.1,v 1.10 2000/11/09 17:51:56 aaron Exp $
+.\"	$OpenBSD: md5.1,v 1.11 2001/06/03 17:51:29 millert Exp $
 .\"
-.Dd February 14, 1994
+.Dd June 4, 2001
 .Dt MD5 1
 .Os
 .Sh NAME
@@ -8,9 +8,10 @@
 .Nd calculate a message-digest fingerprint (checksum) for a file
 .Sh SYNOPSIS
 .Nm md5
-.Op Fl ptx
-.Op Fl s Ar string
-.Op Ar file ...
+.Oo
+.Fl p | Fl t | Fl x |
+.Fl s Ar string | Ar file ...
+.Oc
 .Sh DESCRIPTION
 .Nm
 takes as input a message of arbitrary length and produces
@@ -18,6 +19,7 @@ as output a 128-bit "fingerprint" or "message digest" of the input.
 It is conjectured that it is computationally infeasible to produce
 two messages having the same message digest, or to produce any
 message having a given prespecified target message digest.
+.Pp
 The
 .Em MD5
 algorithm is intended for digital signature applications, where a
@@ -41,8 +43,6 @@ Runs a built-in time trial.
 Runs a built-in test script.
 .El
 .Pp
-These four options may be used in any combination and must
-precede any files named on the command line.
 The MD5 sum of each file listed on the command line is printed after the
 options are processed.
 .Sh SEE ALSO
@@ -51,6 +51,3 @@ options are processed.
 .Xr sha1 1
 .Pp
 RFC 1321 describes in detail the MD2, MD4, and MD5 message-digest algorithms.
-.Sh ACKNOWLEDGEMENTS
-This program is placed in the public domain for free general use by
-RSA Data Security.
diff --git a/bin/md5/rmd160.1 b/bin/md5/rmd160.1
index a012e6acc82..e13f6e2d0f9 100644
--- a/bin/md5/rmd160.1
+++ b/bin/md5/rmd160.1
@@ -1,6 +1,6 @@
-.\"	$OpenBSD: rmd160.1,v 1.7 2000/11/09 17:51:56 aaron Exp $
+.\"	$OpenBSD: rmd160.1,v 1.8 2001/06/03 17:51:29 millert Exp $
 .\"
-.Dd July 16, 1997
+.Dd June 4, 2001
 .Dt RMD160 1
 .Os
 .Sh NAME
@@ -8,9 +8,10 @@
 .Nd calculate a message-digest fingerprint (checksum) for a file
 .Sh SYNOPSIS
 .Nm rmd160
-.Op Fl ptx
-.Op Fl s Ar string
-.Op Ar file ...
+.Oo
+.Fl p | Fl t | Fl x |
+.Fl s Ar string | Ar file ...
+.Oc
 .Sh DESCRIPTION
 .Nm
 takes as input a message of arbitrary length and produces
@@ -42,9 +43,8 @@ Runs a built-in time trial.
 Runs a built-in test script.
 .El
 .Pp
-The RMD-160
-sum of each file listed on the command line is printed after the options
-are processed.
+The RMD-160 sum of each file listed on the command line is printed after
+the options are processed.
 .Sh SEE ALSO
 .Xr cksum 1 ,
 .Xr md5 1 ,
@@ -53,6 +53,3 @@ are processed.
 RMD-160 is part of the ISO draft standard
 .St "ISO/IEC DIS 10118-3"
 on dedicated hash functions.
-.Sh ACKNOWLEDGEMENTS
-This program is placed in the public domain for free general use by
-RSA Data Security.
diff --git a/bin/md5/sha1.1 b/bin/md5/sha1.1
index 242a71d898e..85d63d0053e 100644
--- a/bin/md5/sha1.1
+++ b/bin/md5/sha1.1
@@ -1,6 +1,6 @@
-.\"	$OpenBSD: sha1.1,v 1.8 2000/11/09 17:51:56 aaron Exp $
+.\"	$OpenBSD: sha1.1,v 1.9 2001/06/03 17:51:29 millert Exp $
 .\"
-.Dd July 12, 1997
+.Dd June 4, 2001
 .Dt SHA1 1
 .Os
 .Sh NAME
@@ -8,9 +8,10 @@
 .Nd calculate a message-digest fingerprint (checksum) for a file
 .Sh SYNOPSIS
 .Nm sha1
-.Op Fl ptx
-.Op Fl s Ar string
-.Op Ar file ...
+.Oo
+.Fl p | Fl t | Fl x |
+.Fl s Ar string | Ar file ...
+.Oc
 .Sh DESCRIPTION
 .Nm
 takes as input a message of arbitrary length and produces
@@ -51,6 +52,3 @@ are processed.
 .Xr rmd160 1
 .Pp
 NIST FIPS PUB 180-1 describes the SHA-1 message-digest algorithm in detail.
-.Sh ACKNOWLEDGEMENTS
-This program is placed in the public domain for free general use by
-RSA Data Security.