From 7d2f083b012bf98dedde3589919272e8403fa36c Mon Sep 17 00:00:00 2001
From: jmc <>
Date: Thu, 27 Sep 2012 11:31:57 +0000
Subject: [PATCH] last stage of rfc changes, using consistent Rs/Re blocks, and
 moving the references into a STANDARDS section;

---
 src/lib/libc/hash/mdX.3  | 36 ++++++++++++++++++++----------------
 src/lib/libc/hash/sha1.3 | 16 ++++++++++------
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/src/lib/libc/hash/mdX.3 b/src/lib/libc/hash/mdX.3
index 03958938..00e59d01 100644
--- a/src/lib/libc/hash/mdX.3
+++ b/src/lib/libc/hash/mdX.3
@@ -6,9 +6,9 @@
 .\" this stuff is worth it, you can buy me a beer in return.   Poul-Henning Kamp
 .\" ----------------------------------------------------------------------------
 .\"
-.\" 	$OpenBSD: mdX.3,v 1.12 2012/08/18 08:44:25 jmc Exp $
+.\" 	$OpenBSD: mdX.3,v 1.13 2012/09/27 11:31:57 jmc Exp $
 .\"
-.Dd $Mdocdate: August 18 2012 $
+.Dd $Mdocdate: September 27 2012 $
 .Dt MDX 3
 .Os
 .Sh NAME
@@ -157,38 +157,42 @@ characters of buffer space.
 .Xr sha1 3 ,
 .Xr sha2 3
 .Rs
-.%A R. Rivest
-.%T The MD4 Message-Digest Algorithm
-.%O RFC 1186
-.Re
-.Rs
-.%A R. Rivest
-.%T The MD5 Message-Digest Algorithm
-.%O RFC 1321
-.Re
-.Rs
 .%A RSA Laboratories
 .%T Frequently Asked Questions About today's Cryptography
 .%U http://www.rsa.com/rsalabs/faq/
 .Re
 .Rs
 .%A H. Dobbertin
-.%T Alf Swindles Ann
+.%D 1995
 .%J CryptoBytes
 .%N 1(3):5
-.%D 1995
+.%T Alf Swindles Ann
 .Re
 .Rs
 .%A MJ. B. Robshaw
-.%T On Recent Results for MD4 and MD5
+.%D November 12, 1996
 .%J RSA Laboratories Bulletin
 .%N 4
-.%D November 12, 1996
+.%T On Recent Results for MD4 and MD5
 .Re
 .Rs
 .%A Hans Dobbertin
 .%T Cryptanalysis of MD5 Compress
 .Re
+.Sh STANDARDS
+.Rs
+.%A R. Rivest
+.%D October 1990
+.%R RFC 1186
+.%T The MD4 Message Digest Algorithm
+.Re
+.Pp
+.Rs
+.%A R. Rivest
+.%D April 1992
+.%R RFC 1321
+.%T The MD5 Message Digest Algorithm
+.Re
 .Sh HISTORY
 These functions appeared in
 .Ox 2.0 .
diff --git a/src/lib/libc/hash/sha1.3 b/src/lib/libc/hash/sha1.3
index 80b553b0..26582ec6 100644
--- a/src/lib/libc/hash/sha1.3
+++ b/src/lib/libc/hash/sha1.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: sha1.3,v 1.37 2008/02/13 08:43:39 art Exp $
+.\"	$OpenBSD: sha1.3,v 1.38 2012/09/27 11:31:57 jmc Exp $
 .\"
 .\" Copyright (c) 1997, 2004 Todd C. Miller <Todd.Miller@courtesan.com>
 .\"
@@ -17,7 +17,7 @@
 .\" See http://csrc.nist.gov/publications/fips/fips180-1/fip180-1.txt
 .\" for the detailed standard
 .\"
-.Dd $Mdocdate: February 13 2008 $
+.Dd $Mdocdate: September 27 2012 $
 .Dt SHA1 3
 .Os
 .Sh NAME
@@ -200,15 +200,19 @@ printf("0x%s\en", SHA1Data(buf, strlen(buf), output));
 .Xr md5 3 ,
 .Xr rmd160 3 ,
 .Xr sha2 3
+.Sh STANDARDS
 .Rs
 .%A J. Burrows
+.%R FIPS PUB 180-1
 .%T The Secure Hash Standard
-.%O FIPS PUB 180-1
 .Re
+.Pp
 .Rs
-.%A D. Eastlake and P. Jones
-.%T US Secure Hash Algorithm 1
-.%O RFC 3174
+.%A D. Eastlake
+.%A P. Jones
+.%D September 2001
+.%R RFC 3174
+.%T US Secure Hash Algorithm 1 (SHA1)
 .Re
 .Sh HISTORY
 The SHA-1 functions appeared in