From owner-svn-src-user@freebsd.org Mon May 20 22:02:55 2019
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9F36015940F4
for <svn-src-user@mailman.ysv.freebsd.org>;
Mon, 20 May 2019 22:02:55 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
[IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
server-signature RSA-PSS (4096 bits)
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org",
Issuer "Let's Encrypt Authority X3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4340094E45;
Mon, 20 May 2019 22:02:55 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
[IPv6:2610:1c1:1:6068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 185EC24702;
Mon, 20 May 2019 22:02:55 +0000 (UTC)
(envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x4KM2sn6004901;
Mon, 20 May 2019 22:02:54 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
by repo.freebsd.org (8.15.2/8.15.2/Submit) id x4KM2sZj004900;
Mon, 20 May 2019 22:02:54 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201905202202.x4KM2sZj004900@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
ngie@FreeBSD.org using -f
From: Enji Cooper <ngie@FreeBSD.org>
Date: Mon, 20 May 2019 22:02:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r348015 - user/ngie/bug-237403/tests/sys/opencrypto
X-SVN-Group: user
X-SVN-Commit-Author: ngie
X-SVN-Commit-Paths: user/ngie/bug-237403/tests/sys/opencrypto
X-SVN-Commit-Revision: 348015
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-Rspamd-Queue-Id: 4340094E45
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-2.99 / 15.00];
local_wl_from(0.00)[FreeBSD.org];
NEURAL_HAM_MEDIUM(-1.00)[-0.999,0];
NEURAL_HAM_SHORT(-0.99)[-0.986,0];
ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US];
NEURAL_HAM_LONG(-1.00)[-1.000,0]
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user/>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 20 May 2019 22:02:55 -0000
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])