Sync message digest algorithms with the ones actually implemented in

"openssl dgst". feedback/ok jmc@
author: lteo <> 2014-12-19 03:14:19 +0000
committer: lteo <> 2014-12-19 03:14:19 +0000
commit: 704bdf35ad915aef90f964ce47bcba6b0e68f61f (patch)
tree: 7c4f00b3ffff7b97fd87c0e7680c5b0273836525 /src
parent: 8ee1a1e4a4c52092060a915a644f80202aba054a (diff)
download: openbsd-704bdf35ad915aef90f964ce47bcba6b0e68f61f.tar.gz
openbsd-704bdf35ad915aef90f964ce47bcba6b0e68f61f.tar.bz2
openbsd-704bdf35ad915aef90f964ce47bcba6b0e68f61f.zip
1 files changed, 29 insertions, 9 deletions
diff --git a/src/usr.bin/openssl/openssl.1 b/src/usr.bin/openssl/openssl.1
index 2971e17a0d..27bb11c9e9 100644
--- a/src/usr.bin/openssl/openssl.1
+++ b/src/usr.bin/openssl/openssl.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: openssl.1,v 1.6 2014/11/23 04:49:46 guenther Exp $
+.\" $OpenBSD: openssl.1,v 1.7 2014/12/19 03:14:19 lteo Exp $
 .\" ====================================================================
 .\" Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
 .\"
@@ -112,7 +112,7 @@
 .\"
 .\" OPENSSL
 .\"
-.Dd $Mdocdate: November 23 2014 $
+.Dd $Mdocdate: December 19 2014 $
 .Dt OPENSSL 1
 .Os
 .Sh NAME
@@ -376,19 +376,37 @@ version information.
 X.509 certificate data management.
 .El
 .Sh MESSAGE DIGEST COMMANDS
-.Bl -tag -width "asn1parse"
+.Bl -tag -width "streebog512"
-.It Cm md2
+.It Cm gost-mac
-MD2 digest.
+GOST-MAC digest.
+.It Cm streebog256
+Streebog-256 digest.
+.It Cm streebog512
+Streebog-512 digest.
+.It Cm md_gost94
+GOST R 34.11-94 digest.
 .It Cm md4
 MD4 digest.
 .It Cm md5
 MD5 digest.
+.It Cm mdc2
+MDC-2 digest.
 .It Cm ripemd160
 RIPEMD-160 digest.
 .It Cm sha
 SHA digest.
 .It Cm sha1
 SHA-1 digest.
+.It Cm sha224
+SHA-224 digest.
+.It Cm sha256
+SHA-256 digest.
+.It Cm sha384
+SHA-384 digest.
+.It Cm sha512
+SHA-512 digest.
+.It Cm whirlpool
+Whirlpool digest.
 .El
 .Sh ENCODING AND CIPHER COMMANDS
 .Bl -tag -width Ds -compact
@@ -1945,8 +1963,9 @@ install user certificates and CAs in MSIE using the Xenroll control.
 .Nm "openssl dgst"
 .Bk -words
 .Oo
-.Fl dss1 | md2 | md4 | md5 |
+.Fl gost-mac | streebog256 | streebog512 | md_gost94 |
-.Fl ripemd160 | sha | sha1
+.Fl md4 | md5 | mdc2 | ripemd160 | sha | sha1 |
+.Fl sha224 | sha256 | sha384 | sha512 | whirlpool
 .Oc
 .Op Fl binary
 .Op Fl cd
@@ -1968,8 +1987,9 @@ install user certificates and CAs in MSIE using the Xenroll control.
 .nr nS 0
 .Pp
 .Nm openssl
-.Cm md2 | md4 | md5 |
+.Cm gost-mac | streebog256 | streebog512 | md_gost94 |
-.Cm ripemd160 | sha | sha1
+.Cm md4 | md5 | mdc2 | ripemd160 | sha | sha1 |
+.Cm sha224 | sha256 | sha384 | sha512 | whirlpool
 .Op Fl c
 .Op Fl d
 .Op Ar
author	lteo <>	2014-12-19 03:14:19 +0000
committer	lteo <>	2014-12-19 03:14:19 +0000
commit	704bdf35ad915aef90f964ce47bcba6b0e68f61f (patch)
tree	7c4f00b3ffff7b97fd87c0e7680c5b0273836525 /src
parent	8ee1a1e4a4c52092060a915a644f80202aba054a (diff)
download	openbsd-704bdf35ad915aef90f964ce47bcba6b0e68f61f.tar.gz openbsd-704bdf35ad915aef90f964ce47bcba6b0e68f61f.tar.bz2 openbsd-704bdf35ad915aef90f964ce47bcba6b0e68f61f.zip

diff --git a/src/usr.bin/openssl/openssl.1 b/src/usr.bin/openssl/openssl.1 index 2971e17a0d..27bb11c9e9 100644 --- a/src/usr.bin/openssl/openssl.1 +++ b/src/usr.bin/openssl/openssl.1
@@ -1,4 +1,4 @@
1	.\" $OpenBSD: openssl.1,v 1.6 2014/11/23 04:49:46 guenther Exp $	1	.\" $OpenBSD: openssl.1,v 1.7 2014/12/19 03:14:19 lteo Exp $
2	.\" ====================================================================	2	.\" ====================================================================
3	.\" Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.	3	.\" Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.
4	.\"	4	.\"
@@ -112,7 +112,7 @@
112	.\"	112	.\"
113	.\" OPENSSL	113	.\" OPENSSL
114	.\"	114	.\"
115	.Dd $Mdocdate: November 23 2014 $	115	.Dd $Mdocdate: December 19 2014 $
116	.Dt OPENSSL 1	116	.Dt OPENSSL 1
117	.Os	117	.Os
118	.Sh NAME	118	.Sh NAME
@@ -376,19 +376,37 @@ version information.
376	X.509 certificate data management.	376	X.509 certificate data management.
377	.El	377	.El
378	.Sh MESSAGE DIGEST COMMANDS	378	.Sh MESSAGE DIGEST COMMANDS
379	.Bl -tag -width "asn1parse"	379	.Bl -tag -width "streebog512"
380	.It Cm md2	380	.It Cm gost-mac
381	MD2 digest.	381	GOST-MAC digest.
		382	.It Cm streebog256
		383	Streebog-256 digest.
		384	.It Cm streebog512
		385	Streebog-512 digest.
		386	.It Cm md_gost94
		387	GOST R 34.11-94 digest.
382	.It Cm md4	388	.It Cm md4
383	MD4 digest.	389	MD4 digest.
384	.It Cm md5	390	.It Cm md5
385	MD5 digest.	391	MD5 digest.
		392	.It Cm mdc2
		393	MDC-2 digest.
386	.It Cm ripemd160	394	.It Cm ripemd160
387	RIPEMD-160 digest.	395	RIPEMD-160 digest.
388	.It Cm sha	396	.It Cm sha
389	SHA digest.	397	SHA digest.
390	.It Cm sha1	398	.It Cm sha1
391	SHA-1 digest.	399	SHA-1 digest.
		400	.It Cm sha224
		401	SHA-224 digest.
		402	.It Cm sha256
		403	SHA-256 digest.
		404	.It Cm sha384
		405	SHA-384 digest.
		406	.It Cm sha512
		407	SHA-512 digest.
		408	.It Cm whirlpool
		409	Whirlpool digest.
392	.El	410	.El
393	.Sh ENCODING AND CIPHER COMMANDS	411	.Sh ENCODING AND CIPHER COMMANDS
394	.Bl -tag -width Ds -compact	412	.Bl -tag -width Ds -compact
@@ -1945,8 +1963,9 @@ install user certificates and CAs in MSIE using the Xenroll control.
1945	.Nm "openssl dgst"	1963	.Nm "openssl dgst"
1946	.Bk -words	1964	.Bk -words
1947	.Oo	1965	.Oo
1948	.Fl dss1 \| md2 \| md4 \| md5 \|	1966	.Fl gost-mac \| streebog256 \| streebog512 \| md_gost94 \|
1949	.Fl ripemd160 \| sha \| sha1	1967	.Fl md4 \| md5 \| mdc2 \| ripemd160 \| sha \| sha1 \|
		1968	.Fl sha224 \| sha256 \| sha384 \| sha512 \| whirlpool
1950	.Oc	1969	.Oc
1951	.Op Fl binary	1970	.Op Fl binary
1952	.Op Fl cd	1971	.Op Fl cd
@@ -1968,8 +1987,9 @@ install user certificates and CAs in MSIE using the Xenroll control.
1968	.nr nS 0	1987	.nr nS 0
1969	.Pp	1988	.Pp
1970	.Nm openssl	1989	.Nm openssl
1971	.Cm md2 \| md4 \| md5 \|	1990	.Cm gost-mac \| streebog256 \| streebog512 \| md_gost94 \|
1972	.Cm ripemd160 \| sha \| sha1	1991	.Cm md4 \| md5 \| mdc2 \| ripemd160 \| sha \| sha1 \|
		1992	.Cm sha224 \| sha256 \| sha384 \| sha512 \| whirlpool
1973	.Op Fl c	1993	.Op Fl c
1974	.Op Fl d	1994	.Op Fl d
1975	.Op Ar	1995	.Op Ar