1 files changed, 135 insertions, 27 deletions
diff --git a/usr/src/pkg/manifests/system-test-cryptotest.mf b/usr/src/pkg/manifests/system-test-cryptotest.mf
index d480522d8b..9b4d8153b9 100644
--- a/usr/src/pkg/manifests/system-test-cryptotest.mf
+++ b/usr/src/pkg/manifests/system-test-cryptotest.mf
@@ -13,7 +13,7 @@
 # Copyright (c) 2012 by Delphix. All rights reserved.
 # Copyright 2014, OmniTI Computer Consulting, Inc. All rights reserved.
 # Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
-# Copyright 2018, Joyent, Inc.
+# Copyright 2019 Joyent, Inc.
 #
 
 set name=pkg.fmri value=pkg:/system/test/cryptotest@$(PKGVERS)
@@ -26,38 +26,146 @@ dir path=opt/crypto-tests
 dir path=opt/crypto-tests/bin
 dir path=opt/crypto-tests/runfiles
 dir path=opt/crypto-tests/tests
+dir path=opt/crypto-tests/tests/aes group=root mode=0755 owner=root
+dir path=opt/crypto-tests/tests/aes/kcf group=root mode=0755 owner=root
+dir path=opt/crypto-tests/tests/aes/pkcs group=root mode=0755 owner=root
 dir path=opt/crypto-tests/tests/digest
 dir path=opt/crypto-tests/tests/digest/kcf
 dir path=opt/crypto-tests/tests/digest/pkcs
-dir path=opt/crypto-tests/tests/kcf
-dir path=opt/crypto-tests/tests/kcf/aes
-dir path=opt/crypto-tests/tests/pkcs
-dir path=opt/crypto-tests/tests/pkcs/aes
 file path=opt/crypto-tests/README mode=0444
 file path=opt/crypto-tests/bin/cryptotest mode=0555
 file path=opt/crypto-tests/runfiles/default.run mode=0444
-file path=opt/crypto-tests/tests/digest/kcf/sha1 mode=0555
-file path=opt/crypto-tests/tests/digest/kcf/sha256 mode=0555
-file path=opt/crypto-tests/tests/digest/kcf/sha384 mode=0555
-file path=opt/crypto-tests/tests/digest/kcf/sha512 mode=0555
-file path=opt/crypto-tests/tests/digest/pkcs/sha1 mode=0555
-file path=opt/crypto-tests/tests/digest/pkcs/sha256 mode=0555
-file path=opt/crypto-tests/tests/digest/pkcs/sha384 mode=0555
-file path=opt/crypto-tests/tests/digest/pkcs/sha512 mode=0555
-file path=opt/crypto-tests/tests/kcf/aes/aes_cbc mode=0555
-file path=opt/crypto-tests/tests/kcf/aes/aes_ccm mode=0555
-file path=opt/crypto-tests/tests/kcf/aes/aes_cmac mode=0555
-file path=opt/crypto-tests/tests/kcf/aes/aes_ctr mode=0555
-file path=opt/crypto-tests/tests/kcf/aes/aes_ecb mode=0555
-file path=opt/crypto-tests/tests/kcf/aes/aes_gcm mode=0555
-file path=opt/crypto-tests/tests/kcf/aes/cleanup mode=0555
-file path=opt/crypto-tests/tests/kcf/aes/setup mode=0555
-file path=opt/crypto-tests/tests/pkcs/aes/aes_cbc mode=0555
-file path=opt/crypto-tests/tests/pkcs/aes/aes_ccm mode=0555
-file path=opt/crypto-tests/tests/pkcs/aes/aes_cmac mode=0555
-file path=opt/crypto-tests/tests/pkcs/aes/aes_ctr mode=0555
-file path=opt/crypto-tests/tests/pkcs/aes/aes_ecb mode=0555
-file path=opt/crypto-tests/tests/pkcs/aes/aes_gcm mode=0555
+file opt/crypto-tests/tests/aes/kcf/aes_cbc_32 \
+    path=opt/crypto-tests/tests/aes/kcf/aes_cbc_32 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/aes/kcf/aes_cbc_64 \
+    path=opt/crypto-tests/tests/aes/kcf/aes_cbc_64 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/aes/kcf/aes_ccm_32 \
+    path=opt/crypto-tests/tests/aes/kcf/aes_ccm_32 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/aes/kcf/aes_ccm_64 \
+    path=opt/crypto-tests/tests/aes/kcf/aes_ccm_64 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/aes/kcf/aes_cmac_32 \
+    path=opt/crypto-tests/tests/aes/kcf/aes_cmac_32 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/aes/kcf/aes_cmac_64 \
+    path=opt/crypto-tests/tests/aes/kcf/aes_cmac_64 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/aes/kcf/aes_ctr_32 \
+    path=opt/crypto-tests/tests/aes/kcf/aes_ctr_32 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/aes/kcf/aes_ctr_64 \
+    path=opt/crypto-tests/tests/aes/kcf/aes_ctr_64 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/aes/kcf/aes_ecb_32 \
+    path=opt/crypto-tests/tests/aes/kcf/aes_ecb_32 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/aes/kcf/aes_ecb_64 \
+    path=opt/crypto-tests/tests/aes/kcf/aes_ecb_64 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/aes/kcf/aes_gcm_32 \
+    path=opt/crypto-tests/tests/aes/kcf/aes_gcm_32 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/aes/kcf/aes_gcm_64 \
+    path=opt/crypto-tests/tests/aes/kcf/aes_gcm_64 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/aes/kcf/cleanup \
+    path=opt/crypto-tests/tests/aes/kcf/cleanup group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/aes/kcf/setup \
+    path=opt/crypto-tests/tests/aes/kcf/setup group=root mode=0555 owner=root
+file opt/crypto-tests/tests/aes/pkcs/aes_cbc_32 \
+    path=opt/crypto-tests/tests/aes/pkcs/aes_cbc_32 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/aes/pkcs/aes_cbc_64 \
+    path=opt/crypto-tests/tests/aes/pkcs/aes_cbc_64 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/aes/pkcs/aes_ccm_32 \
+    path=opt/crypto-tests/tests/aes/pkcs/aes_ccm_32 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/aes/pkcs/aes_ccm_64 \
+    path=opt/crypto-tests/tests/aes/pkcs/aes_ccm_64 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/aes/pkcs/aes_cmac_32 \
+    path=opt/crypto-tests/tests/aes/pkcs/aes_cmac_32 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/aes/pkcs/aes_cmac_64 \
+    path=opt/crypto-tests/tests/aes/pkcs/aes_cmac_64 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/aes/pkcs/aes_ctr_32 \
+    path=opt/crypto-tests/tests/aes/pkcs/aes_ctr_32 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/aes/pkcs/aes_ctr_64 \
+    path=opt/crypto-tests/tests/aes/pkcs/aes_ctr_64 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/aes/pkcs/aes_ecb_32 \
+    path=opt/crypto-tests/tests/aes/pkcs/aes_ecb_32 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/aes/pkcs/aes_ecb_64 \
+    path=opt/crypto-tests/tests/aes/pkcs/aes_ecb_64 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/aes/pkcs/aes_gcm_32 \
+    path=opt/crypto-tests/tests/aes/pkcs/aes_gcm_32 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/aes/pkcs/aes_gcm_64 \
+    path=opt/crypto-tests/tests/aes/pkcs/aes_gcm_64 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/digest/kcf/cleanup \
+    path=opt/crypto-tests/tests/digest/kcf/cleanup group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/digest/kcf/setup \
+    path=opt/crypto-tests/tests/digest/kcf/setup group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/digest/kcf/sha1_32 \
+    path=opt/crypto-tests/tests/digest/kcf/sha1_32 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/digest/kcf/sha1_64 \
+    path=opt/crypto-tests/tests/digest/kcf/sha1_64 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/digest/kcf/sha256_32 \
+    path=opt/crypto-tests/tests/digest/kcf/sha256_32 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/digest/kcf/sha256_64 \
+    path=opt/crypto-tests/tests/digest/kcf/sha256_64 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/digest/kcf/sha384_32 \
+    path=opt/crypto-tests/tests/digest/kcf/sha384_32 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/digest/kcf/sha384_64 \
+    path=opt/crypto-tests/tests/digest/kcf/sha384_64 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/digest/kcf/sha512_32 \
+    path=opt/crypto-tests/tests/digest/kcf/sha512_32 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/digest/kcf/sha512_64 \
+    path=opt/crypto-tests/tests/digest/kcf/sha512_64 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/digest/pkcs/sha1_32 \
+    path=opt/crypto-tests/tests/digest/pkcs/sha1_32 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/digest/pkcs/sha1_64 \
+    path=opt/crypto-tests/tests/digest/pkcs/sha1_64 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/digest/pkcs/sha256_32 \
+    path=opt/crypto-tests/tests/digest/pkcs/sha256_32 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/digest/pkcs/sha256_64 \
+    path=opt/crypto-tests/tests/digest/pkcs/sha256_64 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/digest/pkcs/sha384_32 \
+    path=opt/crypto-tests/tests/digest/pkcs/sha384_32 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/digest/pkcs/sha384_64 \
+    path=opt/crypto-tests/tests/digest/pkcs/sha384_64 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/digest/pkcs/sha512_32 \
+    path=opt/crypto-tests/tests/digest/pkcs/sha512_32 group=root mode=0555 \
+    owner=root
+file opt/crypto-tests/tests/digest/pkcs/sha512_64 \
+    path=opt/crypto-tests/tests/digest/pkcs/sha512_64 group=root mode=0555 \
+    owner=root
 license cr_Sun license=cr_Sun
 license lic_CDDL license=lic_CDDL
 depend fmri=driver/crypto/dprov type=require