3 files changed, 63 insertions, 1 deletions

diff --git a/security/nist-kat/Makefile b/security/nist-kat/Makefile
index 5cf4fb11d851..be8251417c8f 100644
--- a/security/nist-kat/Makefile
+++ b/security/nist-kat/Makefile
@@ -3,19 +3,23 @@
 
 PORTNAME=	nist-kat
 DISTVERSION=	0.0.2015.02.23
+PORTREVISION=	1
 CATEGORIES=	security
 BASE_URL=	http://csrc.nist.gov/groups/STM/cavp/documents
 MASTER_SITES=	${BASE_URL}/aes/:aes
 MASTER_SITES+=	${BASE_URL}/des/:des
 MASTER_SITES+=	${BASE_URL}/mac/:mac
+MASTER_SITES+=	${BASE_URL}/shs/:shs
 DISTFILES=	KAT_AES.zip:aes
 DISTFILES+=	XTSTestVectors.zip:aes
 DISTFILES+=	KAT_TDES.zip:des
+DISTFILES+=	ccmtestvectors.zip:mac
 DISTFILES+=	gcmtestvectors.zip:mac
 DISTFILES+=	hmactestvectors.zip:mac
+DISTFILES+=	shabytetestvectors.zip:shs
 
 MAINTAINER=	jmg@FreeBSD.org
-COMMENT=	Collection of NIST's Know Answer Test Vectors
+COMMENT=	Collection of NIST's Known Answer Test Vectors
 
 LICENSE=	PD
 
@@ -25,6 +29,11 @@ EXTRACT_AFTER_ARGS=	-s ":^:nist-kat/$${file%.zip}/:"
 NO_BUILD=
 NO_WRKSUBDIR=
 
+post-extract:
+	# The SHA test distribution already includes a subdir
+	(cd ${WRKSRC}/${PORTNAME} && ${MV} shabytetestvectors tmp && \
+	    ${MV} tmp/shabytetestvectors . && ${RMDIR} tmp)
+
 do-install:
 	${MKDIR} ${STAGEDIR}${LOCALBASE}/share && \
 	(cd ${WRKSRC}/${PORTNAME} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
diff --git a/security/nist-kat/distinfo b/security/nist-kat/distinfo
index 556882dc28ce..f9305ad38b3a 100644
--- a/security/nist-kat/distinfo
+++ b/security/nist-kat/distinfo
@@ -1,10 +1,15 @@
+TIMESTAMP = 1554766249
 SHA256 (KAT_AES.zip) = a203b16c9246b2ebae31dee5de21a606be80cf78ceabaca37150236fa098eb60
 SIZE (KAT_AES.zip) = 726299
 SHA256 (XTSTestVectors.zip) = 67bb04b018182f65530596786e7783f817d2e56509bf3b1f066609b8e3e29c36
 SIZE (XTSTestVectors.zip) = 595731
 SHA256 (KAT_TDES.zip) = 640e1df29f0f9e60b756e34870658fc785c706a170e1366eee58f115d3ce3905
 SIZE (KAT_TDES.zip) = 115770
+SHA256 (ccmtestvectors.zip) = 0e3c96761bd8f1a0b4dfe666146c32f7d367a49968375ff091b8da9ecaa673aa
+SIZE (ccmtestvectors.zip) = 319267
 SHA256 (gcmtestvectors.zip) = f9fc479e134cde2980b3bb7cddbcb567b2cd96fd753835243ed067699f26a023
 SIZE (gcmtestvectors.zip) = 9154174
 SHA256 (hmactestvectors.zip) = 418c3837d38f249d6668146bd0090db24dd3c02d2e6797e3de33860a387ae4bd
 SIZE (hmactestvectors.zip) = 452025
+SHA256 (shabytetestvectors.zip) = 929ef80b7b3418aca026643f6f248815913b60e01741a44bba9e118067f4c9b8
+SIZE (shabytetestvectors.zip) = 4909729
diff --git a/security/nist-kat/pkg-plist b/security/nist-kat/pkg-plist
index efd52bcc9ae8..f02790d3ba0a 100644
--- a/security/nist-kat/pkg-plist
+++ b/security/nist-kat/pkg-plist
@@ -130,6 +130,25 @@
 %%DATADIR%%/XTSTestVectors/format tweak value input - 128 hex str/XTSGenAES256.rsp
 %%DATADIR%%/XTSTestVectors/format tweak value input - data unit seq no/XTSGenAES128.rsp
 %%DATADIR%%/XTSTestVectors/format tweak value input - data unit seq no/XTSGenAES256.rsp
+%%DATADIR%%/ccmtestvectors/DVPT128.rsp
+%%DATADIR%%/ccmtestvectors/DVPT128.txt
+%%DATADIR%%/ccmtestvectors/DVPT192.rsp
+%%DATADIR%%/ccmtestvectors/DVPT192.txt
+%%DATADIR%%/ccmtestvectors/DVPT256.rsp
+%%DATADIR%%/ccmtestvectors/DVPT256.txt
+%%DATADIR%%/ccmtestvectors/Readme.txt
+%%DATADIR%%/ccmtestvectors/VADT128.rsp
+%%DATADIR%%/ccmtestvectors/VADT192.rsp
+%%DATADIR%%/ccmtestvectors/VADT256.rsp
+%%DATADIR%%/ccmtestvectors/VNT128.rsp
+%%DATADIR%%/ccmtestvectors/VNT192.rsp
+%%DATADIR%%/ccmtestvectors/VNT256.rsp
+%%DATADIR%%/ccmtestvectors/VPT128.rsp
+%%DATADIR%%/ccmtestvectors/VPT192.rsp
+%%DATADIR%%/ccmtestvectors/VPT256.rsp
+%%DATADIR%%/ccmtestvectors/VTT128.rsp
+%%DATADIR%%/ccmtestvectors/VTT192.rsp
+%%DATADIR%%/ccmtestvectors/VTT256.rsp
 %%DATADIR%%/gcmtestvectors/gcmDecrypt128.rsp
 %%DATADIR%%/gcmtestvectors/gcmDecrypt192.rsp
 %%DATADIR%%/gcmtestvectors/gcmDecrypt256.rsp
@@ -137,3 +156,32 @@
 %%DATADIR%%/gcmtestvectors/gcmEncryptExtIV192.rsp
 %%DATADIR%%/gcmtestvectors/gcmEncryptExtIV256.rsp
 %%DATADIR%%/hmactestvectors/HMAC.rsp
+%%DATADIR%%/shabytetestvectors/Readme.txt
+%%DATADIR%%/shabytetestvectors/SHA1LongMsg.rsp
+%%DATADIR%%/shabytetestvectors/SHA1Monte.rsp
+%%DATADIR%%/shabytetestvectors/SHA1Monte.txt
+%%DATADIR%%/shabytetestvectors/SHA1ShortMsg.rsp
+%%DATADIR%%/shabytetestvectors/SHA224LongMsg.rsp
+%%DATADIR%%/shabytetestvectors/SHA224Monte.rsp
+%%DATADIR%%/shabytetestvectors/SHA224Monte.txt
+%%DATADIR%%/shabytetestvectors/SHA224ShortMsg.rsp
+%%DATADIR%%/shabytetestvectors/SHA256LongMsg.rsp
+%%DATADIR%%/shabytetestvectors/SHA256Monte.rsp
+%%DATADIR%%/shabytetestvectors/SHA256Monte.txt
+%%DATADIR%%/shabytetestvectors/SHA256ShortMsg.rsp
+%%DATADIR%%/shabytetestvectors/SHA384LongMsg.rsp
+%%DATADIR%%/shabytetestvectors/SHA384Monte.rsp
+%%DATADIR%%/shabytetestvectors/SHA384Monte.txt
+%%DATADIR%%/shabytetestvectors/SHA384ShortMsg.rsp
+%%DATADIR%%/shabytetestvectors/SHA512LongMsg.rsp
+%%DATADIR%%/shabytetestvectors/SHA512Monte.rsp
+%%DATADIR%%/shabytetestvectors/SHA512Monte.txt
+%%DATADIR%%/shabytetestvectors/SHA512ShortMsg.rsp
+%%DATADIR%%/shabytetestvectors/SHA512_224LongMsg.rsp
+%%DATADIR%%/shabytetestvectors/SHA512_224Monte.rsp
+%%DATADIR%%/shabytetestvectors/SHA512_224Monte.txt
+%%DATADIR%%/shabytetestvectors/SHA512_224ShortMsg.rsp
+%%DATADIR%%/shabytetestvectors/SHA512_256LongMsg.rsp
+%%DATADIR%%/shabytetestvectors/SHA512_256Monte.rsp
+%%DATADIR%%/shabytetestvectors/SHA512_256Monte.txt
+%%DATADIR%%/shabytetestvectors/SHA512_256ShortMsg.rsp