From b8b7a65ef6e19f27c3ddc091150988b207795128 Mon Sep 17 00:00:00 2001
From: delphij <delphij@FreeBSD.org>
Date: Tue, 9 Jul 2013 22:04:35 +0000
Subject: Sync with KAME.

MFC after:	1 month
---
 sys/crypto/sha2/sha2.c | 6 +++---
 sys/crypto/sha2/sha2.h | 3 +--
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'sys/crypto/sha2')

diff --git a/sys/crypto/sha2/sha2.c b/sys/crypto/sha2/sha2.c
index 1313db5..66ec6e9 100644
--- a/sys/crypto/sha2/sha2.c
+++ b/sys/crypto/sha2/sha2.c
@@ -1,4 +1,4 @@
-/*	$KAME: sha2.c,v 1.8 2001/11/08 01:07:52 itojun Exp $	*/
+/*	$KAME: sha2.c,v 1.11 2004/06/02 09:52:45 itojun Exp $	*/
 
 /*
  * sha2.c
@@ -32,6 +32,7 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  */
 
 #include <sys/cdefs.h>
@@ -67,7 +68,7 @@ __FBSDID("$FreeBSD$");
  *
  */
 
-#if defined(_KERNEL) && (defined(__bsdi__) || defined(__FreeBSD__))
+#if defined(_KERNEL) && defined(__FreeBSD__)
 #define assert(x)
 #else
 #include <assert.h>
@@ -1051,4 +1052,3 @@ char* SHA384_Data(const sha2_byte* data, size_t len, char digest[SHA384_DIGEST_S
 	SHA384_Update(&context, data, len);
 	return SHA384_End(&context, digest);
 }
-
diff --git a/sys/crypto/sha2/sha2.h b/sys/crypto/sha2/sha2.h
index 12da95c..639d58b 100644
--- a/sys/crypto/sha2/sha2.h
+++ b/sys/crypto/sha2/sha2.h
@@ -1,5 +1,5 @@
 /*	$FreeBSD$	*/
-/*	$KAME: sha2.h,v 1.3 2001/03/12 08:27:48 itojun Exp $	*/
+/*	$KAME: sha2.h,v 1.5 2007/06/14 12:09:41 itojun Exp $	*/
 
 /*
  * sha2.h
@@ -138,4 +138,3 @@ char* SHA512_Data(const u_int8_t*, size_t, char[SHA512_DIGEST_STRING_LENGTH]);
 #endif /* __cplusplus */
 
 #endif /* __SHA2_H__ */
-
-- 
cgit v1.1