Index: common/lib/libc/Makefile.inc
===================================================================
RCS file: /cvsroot/src/common/lib/libc/Makefile.inc,v
retrieving revision 1.16
diff -u -r1.16 Makefile.inc
--- common/lib/libc/Makefile.inc	10 Aug 2014 23:25:49 -0000	1.16
+++ common/lib/libc/Makefile.inc	5 Mar 2016 23:33:11 -0000
@@ -4,7 +4,7 @@
 
 COMMON_DIR:=${.PARSEDIR}
 COMMON_CODEDIRS=atomic gen gmon inet md net stdlib string sys
-COMMON_CODEDIRS+=hash/sha1 hash/sha2 hash/rmd160 hash/murmurhash
+COMMON_CODEDIRS+=hash/sha1 hash/sha2 hash/sha3 hash/rmd160 hash/murmurhash
 
 .if defined(COMMON_MACHINE_ARCH) && !empty(COMMON_MACHINE_ARCH) && \
     exists(${COMMON_DIR}/arch/${COMMON_MACHINE_ARCH})
Index: distrib/sets/lists/comp/mi
===================================================================
RCS file: /cvsroot/src/distrib/sets/lists/comp/mi,v
retrieving revision 1.2020
diff -u -r1.2020 mi
--- distrib/sets/lists/comp/mi	27 Feb 2016 21:47:36 -0000	1.2020
+++ distrib/sets/lists/comp/mi	5 Mar 2016 23:33:13 -0000
@@ -2698,6 +2698,7 @@
 ./usr/include/sgtty.h				comp-c-include
 ./usr/include/sha1.h				comp-c-include
 ./usr/include/sha2.h				comp-c-include
+./usr/include/sha3.h				comp-c-include
 ./usr/include/signal.h				comp-c-include
 ./usr/include/skey.h				comp-c-include		skey
 ./usr/include/smbfs				comp-obsolete		obsolete
@@ -2894,6 +2895,7 @@
 ./usr/include/sys/sem.h				comp-c-include
 ./usr/include/sys/sha1.h			comp-c-include
 ./usr/include/sys/sha2.h			comp-c-include
+./usr/include/sys/sha3.h			comp-c-include
 ./usr/include/sys/shm.h				comp-c-include
 ./usr/include/sys/siginfo.h			comp-c-include
 ./usr/include/sys/signal.h			comp-c-include
@@ -4558,6 +4560,34 @@
 ./usr/share/man/cat3/SHA256_Init.0		comp-c-catman		.cat
 ./usr/share/man/cat3/SHA256_Transform.0		comp-c-catman		.cat
 ./usr/share/man/cat3/SHA256_Update.0		comp-c-catman		.cat
+./usr/share/man/cat3/SHA3_224_Data.0		comp-c-catman		.cat
+./usr/share/man/cat3/SHA3_224_End.0		comp-c-catman		.cat
+./usr/share/man/cat3/SHA3_224_File.0		comp-c-catman		.cat
+./usr/share/man/cat3/SHA3_224_FileChunk.0		comp-c-catman		.cat
+./usr/share/man/cat3/SHA3_224_Final.0		comp-c-catman		.cat
+./usr/share/man/cat3/SHA3_224_Init.0		comp-c-catman		.cat
+./usr/share/man/cat3/SHA3_224_Update.0		comp-c-catman		.cat
+./usr/share/man/cat3/SHA3_256_Data.0		comp-c-catman		.cat
+./usr/share/man/cat3/SHA3_256_End.0		comp-c-catman		.cat
+./usr/share/man/cat3/SHA3_256_File.0		comp-c-catman		.cat
+./usr/share/man/cat3/SHA3_256_FileChunk.0		comp-c-catman		.cat
+./usr/share/man/cat3/SHA3_256_Final.0		comp-c-catman		.cat
+./usr/share/man/cat3/SHA3_256_Init.0		comp-c-catman		.cat
+./usr/share/man/cat3/SHA3_256_Update.0		comp-c-catman		.cat
+./usr/share/man/cat3/SHA3_384_Data.0		comp-c-catman		.cat
+./usr/share/man/cat3/SHA3_384_End.0		comp-c-catman		.cat
+./usr/share/man/cat3/SHA3_384_File.0		comp-c-catman		.cat
+./usr/share/man/cat3/SHA3_384_FileChunk.0		comp-c-catman		.cat
+./usr/share/man/cat3/SHA3_384_Final.0		comp-c-catman		.cat
+./usr/share/man/cat3/SHA3_384_Init.0		comp-c-catman		.cat
+./usr/share/man/cat3/SHA3_384_Update.0		comp-c-catman		.cat
+./usr/share/man/cat3/SHA3_512_Data.0		comp-c-catman		.cat
+./usr/share/man/cat3/SHA3_512_End.0		comp-c-catman		.cat
+./usr/share/man/cat3/SHA3_512_File.0		comp-c-catman		.cat
+./usr/share/man/cat3/SHA3_512_FileChunk.0		comp-c-catman		.cat
+./usr/share/man/cat3/SHA3_512_Final.0		comp-c-catman		.cat
+./usr/share/man/cat3/SHA3_512_Init.0		comp-c-catman		.cat
+./usr/share/man/cat3/SHA3_512_Update.0		comp-c-catman		.cat
 ./usr/share/man/cat3/SHA384_Data.0		comp-c-catman		.cat
 ./usr/share/man/cat3/SHA384_End.0		comp-c-catman		.cat
 ./usr/share/man/cat3/SHA384_File.0		comp-c-catman		.cat
@@ -8748,6 +8778,7 @@
 ./usr/share/man/cat3/sha.0			comp-obsolete		obsolete
 ./usr/share/man/cat3/sha1.0			comp-c-catman		.cat
 ./usr/share/man/cat3/sha2.0			comp-c-catman		.cat
+./usr/share/man/cat3/sha3.0			comp-c-catman		.cat
 ./usr/share/man/cat3/shm_open.0			comp-c-catman		.cat
 ./usr/share/man/cat3/shm_unlink.0		comp-c-catman		.cat
 ./usr/share/man/cat3/show_panel.0		comp-c-catman		.cat
@@ -11614,6 +11645,34 @@
 ./usr/share/man/html3/SHA256_Init.html		comp-c-htmlman		html
 ./usr/share/man/html3/SHA256_Transform.html	comp-c-htmlman		html
 ./usr/share/man/html3/SHA256_Update.html	comp-c-htmlman		html
+./usr/share/man/html3/SHA3_224_Data.html		comp-c-htmlman		html
+./usr/share/man/html3/SHA3_224_End.html		comp-c-htmlman		html
+./usr/share/man/html3/SHA3_224_File.html		comp-c-htmlman		html
+./usr/share/man/html3/SHA3_224_FileChunk.html	comp-c-htmlman		html
+./usr/share/man/html3/SHA3_224_Final.html		comp-c-htmlman		html
+./usr/share/man/html3/SHA3_224_Init.html		comp-c-htmlman		html
+./usr/share/man/html3/SHA3_224_Update.html	comp-c-htmlman		html
+./usr/share/man/html3/SHA3_256_Data.html		comp-c-htmlman		html
+./usr/share/man/html3/SHA3_256_End.html		comp-c-htmlman		html
+./usr/share/man/html3/SHA3_256_File.html		comp-c-htmlman		html
+./usr/share/man/html3/SHA3_256_FileChunk.html	comp-c-htmlman		html
+./usr/share/man/html3/SHA3_256_Final.html		comp-c-htmlman		html
+./usr/share/man/html3/SHA3_256_Init.html		comp-c-htmlman		html
+./usr/share/man/html3/SHA3_256_Update.html	comp-c-htmlman		html
+./usr/share/man/html3/SHA3_384_Data.html		comp-c-htmlman		html
+./usr/share/man/html3/SHA3_384_End.html		comp-c-htmlman		html
+./usr/share/man/html3/SHA3_384_File.html		comp-c-htmlman		html
+./usr/share/man/html3/SHA3_384_FileChunk.html	comp-c-htmlman		html
+./usr/share/man/html3/SHA3_384_Final.html		comp-c-htmlman		html
+./usr/share/man/html3/SHA3_384_Init.html		comp-c-htmlman		html
+./usr/share/man/html3/SHA3_384_Update.html	comp-c-htmlman		html
+./usr/share/man/html3/SHA3_512_Data.html		comp-c-htmlman		html
+./usr/share/man/html3/SHA3_512_End.html		comp-c-htmlman		html
+./usr/share/man/html3/SHA3_512_File.html		comp-c-htmlman		html
+./usr/share/man/html3/SHA3_512_FileChunk.html	comp-c-htmlman		html
+./usr/share/man/html3/SHA3_512_Final.html		comp-c-htmlman		html
+./usr/share/man/html3/SHA3_512_Init.html		comp-c-htmlman		html
+./usr/share/man/html3/SHA3_512_Update.html	comp-c-htmlman		html
 ./usr/share/man/html3/SHA384_Data.html		comp-c-htmlman		html
 ./usr/share/man/html3/SHA384_End.html		comp-c-htmlman		html
 ./usr/share/man/html3/SHA384_File.html		comp-c-htmlman		html
@@ -15696,6 +15755,7 @@
 ./usr/share/man/html3/setvbuf.html		comp-c-htmlman		html
 ./usr/share/man/html3/sha1.html			comp-c-htmlman		html
 ./usr/share/man/html3/sha2.html			comp-c-htmlman		html
+./usr/share/man/html3/sha3.html			comp-c-htmlman		html
 ./usr/share/man/html3/shm_open.html		comp-c-htmlman		html
 ./usr/share/man/html3/shm_unlink.html		comp-c-htmlman		html
 ./usr/share/man/html3/show_panel.html		comp-c-htmlman		html
@@ -18469,6 +18529,34 @@
 ./usr/share/man/man3/SHA256_Init.3		comp-c-man		.man
 ./usr/share/man/man3/SHA256_Transform.3		comp-c-man		.man
 ./usr/share/man/man3/SHA256_Update.3		comp-c-man		.man
+./usr/share/man/man3/SHA3_224_Data.3		comp-c-man		.man
+./usr/share/man/man3/SHA3_224_End.3		comp-c-man		.man
+./usr/share/man/man3/SHA3_224_File.3		comp-c-man		.man
+./usr/share/man/man3/SHA3_224_FileChunk.3		comp-c-man		.man
+./usr/share/man/man3/SHA3_224_Final.3		comp-c-man		.man
+./usr/share/man/man3/SHA3_224_Init.3		comp-c-man		.man
+./usr/share/man/man3/SHA3_224_Update.3		comp-c-man		.man
+./usr/share/man/man3/SHA3_256_Data.3		comp-c-man		.man
+./usr/share/man/man3/SHA3_256_End.3		comp-c-man		.man
+./usr/share/man/man3/SHA3_256_File.3		comp-c-man		.man
+./usr/share/man/man3/SHA3_256_FileChunk.3		comp-c-man		.man
+./usr/share/man/man3/SHA3_256_Final.3		comp-c-man		.man
+./usr/share/man/man3/SHA3_256_Init.3		comp-c-man		.man
+./usr/share/man/man3/SHA3_256_Update.3		comp-c-man		.man
+./usr/share/man/man3/SHA3_384_Data.3		comp-c-man		.man
+./usr/share/man/man3/SHA3_384_End.3		comp-c-man		.man
+./usr/share/man/man3/SHA3_384_File.3		comp-c-man		.man
+./usr/share/man/man3/SHA3_384_FileChunk.3		comp-c-man		.man
+./usr/share/man/man3/SHA3_384_Final.3		comp-c-man		.man
+./usr/share/man/man3/SHA3_384_Init.3		comp-c-man		.man
+./usr/share/man/man3/SHA3_384_Update.3		comp-c-man		.man
+./usr/share/man/man3/SHA3_512_Data.3		comp-c-man		.man
+./usr/share/man/man3/SHA3_512_End.3		comp-c-man		.man
+./usr/share/man/man3/SHA3_512_File.3		comp-c-man		.man
+./usr/share/man/man3/SHA3_512_FileChunk.3		comp-c-man		.man
+./usr/share/man/man3/SHA3_512_Final.3		comp-c-man		.man
+./usr/share/man/man3/SHA3_512_Init.3		comp-c-man		.man
+./usr/share/man/man3/SHA3_512_Update.3		comp-c-man		.man
 ./usr/share/man/man3/SHA384_Data.3		comp-c-man		.man
 ./usr/share/man/man3/SHA384_End.3		comp-c-man		.man
 ./usr/share/man/man3/SHA384_File.3		comp-c-man		.man
@@ -22655,6 +22743,7 @@
 ./usr/share/man/man3/sha.3			comp-obsolete		obsolete
 ./usr/share/man/man3/sha1.3			comp-c-man		.man
 ./usr/share/man/man3/sha2.3			comp-c-man		.man
+./usr/share/man/man3/sha3.3			comp-c-man		.man
 ./usr/share/man/man3/shm_open.3			comp-c-man		.man
 ./usr/share/man/man3/shm_unlink.3		comp-c-man		.man
 ./usr/share/man/man3/show_panel.3		comp-c-man		.man
Index: lib/libc/hash/Makefile.inc
===================================================================
RCS file: /cvsroot/src/lib/libc/hash/Makefile.inc,v
retrieving revision 1.12
diff -u -r1.12 Makefile.inc
--- lib/libc/hash/Makefile.inc	8 Jul 2012 01:21:12 -0000	1.12
+++ lib/libc/hash/Makefile.inc	5 Mar 2016 23:33:32 -0000
@@ -8,5 +8,6 @@
 .include "${.CURDIR}/hash/rmd160/Makefile.inc"
 .include "${.CURDIR}/hash/sha1/Makefile.inc"
 .include "${.CURDIR}/hash/sha2/Makefile.inc"
+.include "${.CURDIR}/hash/sha3/Makefile.inc"
 
 .include "${.CURDIR}/hash/murmurhash/Makefile.inc"
Index: lib/libc/include/namespace.h
===================================================================
RCS file: /cvsroot/src/lib/libc/include/namespace.h,v
retrieving revision 1.179
diff -u -r1.179 namespace.h
--- lib/libc/include/namespace.h	10 Sep 2015 14:05:06 -0000	1.179
+++ lib/libc/include/namespace.h	5 Mar 2016 23:33:32 -0000
@@ -151,6 +151,34 @@
 #define SHA256_Init		_SHA256_Init
 #define SHA256_Transform	_SHA256_Transform
 #define SHA256_Update		_SHA256_Update
+#define SHA3_224_Data		_SHA3_224_Data
+#define SHA3_224_End		_SHA3_224_End
+#define SHA3_224_FileChunk	_SHA3_224_FileChunk
+#define SHA3_224_File		_SHA3_224_File
+#define SHA3_224_Final		_SHA3_224_Final
+#define SHA3_224_Init		_SHA3_224_Init
+#define SHA3_224_Update		_SHA3_224_Update
+#define SHA3_256_Data		_SHA3_256_Data
+#define SHA3_256_End		_SHA3_256_End
+#define SHA3_256_FileChunk	_SHA3_256_FileChunk
+#define SHA3_256_File		_SHA3_256_File
+#define SHA3_256_Final		_SHA3_256_Final
+#define SHA3_256_Init		_SHA3_256_Init
+#define SHA3_256_Update		_SHA3_256_Update
+#define SHA3_384_Data		_SHA3_384_Data
+#define SHA3_384_End		_SHA3_384_End
+#define SHA3_384_FileChunk	_SHA3_384_FileChunk
+#define SHA3_384_File		_SHA3_384_File
+#define SHA3_384_Final		_SHA3_384_Final
+#define SHA3_384_Init		_SHA3_384_Init
+#define SHA3_384_Update		_SHA3_384_Update
+#define SHA3_512_Data		_SHA3_512_Data
+#define SHA3_512_End		_SHA3_512_End
+#define SHA3_512_FileChunk	_SHA3_512_FileChunk
+#define SHA3_512_File		_SHA3_512_File
+#define SHA3_512_Final		_SHA3_512_Final
+#define SHA3_512_Init		_SHA3_512_Init
+#define SHA3_512_Update		_SHA3_512_Update
 #define SHA384_Data		_SHA384_Data
 #define SHA384_End		_SHA384_End
 #define SHA384_FileChunk	_SHA384_FileChunk
Index: sys/sys/Makefile
===================================================================
RCS file: /cvsroot/src/sys/sys/Makefile,v
retrieving revision 1.157
diff -u -r1.157 Makefile
--- sys/sys/Makefile	17 Aug 2015 06:16:03 -0000	1.157
+++ sys/sys/Makefile	5 Mar 2016 23:33:36 -0000
@@ -34,7 +34,7 @@
 	ras.h rbtree.h reboot.h radioio.h resource.h resourcevar.h rmd160.h \
 	rnd.h rndio.h rwlock.h \
 	scanio.h sched.h scsiio.h sdt.h select.h selinfo.h sem.h sha1.h \
-	sha2.h shm.h siginfo.h signal.h signalvar.h sigtypes.h \
+	sha2.h sha3.h shm.h siginfo.h signal.h signalvar.h sigtypes.h \
 	sleepq.h socket.h \
 	socketvar.h sockio.h spawn.h specificdata.h stat.h \
 	statvfs.h syscall.h syscallargs.h sysctl.h stdarg.h stdbool.h \
@@ -59,6 +59,7 @@
 	sys/rmd160.h /usr/include/rmd160.h \
 	sys/sha1.h /usr/include/sha1.h \
 	sys/sha2.h /usr/include/sha2.h \
+	sys/sha3.h /usr/include/sha3.h \
 	sys/md4.h /usr/include/md4.h \
 	sys/md5.h /usr/include/md5.h
 
Index: tools/compat/sha3.h
===================================================================
RCS file: tools/compat/sha3.h
diff -N tools/compat/sha3.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tools/compat/sha3.h	5 Mar 2016 23:33:37 -0000
@@ -0,0 +1,5 @@
+/*	$NetBSD: sha2.h,v 1.2 2013/02/07 20:31:52 christos Exp $	*/
+
+/* We unconditionally use the NetBSD sha3 in libnbcompat. */
+#include "nbtool_config.h"
+#include "../../sys/sys/sha3.h"
Index: tools/compat/sys/sha3.h
===================================================================
RCS file: tools/compat/sys/sha3.h
diff -N tools/compat/sys/sha3.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ tools/compat/sys/sha3.h	5 Mar 2016 23:33:37 -0000
@@ -0,0 +1,3 @@
+/*	$NetBSD: sha3.h,v 1.1 2006/10/27 22:32:45 mrg Exp $	*/
+
+#include "../../../sys/sys/sha3.h"
Index: common/lib/libc/hash/sha3/keccak.c
===================================================================
RCS file: common/lib/libc/hash/sha3/keccak.c
diff -N common/lib/libc/hash/sha3/keccak.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ common/lib/libc/hash/sha3/keccak.c	5 Mar 2016 23:54:39 -0000
@@ -0,0 +1,178 @@
+/*-
+ * Copyright (c) 2015 Taylor R. Campbell
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * 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.
+ */
+
+#define	_POSIX_C_SOURCE	200809L
+
+#include <stdint.h>
+
+#include "keccak.h"
+
+#define	secret	/* can't use in variable-time operations, should zero */
+
+#define	FOR5(X, STMT) do						      \
+{									      \
+	(X) = 0; (STMT);						      \
+	(X) = 1; (STMT);						      \
+	(X) = 2; (STMT);						      \
+	(X) = 3; (STMT);						      \
+	(X) = 4; (STMT);						      \
+} while (0)
+
+static inline secret uint64_t
+rol64(secret uint64_t v, unsigned c)
+{
+
+	return ((v << c) | (v >> (64 - c)));
+}
+
+static inline void
+keccakf1600_theta(secret uint64_t A[25])
+{
+	secret uint64_t C0, C1, C2, C3, C4;
+	unsigned y;
+
+	C0 = C1 = C2 = C3 = C4 = 0;
+	FOR5(y, {
+		C0 ^= A[0 + 5*y];
+		C1 ^= A[1 + 5*y];
+		C2 ^= A[2 + 5*y];
+		C3 ^= A[3 + 5*y];
+		C4 ^= A[4 + 5*y];
+	});
+	FOR5(y, {
+		A[0 + 5*y] ^= C4 ^ rol64(C1, 1);
+		A[1 + 5*y] ^= C0 ^ rol64(C2, 1);
+		A[2 + 5*y] ^= C1 ^ rol64(C3, 1);
+		A[3 + 5*y] ^= C2 ^ rol64(C4, 1);
+		A[4 + 5*y] ^= C3 ^ rol64(C0, 1);
+	});
+}
+
+static inline void
+keccakf1600_rho_pi(secret uint64_t A[25])
+{
+	secret uint64_t T, U;
+
+	/*
+	 * Permute by (x,y) |---> (y, 2x + 3y mod 5) starting at (1,0),
+	 * rotate the ith element by (i + 1)(i + 2)/2 mod 64.
+	 */
+	U = A[ 1];                       T = U;
+	U = A[10]; A[10] = rol64(T,  1); T = U;
+	U = A[ 7]; A[ 7] = rol64(T,  3); T = U;
+	U = A[11]; A[11] = rol64(T,  6); T = U;
+	U = A[17]; A[17] = rol64(T, 10); T = U;
+	U = A[18]; A[18] = rol64(T, 15); T = U;
+	U = A[ 3]; A[ 3] = rol64(T, 21); T = U;
+	U = A[ 5]; A[ 5] = rol64(T, 28); T = U;
+	U = A[16]; A[16] = rol64(T, 36); T = U;
+	U = A[ 8]; A[ 8] = rol64(T, 45); T = U;
+	U = A[21]; A[21] = rol64(T, 55); T = U;
+	U = A[24]; A[24] = rol64(T,  2); T = U;
+	U = A[ 4]; A[ 4] = rol64(T, 14); T = U;
+	U = A[15]; A[15] = rol64(T, 27); T = U;
+	U = A[23]; A[23] = rol64(T, 41); T = U;
+	U = A[19]; A[19] = rol64(T, 56); T = U;
+	U = A[13]; A[13] = rol64(T,  8); T = U;
+	U = A[12]; A[12] = rol64(T, 25); T = U;
+	U = A[ 2]; A[ 2] = rol64(T, 43); T = U;
+	U = A[20]; A[20] = rol64(T, 62); T = U;
+	U = A[14]; A[14] = rol64(T, 18); T = U;
+	U = A[22]; A[22] = rol64(T, 39); T = U;
+	U = A[ 9]; A[ 9] = rol64(T, 61); T = U;
+	U = A[ 6]; A[ 6] = rol64(T, 20); T = U;
+	           A[ 1] = rol64(T, 44);
+}
+
+static inline void
+keccakf1600_chi(secret uint64_t A[25])
+{
+	secret uint64_t B0, B1, B2, B3, B4;
+	unsigned y;
+
+	FOR5(y, {
+		B0 = A[0 + 5*y];
+		B1 = A[1 + 5*y];
+		B2 = A[2 + 5*y];
+		B3 = A[3 + 5*y];
+		B4 = A[4 + 5*y];
+		A[0 + 5*y] ^= ~B1 & B2;
+		A[1 + 5*y] ^= ~B2 & B3;
+		A[2 + 5*y] ^= ~B3 & B4;
+		A[3 + 5*y] ^= ~B4 & B0;
+		A[4 + 5*y] ^= ~B0 & B1;
+	});
+}
+
+static void
+keccakf1600_round(secret uint64_t A[25])
+{
+
+	keccakf1600_theta(A);
+	keccakf1600_rho_pi(A);
+	keccakf1600_chi(A);
+}
+
+void
+keccakf1600(secret uint64_t A[25])
+{
+	/*
+	 * RC[i] = \sum_{j = 0,...,6} rc(j + 7i) 2^(2^j - 1),
+	 * rc(t) = (x^t mod x^8 + x^6 + x^5 + x^4 + 1) mod x in GF(2)[x]
+	 */
+	static const uint64_t RC[24] = {
+		0x0000000000000001ULL,
+		0x0000000000008082ULL,
+		0x800000000000808aULL,
+		0x8000000080008000ULL,
+		0x000000000000808bULL,
+		0x0000000080000001ULL,
+		0x8000000080008081ULL,
+		0x8000000000008009ULL,
+		0x000000000000008aULL,
+		0x0000000000000088ULL,
+		0x0000000080008009ULL,
+		0x000000008000000aULL,
+		0x000000008000808bULL,
+		0x800000000000008bULL,
+		0x8000000000008089ULL,
+		0x8000000000008003ULL,
+		0x8000000000008002ULL,
+		0x8000000000000080ULL,
+		0x000000000000800aULL,
+		0x800000008000000aULL,
+		0x8000000080008081ULL,
+		0x8000000000008080ULL,
+		0x0000000080000001ULL,
+		0x8000000080008008ULL,
+	};
+	unsigned i;
+
+	for (i = 0; i < 24; i++) {
+		keccakf1600_round(A);
+		A[0] ^= RC[i];
+	}
+}
Index: common/lib/libc/hash/sha3/keccak.h
===================================================================
RCS file: common/lib/libc/hash/sha3/keccak.h
diff -N common/lib/libc/hash/sha3/keccak.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ common/lib/libc/hash/sha3/keccak.h	5 Mar 2016 23:54:39 -0000
@@ -0,0 +1,34 @@
+/*-
+ * Copyright (c) 2015 Taylor R. Campbell
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * 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.
+ */
+
+#ifndef	KECCAK_H
+#define	KECCAK_H
+
+#include <stdint.h>
+
+void	keccakf1600(uint64_t A[25]);
+
+#endif	/* KECCAK_H */
Index: common/lib/libc/hash/sha3/sha3.c
===================================================================
RCS file: common/lib/libc/hash/sha3/sha3.c
diff -N common/lib/libc/hash/sha3/sha3.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ common/lib/libc/hash/sha3/sha3.c	5 Mar 2016 23:54:39 -0000
@@ -0,0 +1,660 @@
+/*-
+ * Copyright (c) 2015 Taylor R. Campbell
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * 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.
+ */
+
+/*
+ * SHA-3: FIPS-202, Permutation-Based Hash and Extendable-Ouptut Functions
+ */
+
+#define	_POSIX_C_SOURCE	200809L
+
+#include "namespace.h"
+
+#include <assert.h>
+#include <stddef.h>
+#include <inttypes.h>
+#include <string.h>
+
+#include "keccak.h"
+
+#include "sys/sha3.h"
+
+#if !defined(_KERNEL) && !defined(_STANDALONE)
+#if defined(__weak_alias)
+__weak_alias(SHA3_224_Init,_SHA3_224_Init) 
+__weak_alias(SHA3_224_Update,_SHA3_224_Update)
+__weak_alias(SHA3_224_Final,_SHA3_224_Final)
+
+__weak_alias(SHA3_256_Init,_SHA3_256_Init) 
+__weak_alias(SHA3_256_Update,_SHA3_256_Update)
+__weak_alias(SHA3_256_Final,_SHA3_256_Final)
+
+__weak_alias(SHA3_384_Init,_SHA3_384_Init) 
+__weak_alias(SHA3_384_Update,_SHA3_384_Update)
+__weak_alias(SHA3_384_Final,_SHA3_384_Final)
+
+__weak_alias(SHA3_512_Init,_SHA3_512_Init) 
+__weak_alias(SHA3_512_Update,_SHA3_512_Update)
+__weak_alias(SHA3_512_Final,_SHA3_512_Final)
+#endif
+#endif
+
+#define	MIN(a,b)	((a) < (b) ? (a) : (b))
+
+void *(*volatile sha3_explicit_memset_impl)(void *, int, size_t) = &memset;
+static void *
+explicit_memset(void *buf, int c, size_t n)
+{
+
+	return (*sha3_explicit_memset_impl)(buf, c, n);
+}
+
+static inline uint64_t
+le64dec(const void *buf)
+{
+	const uint8_t *p = buf;
+
+	return (((uint64_t)p[0]) |
+	    ((uint64_t)p[1] << 8) |
+	    ((uint64_t)p[2] << 16) |
+	    ((uint64_t)p[3] << 24) |
+	    ((uint64_t)p[4] << 32) |
+	    ((uint64_t)p[5] << 40) |
+	    ((uint64_t)p[6] << 48) |
+	    ((uint64_t)p[7] << 56));
+}
+
+static inline void
+le64enc(void *buf, uint64_t v)
+{
+	uint8_t *p = buf;
+
+	*p++ = v; v >>= 8;
+	*p++ = v; v >>= 8;
+	*p++ = v; v >>= 8;
+	*p++ = v; v >>= 8;
+	*p++ = v; v >>= 8;
+	*p++ = v; v >>= 8;
+	*p++ = v; v >>= 8;
+	*p++ = v;
+}
+
+/*
+ * Common body.  All the SHA-3 functions share code structure.  They
+ * differ only in the size of the chunks they split the message into:
+ * for digest size d, they are split into chunks of 200 - d bytes.
+ */
+
+static inline unsigned
+sha3_rate(unsigned d)
+{
+	const unsigned cw = 2*d/8;	/* capacity in words */
+
+	return 25 - cw;
+}
+
+static void
+sha3_init(struct sha3 *C, unsigned rw)
+{
+	unsigned iw;
+
+	C->nb = 8*rw;
+	for (iw = 0; iw < 25; iw++)
+		C->A[iw] = 0;
+}
+
+static void
+sha3_update(struct sha3 *C, const uint8_t *data, size_t len, unsigned rw)
+{
+	uint64_t T;
+	unsigned ib, iw;		/* index of byte/word */
+
+	assert(0 < C->nb);
+
+	/* If there's a partial word, try to fill it.  */
+	if ((C->nb % 8) != 0) {
+		T = 0;
+		for (ib = 0; ib < MIN(len, C->nb % 8); ib++)
+			T |= (uint64_t)data[ib] << (8*ib);
+		C->A[rw - (C->nb + 7)/8] ^= T << (8*(8 - (C->nb % 8)));
+		C->nb -= ib;
+		data += ib;
+		len -= ib;
+
+		/* If we filled the buffer, permute now.  */
+		if (C->nb == 0) {
+			keccakf1600(C->A);
+			C->nb = 8*rw;
+		}
+
+		/* If that exhausted the input, we're done.  */
+		if (len == 0)
+			return;
+	}
+
+	/* At a word boundary.  Fill any partial buffer.  */
+	assert((C->nb % 8) == 0);
+	if (C->nb < 8*rw) {
+		for (iw = 0; iw < MIN(len, C->nb)/8; iw++)
+			C->A[rw - C->nb/8 + iw] ^= le64dec(data + 8*iw);
+		C->nb -= 8*iw;
+		data += 8*iw;
+		len -= 8*iw;
+
+		/* If we filled the buffer, permute now.  */
+		if (C->nb == 0) {
+			keccakf1600(C->A);
+			C->nb = 8*rw;
+		} else {
+			/* Otherwise, less than a word left.  */
+			assert(len < 8);
+			goto partial;
+		}
+	}
+
+	/* At a buffer boundary.  Absorb input one buffer at a time.  */
+	assert(C->nb == 8*rw);
+	while (8*rw <= len) {
+		for (iw = 0; iw < rw; iw++)
+			C->A[iw] ^= le64dec(data + 8*iw);
+		keccakf1600(C->A);
+		data += 8*rw;
+		len -= 8*rw;
+	}
+
+	/* Partially fill the buffer with as many words as we can.  */
+	for (iw = 0; iw < len/8; iw++)
+		C->A[rw - C->nb/8 + iw] ^= le64dec(data + 8*iw);
+	C->nb -= 8*iw;
+	data += 8*iw;
+	len -= 8*iw;
+
+partial:
+	/* Partially fill the last word with as many bytes as we can.  */
+	assert(len < 8);
+	assert(0 < C->nb);
+	assert((C->nb % 8) == 0);
+	T = 0;
+	for (ib = 0; ib < len; ib++)
+		T |= (uint64_t)data[ib] << (8*ib);
+	C->A[rw - C->nb/8] ^= T;
+	C->nb -= ib;
+	assert(0 < C->nb);
+}
+
+static void
+sha3_final(uint8_t *h, unsigned d, struct sha3 *C, unsigned rw)
+{
+	unsigned nw, iw;
+
+	assert(d <= 8*25);
+	assert(0 < C->nb);
+
+	/* Append 01, pad with 10*1 up to buffer boundary, LSB first.  */
+	nw = (C->nb + 7)/8;
+	assert(0 < nw);
+	assert(nw <= rw);
+	C->A[rw - nw] ^= (uint64_t)0x06 << (8*(8*nw - C->nb));
+	C->A[rw - 1] ^= 0x8000000000000000ULL;
+
+	/* Permute one last time.  */
+	keccakf1600(C->A);
+
+	/* Reveal the first 8d bits of state, forget 1600-8d of them.  */
+	for (iw = 0; iw < d/8; iw++)
+		le64enc(h + 8*iw, C->A[iw]);
+	h += 8*iw;
+	d -= 8*iw;
+	if (0 < d) {
+		/* For SHA3-224, we need to expose a partial word.  */
+		uint64_t T = C->A[iw];
+		do {
+			*h++ = T & 0xff;
+			T >>= 8;
+		} while (--d);
+	}
+	(void)explicit_memset(C->A, 0, sizeof C->A);
+	C->nb = 0;
+}
+
+static void
+shake_final(uint8_t *h, unsigned d, struct sha3 *C, unsigned rw)
+{
+	unsigned nw, iw;
+
+	assert(0 < C->nb);
+
+	/* Append 1111, pad with 10*1 up to buffer boundary, LSB first.  */
+	nw = (C->nb + 7)/8;
+	assert(0 < nw);
+	assert(nw <= rw);
+	C->A[rw - nw] ^= (uint64_t)0x1f << (8*(8*nw - C->nb));
+	C->A[rw - 1] ^= 0x8000000000000000ULL;
+
+	/* Permute, reveal first rw words of state, repeat.  */
+	while (8*rw <= d) {
+		keccakf1600(C->A);
+		for (iw = 0; iw < rw; iw++)
+			le64enc(h + 8*iw, C->A[iw]);
+		h += 8*iw;
+		d -= 8*iw;
+	}
+
+	/*
+	 * If 8*rw (the output rate in bytes) does not divide d, more
+	 * words are wanted: permute again and reveal a little more.
+	 */
+	if (0 < d) {
+		keccakf1600(C->A);
+		for (iw = 0; iw < d/8; iw++)
+			le64enc(h + 8*iw, C->A[iw]);
+		h += 8*iw;
+		d -= 8*iw;
+
+		/*
+		 * If 8 does not divide d, more bytes are wanted:
+		 * reveal them.
+		 */
+		if (0 < d) {
+			uint64_t T = C->A[iw];
+			do {
+				*h++ = T & 0xff;
+				T >>= 8;
+			} while (--d);
+		}
+	}
+
+	(void)explicit_memset(C->A, 0, sizeof C->A);
+	C->nb = 0;
+}
+
+void
+SHA3_224_Init(SHA3_224_CTX *C)
+{
+
+	sha3_init(&C->C224, sha3_rate(SHA3_224_DIGEST_LENGTH));
+}
+
+void
+SHA3_224_Update(SHA3_224_CTX *C, const uint8_t *data, size_t len)
+{
+
+	sha3_update(&C->C224, data, len, sha3_rate(SHA3_224_DIGEST_LENGTH));
+}
+
+void
+SHA3_224_Final(uint8_t h[SHA3_224_DIGEST_LENGTH], SHA3_224_CTX *C)
+{
+
+	sha3_final(h, SHA3_224_DIGEST_LENGTH, &C->C224,
+	    sha3_rate(SHA3_224_DIGEST_LENGTH));
+}
+
+void
+SHA3_256_Init(SHA3_256_CTX *C)
+{
+
+	sha3_init(&C->C256, sha3_rate(SHA3_256_DIGEST_LENGTH));
+}
+
+void
+SHA3_256_Update(SHA3_256_CTX *C, const uint8_t *data, size_t len)
+{
+
+	sha3_update(&C->C256, data, len, sha3_rate(SHA3_256_DIGEST_LENGTH));
+}
+
+void
+SHA3_256_Final(uint8_t h[SHA3_256_DIGEST_LENGTH], SHA3_256_CTX *C)
+{
+
+	sha3_final(h, SHA3_256_DIGEST_LENGTH, &C->C256,
+	    sha3_rate(SHA3_256_DIGEST_LENGTH));
+}
+
+void
+SHA3_384_Init(SHA3_384_CTX *C)
+{
+
+	sha3_init(&C->C384, sha3_rate(SHA3_384_DIGEST_LENGTH));
+}
+
+void
+SHA3_384_Update(SHA3_384_CTX *C, const uint8_t *data, size_t len)
+{
+
+	sha3_update(&C->C384, data, len, sha3_rate(SHA3_384_DIGEST_LENGTH));
+}
+
+void
+SHA3_384_Final(uint8_t h[SHA3_384_DIGEST_LENGTH], SHA3_384_CTX *C)
+{
+
+	sha3_final(h, SHA3_384_DIGEST_LENGTH, &C->C384,
+	    sha3_rate(SHA3_384_DIGEST_LENGTH));
+}
+
+void
+SHA3_512_Init(SHA3_512_CTX *C)
+{
+
+	sha3_init(&C->C512, sha3_rate(SHA3_512_DIGEST_LENGTH));
+}
+
+void
+SHA3_512_Update(SHA3_512_CTX *C, const uint8_t *data, size_t len)
+{
+
+	sha3_update(&C->C512, data, len, sha3_rate(SHA3_512_DIGEST_LENGTH));
+}
+
+void
+SHA3_512_Final(uint8_t h[SHA3_512_DIGEST_LENGTH], SHA3_512_CTX *C)
+{
+
+	sha3_final(h, SHA3_512_DIGEST_LENGTH, &C->C512,
+	    sha3_rate(SHA3_512_DIGEST_LENGTH));
+}
+
+void
+SHAKE128_Init(SHAKE128_CTX *C)
+{
+
+	sha3_init(&C->C128, sha3_rate(128/8));
+}
+
+void
+SHAKE128_Update(SHAKE128_CTX *C, const uint8_t *data, size_t len)
+{
+
+	sha3_update(&C->C128, data, len, sha3_rate(128/8));
+}
+
+void
+SHAKE128_Final(uint8_t *h, size_t d, SHAKE128_CTX *C)
+{
+
+	shake_final(h, d, &C->C128, sha3_rate(128/8));
+}
+
+void
+SHAKE256_Init(SHAKE256_CTX *C)
+{
+
+	sha3_init(&C->C256, sha3_rate(256/8));
+}
+
+void
+SHAKE256_Update(SHAKE256_CTX *C, const uint8_t *data, size_t len)
+{
+
+	sha3_update(&C->C256, data, len, sha3_rate(256/8));
+}
+
+void
+SHAKE256_Final(uint8_t *h, size_t d, SHAKE256_CTX *C)
+{
+
+	shake_final(h, d, &C->C256, sha3_rate(256/8));
+}
+
+static void
+sha3_selftest_prng(void *buf, size_t len, uint32_t seed)
+{
+	uint8_t *p = buf;
+	size_t n = len;
+	uint32_t t, a, b;
+
+	a = 0xdead4bad * seed;
+	b = 1;
+
+	while (n--) {
+		t = a + b;
+		*p++ = t >> 24;
+		a = b;
+		b = t;
+	}
+}
+
+int
+SHA3_Selftest(void)
+{
+	const uint8_t d224_0[] = { /* SHA3-224(0-bit) */
+		0x6b,0x4e,0x03,0x42,0x36,0x67,0xdb,0xb7,
+		0x3b,0x6e,0x15,0x45,0x4f,0x0e,0xb1,0xab,
+		0xd4,0x59,0x7f,0x9a,0x1b,0x07,0x8e,0x3f,
+		0x5b,0x5a,0x6b,0xc7,
+	};
+	const uint8_t d256_0[] = { /* SHA3-256(0-bit) */
+		0xa7,0xff,0xc6,0xf8,0xbf,0x1e,0xd7,0x66,
+		0x51,0xc1,0x47,0x56,0xa0,0x61,0xd6,0x62,
+		0xf5,0x80,0xff,0x4d,0xe4,0x3b,0x49,0xfa,
+		0x82,0xd8,0x0a,0x4b,0x80,0xf8,0x43,0x4a,
+	};
+	const uint8_t d384_0[] = { /* SHA3-384(0-bit) */
+		0x0c,0x63,0xa7,0x5b,0x84,0x5e,0x4f,0x7d,
+		0x01,0x10,0x7d,0x85,0x2e,0x4c,0x24,0x85,
+		0xc5,0x1a,0x50,0xaa,0xaa,0x94,0xfc,0x61,
+		0x99,0x5e,0x71,0xbb,0xee,0x98,0x3a,0x2a,
+		0xc3,0x71,0x38,0x31,0x26,0x4a,0xdb,0x47,
+		0xfb,0x6b,0xd1,0xe0,0x58,0xd5,0xf0,0x04,
+	};
+	const uint8_t d512_0[] = { /* SHA3-512(0-bit) */
+		0xa6,0x9f,0x73,0xcc,0xa2,0x3a,0x9a,0xc5,
+		0xc8,0xb5,0x67,0xdc,0x18,0x5a,0x75,0x6e,
+		0x97,0xc9,0x82,0x16,0x4f,0xe2,0x58,0x59,
+		0xe0,0xd1,0xdc,0xc1,0x47,0x5c,0x80,0xa6,
+		0x15,0xb2,0x12,0x3a,0xf1,0xf5,0xf9,0x4c,
+		0x11,0xe3,0xe9,0x40,0x2c,0x3a,0xc5,0x58,
+		0xf5,0x00,0x19,0x9d,0x95,0xb6,0xd3,0xe3,
+		0x01,0x75,0x85,0x86,0x28,0x1d,0xcd,0x26,
+	};
+	const uint8_t shake128_0_41[] = { /* SHAKE128(0-bit, 41) */
+		0x7f,0x9c,0x2b,0xa4,0xe8,0x8f,0x82,0x7d,
+		0x61,0x60,0x45,0x50,0x76,0x05,0x85,0x3e,
+		0xd7,0x3b,0x80,0x93,0xf6,0xef,0xbc,0x88,
+		0xeb,0x1a,0x6e,0xac,0xfa,0x66,0xef,0x26,
+		0x3c,0xb1,0xee,0xa9,0x88,0x00,0x4b,0x93,0x10,
+	};
+	const uint8_t shake256_0_73[] = { /* SHAKE256(0-bit, 73) */
+		0x46,0xb9,0xdd,0x2b,0x0b,0xa8,0x8d,0x13,
+		0x23,0x3b,0x3f,0xeb,0x74,0x3e,0xeb,0x24,
+		0x3f,0xcd,0x52,0xea,0x62,0xb8,0x1b,0x82,
+		0xb5,0x0c,0x27,0x64,0x6e,0xd5,0x76,0x2f,
+		0xd7,0x5d,0xc4,0xdd,0xd8,0xc0,0xf2,0x00,
+		0xcb,0x05,0x01,0x9d,0x67,0xb5,0x92,0xf6,
+		0xfc,0x82,0x1c,0x49,0x47,0x9a,0xb4,0x86,
+		0x40,0x29,0x2e,0xac,0xb3,0xb7,0xc4,0xbe,
+		0x14,0x1e,0x96,0x61,0x6f,0xb1,0x39,0x57,0x69,
+	};
+	const uint8_t d224_1600[] = { /* SHA3-224(200 * 0xa3) */
+		0x93,0x76,0x81,0x6a,0xba,0x50,0x3f,0x72,
+		0xf9,0x6c,0xe7,0xeb,0x65,0xac,0x09,0x5d,
+		0xee,0xe3,0xbe,0x4b,0xf9,0xbb,0xc2,0xa1,
+		0xcb,0x7e,0x11,0xe0,
+	};
+	const uint8_t d256_1600[] = { /* SHA3-256(200 * 0xa3) */
+		0x79,0xf3,0x8a,0xde,0xc5,0xc2,0x03,0x07,
+		0xa9,0x8e,0xf7,0x6e,0x83,0x24,0xaf,0xbf,
+		0xd4,0x6c,0xfd,0x81,0xb2,0x2e,0x39,0x73,
+		0xc6,0x5f,0xa1,0xbd,0x9d,0xe3,0x17,0x87,
+	};
+	const uint8_t d384_1600[] = { /* SHA3-384(200 * 0xa3) */
+		0x18,0x81,0xde,0x2c,0xa7,0xe4,0x1e,0xf9,
+		0x5d,0xc4,0x73,0x2b,0x8f,0x5f,0x00,0x2b,
+		0x18,0x9c,0xc1,0xe4,0x2b,0x74,0x16,0x8e,
+		0xd1,0x73,0x26,0x49,0xce,0x1d,0xbc,0xdd,
+		0x76,0x19,0x7a,0x31,0xfd,0x55,0xee,0x98,
+		0x9f,0x2d,0x70,0x50,0xdd,0x47,0x3e,0x8f,
+	};
+	const uint8_t d512_1600[] = { /* SHA3-512(200 * 0xa3) */
+		0xe7,0x6d,0xfa,0xd2,0x20,0x84,0xa8,0xb1,
+		0x46,0x7f,0xcf,0x2f,0xfa,0x58,0x36,0x1b,
+		0xec,0x76,0x28,0xed,0xf5,0xf3,0xfd,0xc0,
+		0xe4,0x80,0x5d,0xc4,0x8c,0xae,0xec,0xa8,
+		0x1b,0x7c,0x13,0xc3,0x0a,0xdf,0x52,0xa3,
+		0x65,0x95,0x84,0x73,0x9a,0x2d,0xf4,0x6b,
+		0xe5,0x89,0xc5,0x1c,0xa1,0xa4,0xa8,0x41,
+		0x6d,0xf6,0x54,0x5a,0x1c,0xe8,0xba,0x00,
+	};
+	const uint8_t shake128_1600_41[] = { /* SHAKE128(200 * 0xa3, 41) */
+		0x13,0x1a,0xb8,0xd2,0xb5,0x94,0x94,0x6b,
+		0x9c,0x81,0x33,0x3f,0x9b,0xb6,0xe0,0xce,
+		0x75,0xc3,0xb9,0x31,0x04,0xfa,0x34,0x69,
+		0xd3,0x91,0x74,0x57,0x38,0x5d,0xa0,0x37,
+		0xcf,0x23,0x2e,0xf7,0x16,0x4a,0x6d,0x1e,0xb4,
+	};
+	const uint8_t shake256_1600_73[] = { /* SHAKE256(200 * 0xa3, 73) */
+		0xcd,0x8a,0x92,0x0e,0xd1,0x41,0xaa,0x04,
+		0x07,0xa2,0x2d,0x59,0x28,0x86,0x52,0xe9,
+		0xd9,0xf1,0xa7,0xee,0x0c,0x1e,0x7c,0x1c,
+		0xa6,0x99,0x42,0x4d,0xa8,0x4a,0x90,0x4d,
+		0x2d,0x70,0x0c,0xaa,0xe7,0x39,0x6e,0xce,
+		0x96,0x60,0x44,0x40,0x57,0x7d,0xa4,0xf3,
+		0xaa,0x22,0xae,0xb8,0x85,0x7f,0x96,0x1c,
+		0x4c,0xd8,0xe0,0x6f,0x0a,0xe6,0x61,0x0b,
+		0x10,0x48,0xa7,0xf6,0x4e,0x10,0x74,0xcd,0x62,
+	};
+	const uint8_t d0[] = {
+		0x6c,0x02,0x1a,0xc6,0x65,0xaf,0x80,0xfb,
+		0x52,0xe6,0x2d,0x27,0xe5,0x02,0x88,0x84,
+		0xec,0x1c,0x0c,0xe7,0x0b,0x94,0x55,0x83,
+		0x19,0xf2,0xbf,0x09,0x86,0xeb,0x1a,0xbb,
+		0xc3,0x0d,0x1c,0xef,0x22,0xfe,0xc5,0x4c,
+		0x45,0x90,0x66,0x14,0x00,0x6e,0xc8,0x79,
+		0xdf,0x1e,0x02,0xbd,0x75,0xe9,0x60,0xd8,
+		0x60,0x39,0x85,0xc9,0xc4,0xee,0x33,0xab,
+	};
+	const unsigned mlen[6] = { 0, 3, 128, 129, 255, 1024 };
+	uint8_t m[1024], d[73];
+	SHA3_224_CTX sha3224;
+	SHA3_256_CTX sha3256;
+	SHA3_384_CTX sha3384;
+	SHA3_512_CTX sha3512;
+	SHAKE128_CTX shake128;
+	SHAKE256_CTX shake256;
+	SHA3_512_CTX ctx;
+	unsigned mi;
+
+	/*
+	 * NIST test vectors from
+	 * <http://csrc.nist.gov/groups/ST/toolkit/examples.html#aHashing>:
+	 * 0-bit, 1600-bit repeated 0xa3 (= 0b10100011).
+	 */
+	SHA3_224_Init(&sha3224);
+	SHA3_224_Final(d, &sha3224);
+	if (memcmp(d, d224_0, 28) != 0)
+		return -1;
+	SHA3_256_Init(&sha3256);
+	SHA3_256_Final(d, &sha3256);
+	if (memcmp(d, d256_0, 32) != 0)
+		return -1;
+	SHA3_384_Init(&sha3384);
+	SHA3_384_Final(d, &sha3384);
+	if (memcmp(d, d384_0, 48) != 0)
+		return -1;
+	SHA3_512_Init(&sha3512);
+	SHA3_512_Final(d, &sha3512);
+	if (memcmp(d, d512_0, 64) != 0)
+		return -1;
+	SHAKE128_Init(&shake128);
+	SHAKE128_Final(d, 41, &shake128);
+	if (memcmp(d, shake128_0_41, 41) != 0)
+		return -1;
+	SHAKE256_Init(&shake256);
+	SHAKE256_Final(d, 73, &shake256);
+	if (memcmp(d, shake256_0_73, 73) != 0)
+		return -1;
+
+	(void)memset(m, 0xa3, 200);
+	SHA3_224_Init(&sha3224);
+	SHA3_224_Update(&sha3224, m, 200);
+	SHA3_224_Final(d, &sha3224);
+	if (memcmp(d, d224_1600, 28) != 0)
+		return -1;
+	SHA3_256_Init(&sha3256);
+	SHA3_256_Update(&sha3256, m, 200);
+	SHA3_256_Final(d, &sha3256);
+	if (memcmp(d, d256_1600, 32) != 0)
+		return -1;
+	SHA3_384_Init(&sha3384);
+	SHA3_384_Update(&sha3384, m, 200);
+	SHA3_384_Final(d, &sha3384);
+	if (memcmp(d, d384_1600, 48) != 0)
+		return -1;
+	SHA3_512_Init(&sha3512);
+	SHA3_512_Update(&sha3512, m, 200);
+	SHA3_512_Final(d, &sha3512);
+	if (memcmp(d, d512_1600, 64) != 0)
+		return -1;
+	SHAKE128_Init(&shake128);
+	SHAKE128_Update(&shake128, m, 200);
+	SHAKE128_Final(d, 41, &shake128);
+	if (memcmp(d, shake128_1600_41, 41) != 0)
+		return -1;
+	SHAKE256_Init(&shake256);
+	SHAKE256_Update(&shake256, m, 200);
+	SHAKE256_Final(d, 73, &shake256);
+	if (memcmp(d, shake256_1600_73, 73) != 0)
+		return -1;
+
+	/*
+	 * Hand-crufted test vectors with unaligned message lengths.
+	 */
+	SHA3_512_Init(&ctx);
+	for (mi = 0; mi < 6; mi++) {
+		sha3_selftest_prng(m, mlen[mi], (224/8)*mlen[mi]);
+		SHA3_224_Init(&sha3224);
+		SHA3_224_Update(&sha3224, m, mlen[mi]);
+		SHA3_224_Final(d, &sha3224);
+		SHA3_512_Update(&ctx, d, 224/8);
+	}
+	for (mi = 0; mi < 6; mi++) {
+		sha3_selftest_prng(m, mlen[mi], (256/8)*mlen[mi]);
+		SHA3_256_Init(&sha3256);
+		SHA3_256_Update(&sha3256, m, mlen[mi]);
+		SHA3_256_Final(d, &sha3256);
+		SHA3_512_Update(&ctx, d, 256/8);
+	}
+	for (mi = 0; mi < 6; mi++) {
+		sha3_selftest_prng(m, mlen[mi], (384/8)*mlen[mi]);
+		SHA3_384_Init(&sha3384);
+		SHA3_384_Update(&sha3384, m, mlen[mi]);
+		SHA3_384_Final(d, &sha3384);
+		SHA3_512_Update(&ctx, d, 384/8);
+	}
+	for (mi = 0; mi < 6; mi++) {
+		sha3_selftest_prng(m, mlen[mi], (512/8)*mlen[mi]);
+		SHA3_512_Init(&sha3512);
+		SHA3_512_Update(&sha3512, m, mlen[mi]);
+		SHA3_512_Final(d, &sha3512);
+		SHA3_512_Update(&ctx, d, 512/8);
+	}
+	SHA3_512_Final(d, &ctx);
+	if (memcmp(d, d0, 64) != 0)
+		return -1;
+
+	return 0;
+}
? lib/libc/hash/sha3/sha3hl.c
Index: lib/libc/hash/sha3/Makefile.inc
===================================================================
RCS file: lib/libc/hash/sha3/Makefile.inc
diff -N lib/libc/hash/sha3/Makefile.inc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lib/libc/hash/sha3/Makefile.inc	5 Mar 2016 23:55:40 -0000
@@ -0,0 +1,21 @@
+#	$NetBSD: Makefile.inc,v 1.4 2009/05/26 08:04:11 joerg Exp $
+
+# hash functions
+.PATH: ${.CURDIR}/hash/sha3
+
+SRCS+=	keccak.c sha3.c sha3_224hl.c sha3_256hl.c sha3_384hl.c sha3_512hl.c
+
+MAN+=	sha3.3
+
+MLINKS+=sha3.3 SHA3_224_Init.3 sha3.3 SHA3_224_Update.3 sha3.3 SHA3_224_Final.3
+MLINKS+=sha3.3 SHA3_224_End.3  sha3.3 SHA3_224_File.3   sha3.3 SHA3_224_Data.3
+MLINKS+=sha3.3 SHA3_224_FileChunk.3
+MLINKS+=sha3.3 SHA3_256_Init.3 sha3.3 SHA3_256_Update.3 sha3.3 SHA3_256_Final.3
+MLINKS+=sha3.3 SHA3_256_End.3  sha3.3 SHA3_256_File.3   sha3.3 SHA3_256_Data.3
+MLINKS+=sha3.3 SHA3_256_FileChunk.3
+MLINKS+=sha3.3 SHA3_384_Init.3 sha3.3 SHA3_384_Update.3 sha3.3 SHA3_384_Final.3
+MLINKS+=sha3.3 SHA3_384_End.3  sha3.3 SHA3_384_File.3   sha3.3 SHA3_384_Data.3
+MLINKS+=sha3.3 SHA3_384_FileChunk.3
+MLINKS+=sha3.3 SHA3_512_Init.3 sha3.3 SHA3_512_Update.3 sha3.3 SHA3_512_Final.3
+MLINKS+=sha3.3 SHA3_512_End.3  sha3.3 SHA3_512_File.3   sha3.3 SHA3_512_Data.3
+MLINKS+=sha3.3 SHA3_512_FileChunk.3
Index: lib/libc/hash/sha3/sha3_224hl.c
===================================================================
RCS file: lib/libc/hash/sha3/sha3_224hl.c
diff -N lib/libc/hash/sha3/sha3_224hl.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lib/libc/hash/sha3/sha3_224hl.c	5 Mar 2016 23:55:40 -0000
@@ -0,0 +1,16 @@
+/* $NetBSD: sha3_224hl.c,v 1.2 2014/12/11 21:54:13 riastradh Exp $ */
+
+/*
+ * Derived from code written by Jason R. Thorpe <thorpej@NetBSD.org>,
+ * May 20, 2009.
+ * Public domain.
+ */
+
+#include <sys/cdefs.h>
+__RCSID("$NetBSD: sha3_224hl.c,v 1.2 2014/12/11 21:54:13 riastradh Exp $");
+
+#define	HASH_ALGORITHM	SHA3_224
+#define	HASH_FNPREFIX	SHA3_224_
+#define HASH_INCLUDE	<sys/sha3.h>
+
+#include "../hashhl.c"
Index: lib/libc/hash/sha3/sha3_256hl.c
===================================================================
RCS file: lib/libc/hash/sha3/sha3_256hl.c
diff -N lib/libc/hash/sha3/sha3_256hl.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lib/libc/hash/sha3/sha3_256hl.c	5 Mar 2016 23:55:40 -0000
@@ -0,0 +1,18 @@
+/* $NetBSD: sha3_256hl.c,v 1.8 2008/04/13 02:04:32 dholland Exp $ */
+
+/*
+ * Derived from code written by Jason R. Thorpe <thorpej@NetBSD.org>,
+ * April 29, 1997.
+ * Public domain.
+ */
+
+#include <sys/cdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+__RCSID("$NetBSD: sha3_256hl.c,v 1.8 2008/04/13 02:04:32 dholland Exp $");
+#endif /* LIBC_SCCS and not lint */
+
+#define	HASH_ALGORITHM	SHA3_256
+#define	HASH_FNPREFIX	SHA3_256_
+#define HASH_INCLUDE	<sys/sha3.h>
+
+#include "../hashhl.c"
Index: lib/libc/hash/sha3/sha3_384hl.c
===================================================================
RCS file: lib/libc/hash/sha3/sha3_384hl.c
diff -N lib/libc/hash/sha3/sha3_384hl.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lib/libc/hash/sha3/sha3_384hl.c	5 Mar 2016 23:55:40 -0000
@@ -0,0 +1,18 @@
+/* $NetBSD: sha3_384hl.c,v 1.8 2008/04/13 02:04:32 dholland Exp $ */
+
+/*
+ * Derived from code written by Jason R. Thorpe <thorpej@NetBSD.org>,
+ * April 29, 1997.
+ * Public domain.
+ */
+
+#include <sys/cdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+__RCSID("$NetBSD: sha3_384hl.c,v 1.8 2008/04/13 02:04:32 dholland Exp $");
+#endif /* LIBC_SCCS and not lint */
+
+#define	HASH_ALGORITHM	SHA3_384
+#define	HASH_FNPREFIX	SHA3_384_
+#define HASH_INCLUDE	<sys/sha3.h>
+
+#include "../hashhl.c"
Index: lib/libc/hash/sha3/sha3_512hl.c
===================================================================
RCS file: lib/libc/hash/sha3/sha3_512hl.c
diff -N lib/libc/hash/sha3/sha3_512hl.c
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lib/libc/hash/sha3/sha3_512hl.c	5 Mar 2016 23:55:40 -0000
@@ -0,0 +1,18 @@
+/* $NetBSD: sha3_512hl.c,v 1.8 2008/04/13 02:04:32 dholland Exp $ */
+
+/*
+ * Derived from code written by Jason R. Thorpe <thorpej@NetBSD.org>,
+ * April 29, 1997.
+ * Public domain.
+ */
+
+#include <sys/cdefs.h>
+#if defined(LIBC_SCCS) && !defined(lint)
+__RCSID("$NetBSD: sha3_512hl.c,v 1.8 2008/04/13 02:04:32 dholland Exp $");
+#endif /* LIBC_SCCS and not lint */
+
+#define	HASH_ALGORITHM	SHA3_512
+#define	HASH_FNPREFIX	SHA3_512_
+#define HASH_INCLUDE	<sys/sha3.h>
+
+#include "../hashhl.c"
Index: lib/libc/hash/sha3/sha3.3
===================================================================
RCS file: lib/libc/hash/sha3/sha3.3
diff -N lib/libc/hash/sha3/sha3.3
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ lib/libc/hash/sha3/sha3.3	6 Mar 2016 01:04:20 -0000
@@ -0,0 +1,127 @@
+.\" Copyright (c) 2015 Taylor R. Campbell
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" 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.
+.\"
+.Dd October 14, 2015
+.Dt SHA3 3
+.Os
+.Sh NAME
+.Nm SHA3
+.Nd NIST FIPS PUB 202: SHA-3 Standard: Permutation-Based Hash and Extendable-Output Functions
+.Sh SYNOPSIS
+.In sha3.h
+.Ft void
+.Fn SHA3_224_Init "SHA3_224_CTX *ctx"
+.Ft void
+.Fn SHA3_224_Update "SHA3_224_CTX *ctx" "const uint8_t *buf" "size_t len"
+.Ft void
+.Fn SHA3_224_Final "uint8_t digest[SHA3_224_DIGEST_LENGTH]" "SHA3_224_CTX *ctx"
+.Ft void
+.Fn SHA3_256_Init "SHA3_256_CTX *ctx"
+.Ft void
+.Fn SHA3_256_Update "SHA3_256_CTX *ctx" "const uint8_t *buf" "size_t len"
+.Ft void
+.Fn SHA3_256_Final "uint8_t digest[SHA3_256_DIGEST_LENGTH]" "SHA3_256_CTX *ctx"
+.Ft void
+.Fn SHA3_384_Init "SHA3_384_CTX *ctx"
+.Ft void
+.Fn SHA3_384_Update "SHA3_384_CTX *ctx" "const uint8_t *buf" "size_t len"
+.Ft void
+.Fn SHA3_384_Final "uint8_t digest[SHA3_384_DIGEST_LENGTH]" "SHA3_384_CTX *ctx"
+.Ft void
+.Fn SHA3_512_Init "SHA3_512_CTX *ctx"
+.Ft void
+.Fn SHA3_512_Update "SHA3_512_CTX *ctx" "const uint8_t *buf" "size_t len"
+.Ft void
+.Fn SHA3_512_Final "uint8_t digest[SHA3_512_DIGEST_LENGTH]" "SHA3_512_CTX *ctx"
+.Sh DESCRIPTION
+The
+.Nm
+functions implement the cryptographic hash functions of the NIST SHA-3
+standard, FIPS PUB 202.
+The
+.Nm
+functions compress an arbitrary-length message m into short
+fixed-length octet strings SHA3-224(m), SHA3-256(m), etc., called a
+cryptographic digest or hash.
+.Pp
+Before using the
+.Nm
+functions, applications should first call
+.Xr SHA3_Selftest 3
+and confirm that it succeeded.
+.Pp
+Only the
+.Nm SHA3_256
+functions are specified in detail; the
+.Nm SHA3_224 ,
+.Nm SHA3_384 ,
+and
+.Nm SHA3_512
+functions are exactly analogous.
+.Pp
+The caller must allocate memory for a
+.Vt SHA3_256_CTX
+object to hold the state of a SHA3-256 hash computation over a
+message.
+.Vt SHA3_256_CTX
+objects are slightly over 200 bytes, and may be copied or relocated in
+memory.
+.Bl -tag -width abcd
+.It Fn SHA3_256_Init "ctx"
+Initialize a SHA3-256 context.
+Must be done before any other operations on
+.Fa ctx .
+.It Fn SHA3_256_Update "ctx" "data" "len"
+Append
+.Fa len
+octets at
+.Fa data
+to the message.
+.It Fn SHA3_256_Final "digest" "ctx"
+Store at
+.Fa digest
+the 32-octet SHA3-256 hash of the message obtained by concatenating
+all prior inputs to
+.Fn SHA3_256_Update
+on
+.Fa ctx .
+.Pp
+Subsequent use of
+.Fa ctx
+is not allowed, unless it is reinitialized with
+.Fn SHA3_256_Init .
+.El
+.Sh SEE ALSO
+.Xr SHA3_Selftest 3 ,
+.Xr SHAKE 3 ,
+.Xr keccak 3
+.Sh STANDARDS
+.Rs
+.%A National Institute of Standards and Technology
+.%T SHA-3 Standard: Permutation-Based Hash and Extendable-Output Functions
+.%O FIPS PUB 202
+.%D August 2015
+.Re
+.Sh AUTHORS
+.An Taylor R Campbell Aq campbell+sha3@mumble.net
Index: sys/sys/sha3.h
===================================================================
RCS file: sys/sys/sha3.h
diff -N sys/sys/sha3.h
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sys/sys/sha3.h	6 Mar 2016 01:06:49 -0000
@@ -0,0 +1,107 @@
+/*-
+ * Copyright (c) 2015 Taylor R. Campbell
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * 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.
+ */
+
+#ifndef	SHA3_H
+#define	SHA3_H
+
+#include <sys/cdefs.h>
+#include <sys/types.h>
+
+struct sha3 {
+	uint64_t A[25];
+	unsigned nb;		/* number of bytes remaining to fill buffer */
+};
+
+typedef struct { struct sha3 C224; } SHA3_224_CTX;
+typedef struct { struct sha3 C256; } SHA3_256_CTX;
+typedef struct { struct sha3 C384; } SHA3_384_CTX;
+typedef struct { struct sha3 C512; } SHA3_512_CTX;
+typedef struct { struct sha3 C128; } SHAKE128_CTX;
+typedef struct { struct sha3 C256; } SHAKE256_CTX;
+
+#define	SHA3_224_DIGEST_LENGTH	28
+#define	SHA3_256_DIGEST_LENGTH	32
+#define	SHA3_384_DIGEST_LENGTH	48
+#define	SHA3_512_DIGEST_LENGTH	64
+
+#define	SHA3_224_DIGEST_STRING_LENGTH	((2 * SHA3_224_DIGEST_LENGTH) + 1)
+#define	SHA3_256_DIGEST_STRING_LENGTH	((2 * SHA3_256_DIGEST_LENGTH) + 1)
+#define	SHA3_384_DIGEST_STRING_LENGTH	((2 * SHA3_384_DIGEST_LENGTH) + 1)
+#define	SHA3_512_DIGEST_STRING_LENGTH	((2 * SHA3_512_DIGEST_LENGTH) + 1)
+
+__BEGIN_DECLS
+
+void	SHA3_224_Init(SHA3_224_CTX *);
+void	SHA3_224_Update(SHA3_224_CTX *, const uint8_t *, size_t);
+void	SHA3_224_Final(uint8_t[SHA3_224_DIGEST_LENGTH], SHA3_224_CTX *);
+
+void	SHA3_256_Init(SHA3_256_CTX *);
+void	SHA3_256_Update(SHA3_256_CTX *, const uint8_t *, size_t);
+void	SHA3_256_Final(uint8_t[SHA3_256_DIGEST_LENGTH], SHA3_256_CTX *);
+
+void	SHA3_384_Init(SHA3_384_CTX *);
+void	SHA3_384_Update(SHA3_384_CTX *, const uint8_t *, size_t);
+void	SHA3_384_Final(uint8_t[SHA3_384_DIGEST_LENGTH], SHA3_384_CTX *);
+
+void	SHA3_512_Init(SHA3_512_CTX *);
+void	SHA3_512_Update(SHA3_512_CTX *, const uint8_t *, size_t);
+void	SHA3_512_Final(uint8_t[SHA3_512_DIGEST_LENGTH], SHA3_512_CTX *);
+
+void	SHAKE128_Init(SHAKE128_CTX *);
+void	SHAKE128_Update(SHAKE128_CTX *, const uint8_t *, size_t);
+void	SHAKE128_Final(uint8_t *, size_t, SHAKE128_CTX *);
+
+void	SHAKE256_Init(SHAKE256_CTX *);
+void	SHAKE256_Update(SHAKE256_CTX *, const uint8_t *, size_t);
+void	SHAKE256_Final(uint8_t *, size_t, SHAKE256_CTX *);
+
+#ifndef _KERNEL
+int	SHA3_Selftest(void);
+
+char *SHA3_224_End(SHA3_224_CTX*, char[SHA3_224_DIGEST_STRING_LENGTH]);
+char *SHA3_224_Data(const uint8_t*, size_t, char *);
+char *SHA3_224_FileChunk(const char *, char *, off_t, off_t);
+char *SHA3_224_File(const char *, char *);
+
+char *SHA3_256_End(SHA3_256_CTX*, char[SHA3_256_DIGEST_STRING_LENGTH]);
+char *SHA3_256_Data(const uint8_t*, size_t, char *);
+char *SHA3_256_FileChunk(const char *, char *, off_t, off_t);
+char *SHA3_256_File(const char *, char *);
+
+char *SHA3_384_End(SHA3_384_CTX*, char[SHA3_384_DIGEST_STRING_LENGTH]);
+char *SHA3_384_Data(const uint8_t*, size_t, char *);
+char *SHA3_384_FileChunk(const char *, char *, off_t, off_t);
+char *SHA3_384_File(const char *, char *);
+
+char *SHA3_512_End(SHA3_512_CTX*, char[SHA3_512_DIGEST_STRING_LENGTH]);
+char *SHA3_512_Data(const uint8_t*, size_t, char *);
+char *SHA3_512_FileChunk(const char *, char *, off_t, off_t);
+char *SHA3_512_File(const char *, char *);
+#endif /* _KERNEL */
+
+__END_DECLS
+
+#endif	/* SHA3_H */