svn commit: r348015 - user/ngie/bug-237403/tests/sys/opencrypto

[Enji Cooper]

Author: ngie
Date: Mon May 20 22:02:54 2019
New Revision: 348015
URL: https://svnweb.freebsd.org/changeset/base/348015

Log:
  Apply r346610 to `self.runSHA` to unbreak the test(s)

Modified:
  user/ngie/bug-237403/tests/sys/opencrypto/cryptotest.py

Modified: user/ngie/bug-237403/tests/sys/opencrypto/cryptotest.py
==============================================================================
--- user/ngie/bug-237403/tests/sys/opencrypto/cryptotest.py	Mon May 20 21:55:45 2019	(r348014)
+++ user/ngie/bug-237403/tests/sys/opencrypto/cryptotest.py	Mon May 20 22:02:54 2019	(r348015)
@@ -381,9 +381,12 @@ def GenTestCase(cname):
             # Skip SHA512_(224|256) tests
             if fname.find('SHA512_') != -1:
                 return
+            columns = [ 'Len', 'Msg', 'MD' ]
+            with cryptodev.KATParser(fname, columns) as parser:
+                self.runSHAWithParser(parser)
 
-            for hashlength, lines in cryptodev.KATParser(fname,
-                [ 'Len', 'Msg', 'MD' ]):
+        def runSHAWithParser(self, parser):
+            for hashlength, lines in next(parser):
                 # E.g., hashlength will be "L=20" (bytes)
                 hashlen = int(hashlength.split("=")[1])