diff options
| author |   tedu <tedu@openbsd.org> | 2014-01-10 05:34:46 +0000 |
|---|---|---|
| committer | tedu <tedu@openbsd.org> | 2014-01-10 05:34:46 +0000 |
| commit | b5be4dea472c70025427b8009465ce9f128fc317 (patch) | |
| tree | 3eae7ed8e3ad0deaeeb2e10fce75b9e25065b05a | |
| parent | ddpcb and unixsw symbols are no longer used with kvm_read (diff) | |
| download | wireguard-openbsd-b5be4dea472c70025427b8009465ce9f128fc317.tar.xz wireguard-openbsd-b5be4dea472c70025427b8009465ce9f128fc317.zip | |
the -c option is really a mode change, incompatible with other options.
(there are some others too, but -c is particularly misleading.) split it
out in synopsis and usage.
ok deraadt
| -rw-r--r-- | bin/md5/md5.1 | 10 | ||||
| -rw-r--r-- | bin/md5/md5.c | 8 | ||||
| -rw-r--r-- | bin/md5/sha1.1 | 10 | ||||
| -rw-r--r-- | bin/md5/sha256.1 | 16 |
4 files changed, 27 insertions, 17 deletions
diff --git a/bin/md5/md5.1 b/bin/md5/md5.1 index 3443e97ce4d..de20207485e 100644 --- a/bin/md5/md5.1 +++ b/bin/md5/md5.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: md5.1,v 1.36 2014/01/08 16:12:44 jmc Exp $ +.\" $OpenBSD: md5.1,v 1.37 2014/01/10 05:34:46 tedu Exp $ .\" .\" Copyright (c) 2003, 2004, 2006 Todd C. Miller <Todd.Miller@courtesan.com> .\" @@ -18,7 +18,7 @@ .\" Agency (DARPA) and Air Force Research Laboratory, Air Force .\" Materiel Command, USAF, under agreement number F39502-99-1-0512. .\" -.Dd $Mdocdate: January 8 2014 $ +.Dd $Mdocdate: January 10 2014 $ .Dt MD5 1 .Os .Sh NAME @@ -26,11 +26,13 @@ .Nd calculate a message digest (checksum) for a file .Sh SYNOPSIS .Nm md5 -.Op Fl bpqrtx -.Op Fl c Op Ar checklist ... +.Op Fl bprtx .Op Fl h Ar hashfile .Op Fl s Ar string .Op Ar +.Nm md5 +.Op Fl q +.Fl c Op Ar checklist ... .Sh DESCRIPTION .Nm takes as input a message of arbitrary length and produces diff --git a/bin/md5/md5.c b/bin/md5/md5.c index 2769425ad02..cf197361253 100644 --- a/bin/md5/md5.c +++ b/bin/md5/md5.c @@ -1,4 +1,4 @@ -/* $OpenBSD: md5.c,v 1.64 2014/01/08 16:23:21 millert Exp $ */ +/* $OpenBSD: md5.c,v 1.65 2014/01/10 05:34:46 tedu Exp $ */ /* * Copyright (c) 2001,2003,2005-2007,2010,2013,2014 @@ -820,8 +820,10 @@ usage(void) __progname, (int)strlen(__progname), ""); else #endif /* !defined(SMALL) */ - fprintf(stderr, "usage: %s [-bpqrtx] [-c [checklist ...]] " - "[-h hashfile] [-s string] [file ...]\n", __progname); + fprintf(stderr, "usage:" + "\t%s [-bprtx] [-h hashfile] [-s string] [file ...]\n" + "\t%s [-q] -c [checklist ...]\n", + __progname, __progname); exit(EXIT_FAILURE); } diff --git a/bin/md5/sha1.1 b/bin/md5/sha1.1 index 87335a075b8..38ebe07320d 100644 --- a/bin/md5/sha1.1 +++ b/bin/md5/sha1.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sha1.1,v 1.34 2014/01/08 16:12:44 jmc Exp $ +.\" $OpenBSD: sha1.1,v 1.35 2014/01/10 05:34:46 tedu Exp $ .\" .\" Copyright (c) 2003, 2004, 2006 Todd C. Miller <Todd.Miller@courtesan.com> .\" @@ -18,7 +18,7 @@ .\" Agency (DARPA) and Air Force Research Laboratory, Air Force .\" Materiel Command, USAF, under agreement number F39502-99-1-0512. .\" -.Dd $Mdocdate: January 8 2014 $ +.Dd $Mdocdate: January 10 2014 $ .Dt SHA1 1 .Os .Sh NAME @@ -26,11 +26,13 @@ .Nd calculate a message digest (checksum) for a file .Sh SYNOPSIS .Nm sha1 -.Op Fl bpqrtx -.Op Fl c Op Ar checklist ... +.Op Fl bprtx .Op Fl h Ar hashfile .Op Fl s Ar string .Op Ar +.Nm sha1 +.Op Fl q +.Fl c Op Ar checklist ... .Sh DESCRIPTION .Nm takes as input a message of arbitrary length and produces diff --git a/bin/md5/sha256.1 b/bin/md5/sha256.1 index 37cb5406f5a..01befa22331 100644 --- a/bin/md5/sha256.1 +++ b/bin/md5/sha256.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: sha256.1,v 1.9 2014/01/08 16:12:44 jmc Exp $ +.\" $OpenBSD: sha256.1,v 1.10 2014/01/10 05:34:46 tedu Exp $ .\" .\" Copyright (c) 2003, 2004, 2006 Todd C. Miller <Todd.Miller@courtesan.com> .\" @@ -18,7 +18,7 @@ .\" Agency (DARPA) and Air Force Research Laboratory, Air Force .\" Materiel Command, USAF, under agreement number F39502-99-1-0512. .\" -.Dd $Mdocdate: January 8 2014 $ +.Dd $Mdocdate: January 10 2014 $ .Dt SHA256 1 .Os .Sh NAME @@ -27,17 +27,21 @@ .Nd calculate a message digest (checksum) for a file .Sh SYNOPSIS .Nm sha256 -.Op Fl bpqrtx -.Op Fl c Op Ar checklist ... +.Op Fl bprtx .Op Fl h Ar hashfile .Op Fl s Ar string .Op Ar +.Nm sha256 +.Op Fl q +.Fl c Op Ar checklist ... .Nm sha512 -.Op Fl bpqrtx -.Op Fl c Op Ar checklist ... +.Op Fl bprtx .Op Fl h Ar hashfile .Op Fl s Ar string .Op Ar +.Nm sha512 +.Op Fl q +.Fl c Op Ar checklist ... .Sh DESCRIPTION .Nm takes as input a message of arbitrary length and produces |