aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncaen <mail@duncano.de>2017-05-24 03:04:11 +0200
committerDuncaen <mail@duncano.de>2017-05-24 03:20:11 +0200
commit2cf1ee65c7e82c61d0a304ecf848d16bd242084a (patch)
tree04557c6c49be979e686d6ee95897ddcf0672d030
parent70bd1aeb9486a320cab9eb788f1a793ef778c778 (diff)
downloadlobase-2cf1ee65c7e82c61d0a304ecf848d16bd242084a.tar.gz
bin/md5: update to OPENBSD_6_1
-rw-r--r--bin/md5/cksum.16
-rw-r--r--bin/md5/md5.117
2 files changed, 10 insertions, 13 deletions
diff --git a/bin/md5/cksum.1 b/bin/md5/cksum.1
index 452007a..af52a4a 100644
--- a/bin/md5/cksum.1
+++ b/bin/md5/cksum.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: cksum.1,v 1.38 2014/03/20 22:06:21 tedu Exp $
+.\" $OpenBSD: cksum.1,v 1.39 2016/09/03 17:01:01 tedu Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -32,7 +32,7 @@
.\"
.\" @(#)cksum.1 8.2 (Berkeley) 4/28/95
.\"
-.Dd $Mdocdate: March 20 2014 $
+.Dd $Mdocdate: September 3 2016 $
.Dt CKSUM 1
.Os
.Sh NAME
@@ -73,7 +73,7 @@ The options are as follows:
.It Fl a Ar algorithms
Use the specified algorithm(s) instead of the default (cksum).
Supported algorithms include cksum, md5, rmd160, sha1,
-sha224, sha256, sha384, and sha512.
+sha224, sha256, sha384, sha512/256, and sha512.
Multiple algorithms may be specified, separated by a comma or whitespace.
Additionally, multiple
.Fl a
diff --git a/bin/md5/md5.1 b/bin/md5/md5.1
index abc7c99..4f78842 100644
--- a/bin/md5/md5.1
+++ b/bin/md5/md5.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: md5.1,v 1.45 2015/09/23 17:39:36 jmc Exp $
+.\" $OpenBSD: md5.1,v 1.47 2017/02/23 20:46:08 daniel 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: September 23 2015 $
+.Dd $Mdocdate: February 23 2017 $
.Dt MD5 1
.Os
.Sh NAME
@@ -55,14 +55,9 @@
.Sh DESCRIPTION
These utilities take as input a message of arbitrary length and produce
as output a message digest (checksum) of the input.
-It is conjectured that it is computationally infeasible to produce
-two messages having the same message digest (a collision),
-or to produce any message having a given prespecified target message digest.
-The algorithm (MD5, SHA-1, SHA-256, SHA-512) is determined by the
-name used to invoke the utility.
.Pp
-Collisions have now been produced for MD5, and are theorized for SHA-1,
-so their use is deprecated.
+Two messages having the same message digest (a collision) have been produced
+for MD5 and for SHA-1, so their use is deprecated.
.Pp
The options for use with each command are as follows:
.Bl -tag -width Ds
@@ -97,7 +92,9 @@ instead of stdout.
Echoes stdin to stdout and appends the
checksum to stdout.
.It Fl q
-Only print the checksum (quiet mode).
+Only print the checksum (quiet mode) or if used in conjunction with the
+.Fl c
+flag, only print the failed cases.
.It Fl r
Reverse the format of the hash algorithm output, making
it match the output format used by