svn commit: r323869 - head/tests/sys/opencrypto

[Conrad Meyer]

Author: cem
Date: Thu Sep 21 18:06:21 2017
New Revision: 323869
URL: https://svnweb.freebsd.org/changeset/base/323869

Log:
  cryptotest.py: Do not run AES-CBC or AES-GCM tests on non-AES crypto(4) drivers
  
  For some reason, we only skipped AES-XTS tests if a driver was not in the
  aesmodules list.  Skip other AES modes as well to prevent spurious failures
  in non-AES drivers.
  
  Sponsored by:	Dell EMC Isilon

Modified:
  head/tests/sys/opencrypto/cryptotest.py

Modified: head/tests/sys/opencrypto/cryptotest.py
==============================================================================
--- head/tests/sys/opencrypto/cryptotest.py	Thu Sep 21 15:32:41 2017	(r323868)
+++ head/tests/sys/opencrypto/cryptotest.py	Thu Sep 21 18:06:21 2017	(r323869)
@@ -62,10 +62,12 @@ def GenTestCase(cname):
 			for i in katg('XTSTestVectors/format tweak value input - data unit seq no', '*.rsp'):
 				self.runXTS(i, cryptodev.CRYPTO_AES_XTS)
 
+		@unittest.skipIf(cname not in aesmodules, 'skipping AES on %s' % `cname`)
 		def test_cbc(self):
 			for i in katg('KAT_AES', 'CBC[GKV]*.rsp'):
 				self.runCBC(i)
 
+		@unittest.skipIf(cname not in aesmodules, 'skipping AES on %s' % `cname`)
 		def test_gcm(self):
 			for i in katg('gcmtestvectors', 'gcmEncrypt*'):
 				self.runGCM(i, 'ENCRYPT')