From owner-svn-src-user@freebsd.org Sat Apr 20 15:47:58 2019 Return-Path: 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 4C2E71590CEA for ; Sat, 20 Apr 2019 15:47:58 +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 E391D95C05; Sat, 20 Apr 2019 15:47:57 +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 9B77E1831F; Sat, 20 Apr 2019 15:47:57 +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 x3KFlvQ8038664; Sat, 20 Apr 2019 15:47:57 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3KFlvXU038663; Sat, 20 Apr 2019 15:47:57 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201904201547.x3KFlvXU038663@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Sat, 20 Apr 2019 15:47:57 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r346444 - user/ngie/bug-237403 X-SVN-Group: user X-SVN-Commit-Author: ngie X-SVN-Commit-Paths: user/ngie/bug-237403 X-SVN-Commit-Revision: 346444 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E391D95C05 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.982,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Apr 2019 15:47:58 -0000 Author: ngie Date: Sat Apr 20 15:47:57 2019 New Revision: 346444 URL: https://svnweb.freebsd.org/changeset/base/346444 Log: Quick branch for hacking on getting python3 support to work for tests/sys/opencrypto This branch will also convert the test from plain to TAP for improved introspection. Bug 237403 Added: - copied from r346443, head/ Directory Properties: user/ngie/bug-237403/ (props changed) From owner-svn-src-user@freebsd.org Sat Apr 20 16:01:05 2019 Return-Path: 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 9DC29156B8F3 for ; Sat, 20 Apr 2019 16:01:05 +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 1CFD3967A3; Sat, 20 Apr 2019 16:01:05 +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 D2FFB18500; Sat, 20 Apr 2019 16:01:04 +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 x3KG14oX046363; Sat, 20 Apr 2019 16:01:04 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3KG14c2046361; Sat, 20 Apr 2019 16:01:04 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201904201601.x3KG14c2046361@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Sat, 20 Apr 2019 16:01:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r346446 - 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: 346446 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1CFD3967A3 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.984,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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Apr 2019 16:01:05 -0000 Author: ngie Date: Sat Apr 20 16:01:04 2019 New Revision: 346446 URL: https://svnweb.freebsd.org/changeset/base/346446 Log: Hack away at runtests - Do not rely on local copy of dpkt module. Rely on py-dpkt, instead. The reason for this is that this removes the need for introducing localized fixes to dpkt.py, as upstream has changed significantly in the last few years, and now supports both python 2.x and python 3. - Convert tests to TAP format. This adds improved introspection, as the plain tests have little to no introspection, and kyua lacks python unittest engine support. As such, remove `set -ex`, as it would impede being able to run this test with TAP cleanly. Deleted: user/ngie/bug-237403/tests/sys/opencrypto/dpkt.py Modified: user/ngie/bug-237403/tests/sys/opencrypto/Makefile user/ngie/bug-237403/tests/sys/opencrypto/runtests.sh Modified: user/ngie/bug-237403/tests/sys/opencrypto/Makefile ============================================================================== --- user/ngie/bug-237403/tests/sys/opencrypto/Makefile Sat Apr 20 15:57:05 2019 (r346445) +++ user/ngie/bug-237403/tests/sys/opencrypto/Makefile Sat Apr 20 16:01:04 2019 (r346446) @@ -12,12 +12,12 @@ CFLAGS.poly1305_test.c += -I${SRCTOP}/sys/opencrypto ATF_TESTS_C+= blake2_test poly1305_test -PLAIN_TESTS_SH= runtests +TAP_TESTS_SH+= runtests -TEST_METADATA.runtests+= required_programs="python2" +TEST_METADATA.runtests+= required_programs="python" TEST_METADATA.runtests+= required_user="root" -PYMODULES= cryptodev.py cryptodevh.py cryptotest.py dpkt.py +PYMODULES= cryptodev.py cryptodevh.py cryptotest.py ${PACKAGE}FILES+= ${PYMODULES} Modified: user/ngie/bug-237403/tests/sys/opencrypto/runtests.sh ============================================================================== --- user/ngie/bug-237403/tests/sys/opencrypto/runtests.sh Sat Apr 20 15:57:05 2019 (r346445) +++ user/ngie/bug-237403/tests/sys/opencrypto/runtests.sh Sat Apr 20 16:01:04 2019 (r346446) @@ -29,13 +29,18 @@ # $FreeBSD$ # -set -ex +: ${PYTHON=python} if [ ! -d /usr/local/share/nist-kat ]; then - echo 'Skipping, nist-kat package not installed for test vectors.' + echo "1..0 # SKIP: nist-kat package not installed for test vectors" exit 0 fi +if ! $PYTHON -c "from dpkt import dpkt"; then + echo "1..0 # SKIP: py-dpkt package not installed" + exit 0 +fi + loaded_modules= cleanup_tests() { @@ -52,7 +57,11 @@ trap cleanup_tests EXIT INT TERM for required_module in nexus/aesni cryptodev; do if ! kldstat -q -m $required_module; then - kldload ${required_module#nexus/} + module_to_load=${required_module#nexus/} + if ! kldload ${module_to_load}; then + echo "1..0 # SKIP: could not load ${module_to_load}" + exit 0 + fi loaded_modules="$loaded_modules $required_module" fi done @@ -61,6 +70,11 @@ done oldcdas=$(sysctl -e kern.cryptodevallowsoft) sysctl kern.cryptodevallowsoft=1 -python2 $(dirname $0)/cryptotest.py +echo "1..1" +if "$PYTHON" $(dirname $0)/cryptotest.py; then + echo "ok 1" +else + echo "not ok 1" +fi sysctl "$oldcdas" From owner-svn-src-user@freebsd.org Sat Apr 20 16:05:06 2019 Return-Path: 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 D93B1156BA0C for ; Sat, 20 Apr 2019 16:05:05 +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 7818096C95; Sat, 20 Apr 2019 16:05:05 +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 526D21867E; Sat, 20 Apr 2019 16:05:05 +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 x3KG55vI051304; Sat, 20 Apr 2019 16:05:05 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3KG55Q2051303; Sat, 20 Apr 2019 16:05:05 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201904201605.x3KG55Q2051303@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Sat, 20 Apr 2019 16:05:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r346447 - 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: 346447 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 7818096C95 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.984,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Apr 2019 16:05:06 -0000 Author: ngie Date: Sat Apr 20 16:05:04 2019 New Revision: 346447 URL: https://svnweb.freebsd.org/changeset/base/346447 Log: Use py3 compatible method for catching exceptions Now ancient versions of python used to support catching exceptions in the form `except Exception, exception_object`. This support was removed in py3 (and introduced preemptively in earlier 2.x versions), being replaced by the form `except Exception as exception_object`. 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 Sat Apr 20 16:01:04 2019 (r346446) +++ user/ngie/bug-237403/tests/sys/opencrypto/cryptotest.py Sat Apr 20 16:05:04 2019 (r346447) @@ -113,7 +113,7 @@ def GenTestCase(cname): cipherkey, mac=self._gmacsizes[len(cipherkey)], mackey=cipherkey, crid=crid) - except EnvironmentError, e: + except EnvironmentError as e: # Can't test algorithms the driver does not support. if e.errno != errno.EOPNOTSUPP: raise @@ -122,7 +122,7 @@ def GenTestCase(cname): if mode == 'ENCRYPT': try: rct, rtag = c.encrypt(pt, iv, aad) - except EnvironmentError, e: + except EnvironmentError as e: # Can't test inputs the driver does not support. if e.errno != errno.EINVAL: raise @@ -142,7 +142,7 @@ def GenTestCase(cname): else: try: rpt, rtag = c.decrypt(*args) - except EnvironmentError, e: + except EnvironmentError as e: # Can't test inputs the driver does not support. if e.errno != errno.EINVAL: raise @@ -210,7 +210,7 @@ def GenTestCase(cname): try: c = Crypto(meth, cipherkey, crid=crid) r = curfun(c, pt, iv) - except EnvironmentError, e: + except EnvironmentError as e: # Can't test hashes the driver does not support. if e.errno != errno.EOPNOTSUPP: raise @@ -309,7 +309,7 @@ def GenTestCase(cname): try: c = Crypto(mac=alg, mackey=key, crid=crid) - except EnvironmentError, e: + except EnvironmentError as e: # Can't test hashes the driver does not support. if e.errno != errno.EOPNOTSUPP: raise From owner-svn-src-user@freebsd.org Sat Apr 20 16:07:49 2019 Return-Path: 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 23580156BB08 for ; Sat, 20 Apr 2019 16:07:49 +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 B5B8C96EB3; Sat, 20 Apr 2019 16:07:48 +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 920AE18689; Sat, 20 Apr 2019 16:07:48 +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 x3KG7mtA051489; Sat, 20 Apr 2019 16:07:48 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3KG7m4A051487; Sat, 20 Apr 2019 16:07:48 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201904201607.x3KG7m4A051487@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Sat, 20 Apr 2019 16:07:48 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r346449 - 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: 346449 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: B5B8C96EB3 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.985,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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Apr 2019 16:07:49 -0000 Author: ngie Date: Sat Apr 20 16:07:47 2019 New Revision: 346449 URL: https://svnweb.freebsd.org/changeset/base/346449 Log: Replace `str.{decode,encode}("hex")` with binascii.(un)?hexlify Encoding/decoding base_string objects as "hex" was removed in py3 and replaced with other methods, one being `binascii.(un)?hexlify`. Modified: user/ngie/bug-237403/tests/sys/opencrypto/cryptodev.py user/ngie/bug-237403/tests/sys/opencrypto/cryptotest.py Modified: user/ngie/bug-237403/tests/sys/opencrypto/cryptodev.py ============================================================================== --- user/ngie/bug-237403/tests/sys/opencrypto/cryptodev.py Sat Apr 20 16:07:29 2019 (r346448) +++ user/ngie/bug-237403/tests/sys/opencrypto/cryptodev.py Sat Apr 20 16:07:47 2019 (r346449) @@ -1,8 +1,9 @@ -#!/usr/local/bin/python2 +#!/usr/bin/env python # # Copyright (c) 2014 The FreeBSD Foundation # Copyright 2014 John-Mark Gurney # All rights reserved. +# Copyright 2019 Enji Cooper # # This software was developed by John-Mark Gurney under # the sponsorship from the FreeBSD Foundation. @@ -32,12 +33,15 @@ from __future__ import print_function import array -import dpkt from fcntl import ioctl import os +import random import signal from struct import pack as _pack +import time +import dpkt + from cryptodevh import * __all__ = [ 'Crypto', 'MismatchError', ] @@ -116,10 +120,12 @@ CIOCFINDDEV = 3223610220 CIOCCRYPTAEAD = 3225445229 def _getdev(): - fd = os.open('/dev/crypto', os.O_RDWR) buf = array.array('I', [0]) - ioctl(fd, CRIOGET, buf, 1) - os.close(fd) + fd = os.open('/dev/crypto', os.O_RDWR) + try: + ioctl(fd, CRIOGET, buf, 1) + finally: + os.close(fd) return buf[0] @@ -128,13 +134,13 @@ _cryptodev = _getdev() def _findop(crid, name): fop = FindOp() fop.crid = crid - fop.name = name + fop.name = name.encode("ascii") s = array.array('B', fop.pack_hdr()) ioctl(_cryptodev, CIOCFINDDEV, s, 1) fop.unpack(s) try: - idx = fop.name.index('\x00') + idx = fop.name.index(b'\x00') name = fop.name[:idx] except ValueError: name = fop.name @@ -223,10 +229,10 @@ class Crypto: caead.flags = CRD_F_IV_EXPLICIT caead.flags = 0 caead.len = len(src) - s = array.array('B', src) + s = array.array('B', src.encode("ascii")) caead.src = caead.dst = s.buffer_info()[0] caead.aadlen = len(aad) - saad = array.array('B', aad) + saad = array.array('B', aad.encode("ascii")) caead.aad = saad.buffer_info()[0] if self._maclen is None: @@ -237,7 +243,7 @@ class Crypto: else: assert len(tag) == self._maclen, \ '%d != %d' % (len(tag), self._maclen) - tag = array.array('B', tag) + tag = array.array('B', tag.encode("ascii")) caead.tag = tag.buffer_info()[0] @@ -252,11 +258,9 @@ class Crypto: return s, tag.tostring() def perftest(self, op, size, timeo=3): - import random - import time inp = array.array('B', (random.randint(0, 255) for x in xrange(size))) - out = array.array('B', inp) + out = array.array('B', inp.encode("ascii")) # prep ioctl cop = CryptOp() @@ -264,7 +268,7 @@ class Crypto: cop.op = op cop.flags = 0 cop.len = len(inp) - s = array.array('B', inp) + s = array.array('B', inp.encode("ascii")) cop.src = s.buffer_info()[0] cop.dst = out.buffer_info()[0] if self._maclen is not None: Modified: user/ngie/bug-237403/tests/sys/opencrypto/cryptotest.py ============================================================================== --- user/ngie/bug-237403/tests/sys/opencrypto/cryptotest.py Sat Apr 20 16:07:29 2019 (r346448) +++ user/ngie/bug-237403/tests/sys/opencrypto/cryptotest.py Sat Apr 20 16:07:47 2019 (r346449) @@ -30,6 +30,8 @@ # from __future__ import print_function + +import binascii import errno import cryptodev import itertools @@ -96,13 +98,13 @@ def GenTestCase(cname): [ 'Count', 'Key', 'IV', 'CT', 'AAD', 'Tag', 'PT', ]): for data in lines: curcnt = int(data['Count']) - cipherkey = data['Key'].decode('hex') - iv = data['IV'].decode('hex') - aad = data['AAD'].decode('hex') - tag = data['Tag'].decode('hex') + cipherkey = binascii.unhexlify(data['Key']) + iv = binascii.unhexlify(data['IV']) + aad = binascii.unhexlify(data['AAD']) + tag = binascii.unhexlify(data['Tag']) if 'FAIL' not in data: - pt = data['PT'].decode('hex') - ct = data['CT'].decode('hex') + pt = binascii.unhexlify(data['PT']) + ct = binascii.unhexlify(data['CT']) if len(iv) != 12: # XXX - isn't supported @@ -128,8 +130,8 @@ def GenTestCase(cname): raise continue rtag = rtag[:len(tag)] - data['rct'] = rct.encode('hex') - data['rtag'] = rtag.encode('hex') + data['rct'] = binascii.hexlify(rct) + data['rtag'] = binascii.hexlify(rtag) self.assertEqual(rct, ct, repr(data)) self.assertEqual(rtag, tag, repr(data)) else: @@ -147,8 +149,8 @@ def GenTestCase(cname): if e.errno != errno.EINVAL: raise continue - data['rpt'] = rpt.encode('hex') - data['rtag'] = rtag.encode('hex') + data['rpt'] = binascii.unhexlify(rpt) + data['rtag'] = binascii.unhexlify(rtag) self.assertEqual(rpt, pt, repr(data)) @@ -167,10 +169,10 @@ def GenTestCase(cname): for data in lines: curcnt = int(data['COUNT']) - cipherkey = data['KEY'].decode('hex') - iv = data['IV'].decode('hex') - pt = data['PLAINTEXT'].decode('hex') - ct = data['CIPHERTEXT'].decode('hex') + cipherkey = binascii.unhexlify(data['KEY']) + iv = binascii.unhexlify(data['IV']) + pt = binascii.unhexlify(data['PLAINTEXT']) + ct = binascii.unhexlify(data['CIPHERTEXT']) if swapptct: pt, ct = ct, pt @@ -196,10 +198,10 @@ def GenTestCase(cname): for data in lines: curcnt = int(data['COUNT']) nbits = int(data['DataUnitLen']) - cipherkey = data['Key'].decode('hex') + cipherkey = binascii.unhexlify(data['Key']) iv = struct.pack('QQ', int(data['DataUnitSeqNumber']), 0) - pt = data['PT'].decode('hex') - ct = data['CT'].decode('hex') + pt = binascii.unhexlify(data['PT']) + ct = binascii.unhexlify(data['CT']) if nbits % 128 != 0: # XXX - mark as skipped @@ -241,10 +243,10 @@ def GenTestCase(cname): for data in lines: curcnt = int(data['COUNT']) key = data['KEYs'] * 3 - cipherkey = key.decode('hex') - iv = data['IV'].decode('hex') - pt = data['PLAINTEXT'].decode('hex') - ct = data['CIPHERTEXT'].decode('hex') + cipherkey = binascii.unhexlify(key) + iv = binascii.unhexlify(data['IV']) + pt = binascii.unhexlify(data['PLAINTEXT']) + ct = binascii.unhexlify(data['CIPHERTEXT']) if swapptct: pt, ct = ct, pt @@ -298,9 +300,9 @@ def GenTestCase(cname): continue for data in lines: - key = data['Key'].decode('hex') - msg = data['Msg'].decode('hex') - mac = data['Mac'].decode('hex') + key = binascii.unhexlify(data['Key']) + msg = binascii.unhexlify(data['Msg']) + mac = binascii.unhexlify(data['Mac']) tlen = int(data['Tlen']) if len(key) > blocksize: From owner-svn-src-user@freebsd.org Sat Apr 20 16:15:58 2019 Return-Path: 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 65D09156BEA9 for ; Sat, 20 Apr 2019 16:15:58 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pg1-x543.google.com (mail-pg1-x543.google.com [IPv6:2607:f8b0:4864:20::543]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D7DC0972C2; Sat, 20 Apr 2019 16:15:57 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pg1-x543.google.com with SMTP id z9so3938417pgu.10; Sat, 20 Apr 2019 09:15:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=/HPFWCiBZeWNZEHQgT8jvHmx4CXuxcXeqraGeopVWGU=; b=TrDk3TVt/op8BRgVtQ/q5jMplmh7v/VAF23dqVyq3OHA4c3vtL/pWb2ygXof7zr8B6 ERY68JMmC/8J+GlljErybBvHb418VV+LncldW+XCLLH6fXKHV4Vo6eRoiwgklhgpSts+ ZTjPuF8MZRxmHDJ+WeZNVFv+IjFfIofiT/qnRCwKvLv2i/ooJvA6XJ17+50OVN6uRdFR BXIWazySgUGE/XtcxzwwoNsdvc/wnSA9uqg4bNg5V2uTTyzgPQEYRP8fnI/34npc2bg1 NyQhZboJ8sQuQ/SD2gWP3pS85Co1seIVG5wqRTvx2ytgEifqhehI7wpZUXPE1vwlqiQ9 Lvnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=/HPFWCiBZeWNZEHQgT8jvHmx4CXuxcXeqraGeopVWGU=; b=a9KrV5p/2FuP6udwBfBc1b72astbXC2hVyIHVrn30d7ivqoifWUz2PDE8fexbXl5LN Nsg0hKVXOkR107Lvz9/IPtFHauF7FGuJbLCi0GBz6HVCFvykS/Uc98SU8izTf8Pd9Fhq wPJLz8L9xyo7sfWTYOGnnnqekhoQG6CzghDzWZ0K1wVJx4cnqwM0oAFTA/l8fpm97Zqq R3lKNsSZ8ffCyMqgAnqD5sMZ/fwi9cEr9+iSnr4O6sQJfrCOi/tQV22I9t1aiO2joYla kzQ4P3gRXuwaoBHl3HZj6W9A7LYK6cXiQDO+v33yZDyFzfpdTZIjo+/r1rLSeJxjDVH+ o06g== X-Gm-Message-State: APjAAAWm/+PaEAIR1HOcU8gS7Y5dqkBNOSf9nHAziJRb+cHia3f7hjfA uJhMFd3zXMaKZFJzk5zjaOLPKDZghEk= X-Google-Smtp-Source: APXvYqyWn5WsH13KLiqpAWV1JeVWkveL+cA2E5oD4nH9IWc6pdmZcJnYFpoXnPgCffzgd2WV8ednug== X-Received: by 2002:a62:480d:: with SMTP id v13mr10691526pfa.125.1555776956581; Sat, 20 Apr 2019 09:15:56 -0700 (PDT) Received: from [192.168.20.7] (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id h189sm16447158pfc.125.2019.04.20.09.15.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Apr 2019 09:15:55 -0700 (PDT) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 12.2 \(3445.102.3\)) Subject: Re: svn commit: r346449 - user/ngie/bug-237403/tests/sys/opencrypto From: Enji Cooper In-Reply-To: <201904201607.x3KG7m4A051487@repo.freebsd.org> Date: Sat, 20 Apr 2019 09:15:55 -0700 Cc: src-committers@freebsd.org, svn-src-user@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: <201904201607.x3KG7m4A051487@repo.freebsd.org> To: Enji Cooper X-Mailer: Apple Mail (2.3445.102.3) X-Rspamd-Queue-Id: D7DC0972C2 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.98 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.98)[-0.981,0]; REPLY(-4.00)[]; 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Apr 2019 16:15:58 -0000 > On Apr 20, 2019, at 9:07 AM, Enji Cooper wrote: >=20 > Author: ngie > Date: Sat Apr 20 16:07:47 2019 > New Revision: 346449 > URL: https://svnweb.freebsd.org/changeset/base/346449 >=20 > Log: > Replace `str.{decode,encode}("hex")` with binascii.(un)?hexlify >=20 > Encoding/decoding base_string objects as "hex" was removed in py3 and = replaced > with other methods, one being `binascii.(un)?hexlify`. I accidentally introduced other changes in this commit to cryptodev.py. = Summary is as follows: Py3 changed the default text encoding from ascii strings to Unicode = strings, which requires converting a number of code which working = previously with ascii to use byte (ascii binary, e.g., b=E2=80=99' = prefixed) strings. In order to convert between ascii binary and unicode = strings (which some of the dpkt/crypto APIs require), one must use the = .decode/.encode methods, as described in the Unicode guide: = https://docs.python.org/3/howto/unicode.html. This change introduces a work-in-progress item to use .decode/.encode in = cryptodev.py . It=E2=80=99s not 100% complete, so the tests fail when = converting objects to/from str/bytes objects, like shown below. Cheers, -Enji $ sudo kyua debug -k /usr/tests/sys/opencrypto/Kyuafile runtests:main = 2>&1 | less =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ERROR: test_gcm (__main__.GenTestCase..GendCryptoTestCase) ---------------------------------------------------------------------- Traceback (most recent call last): File "/usr/tests/sys/opencrypto/cryptotest.py", line 77, in test_gcm self.runGCM(i, 'ENCRYPT') File "/usr/tests/sys/opencrypto/cryptotest.py", line 126, in runGCM rct, rtag =3D c.encrypt(pt, iv, aad) File "/usr/tests/sys/opencrypto/cryptodev.py", line 305, in encrypt iv) File "/usr/tests/sys/opencrypto/cryptodev.py", line 232, in _doaead s =3D array.array('B', src.encode("ascii")) AttributeError: 'bytes' object has no attribute =E2=80=98encode' ... =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D ERROR: test_gcm (__main__.GenTestCase..GendCryptoTestCase) ---------------------------------------------------------------------- Traceback (most recent call last): File "/usr/tests/sys/opencrypto/cryptotest.py", line 77, in test_gcm self.runGCM(i, 'ENCRYPT') File "/usr/tests/sys/opencrypto/cryptotest.py", line 126, in runGCM rct, rtag =3D c.encrypt(pt, iv, aad) File "/usr/tests/sys/opencrypto/cryptodev.py", line 305, in encrypt iv) File "/usr/tests/sys/opencrypto/cryptodev.py", line 232, in _doaead s =3D array.array('B', src.encode("ascii")) AttributeError: 'bytes' object has no attribute 'encode' From owner-svn-src-user@freebsd.org Sat Apr 20 16:28:07 2019 Return-Path: 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 0EEAA156C401 for ; Sat, 20 Apr 2019 16:28:07 +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 A1CEF97A54; Sat, 20 Apr 2019 16:28:06 +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 7CA7118A00; Sat, 20 Apr 2019 16:28:06 +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 x3KGS6u9062456; Sat, 20 Apr 2019 16:28:06 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3KGS6Yv062455; Sat, 20 Apr 2019 16:28:06 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201904201628.x3KGS6Yv062455@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Enji Cooper Date: Sat, 20 Apr 2019 16:28:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r346451 - 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: 346451 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A1CEF97A54 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.98 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_SHORT(-0.98)[-0.983,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Apr 2019 16:28:07 -0000 Author: ngie Date: Sat Apr 20 16:28:06 2019 New Revision: 346451 URL: https://svnweb.freebsd.org/changeset/base/346451 Log: Fix up `kern.cryptodevallowsoft` handling - Always ensure `kern.cryptodevallowsoft` is unset when completing the tests, otherwise `/dev/crypto` access could remain on after the tests are complete if interrupted. - Check for errors when setting `kern.cryptodevallowsoft`. While this isn't strictly needed in positive cases, it helps when dealing with the myriad of problems that might ensue because `/dev/crypto` doesn't exist when the sysctl isn't enabled. Modified: user/ngie/bug-237403/tests/sys/opencrypto/runtests.sh Modified: user/ngie/bug-237403/tests/sys/opencrypto/runtests.sh ============================================================================== --- user/ngie/bug-237403/tests/sys/opencrypto/runtests.sh Sat Apr 20 16:20:57 2019 (r346450) +++ user/ngie/bug-237403/tests/sys/opencrypto/runtests.sh Sat Apr 20 16:28:06 2019 (r346451) @@ -48,6 +48,10 @@ cleanup_tests() set +e + if [ -n "$oldcdas" ]; then + sysctl "$oldcdas" 2>/dev/null + fi + # Unload modules in reverse order for loaded_module in $(echo $loaded_modules | tr ' ' '\n' | sort -r); do kldunload $loaded_module @@ -66,9 +70,15 @@ for required_module in nexus/aesni cryptodev; do fi done -# Run software crypto test -oldcdas=$(sysctl -e kern.cryptodevallowsoft) -sysctl kern.cryptodevallowsoft=1 +cdas_sysctl=kern.cryptodevallowsoft +if ! oldcdas=$(sysctl -e $cdas_sysctl); then + echo "1..0 # SKIP: could not resolve sysctl: $cdas_sysctl" + exit 0 +fi +if ! sysctl $cdas_sysctl=1; then + echo "1..0 # SKIP: could not enable /dev/crypto access via $cdas_sysctl sysctl." + exit 0 +fi echo "1..1" if "$PYTHON" $(dirname $0)/cryptotest.py; then @@ -76,5 +86,3 @@ if "$PYTHON" $(dirname $0)/cryptotest.py; then else echo "not ok 1" fi - -sysctl "$oldcdas" From owner-svn-src-user@freebsd.org Sat Apr 20 16:28:16 2019 Return-Path: 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 189FF156C419 for ; Sat, 20 Apr 2019 16:28:16 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B0F3097AE9; Sat, 20 Apr 2019 16:28:15 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-3.local (unknown [IPv6:2601:648:8880:1e30:fd9b:9ce6:c8c:cc0]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 38DE21CB60; Sat, 20 Apr 2019 16:28:13 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Subject: Re: svn commit: r346449 - user/ngie/bug-237403/tests/sys/opencrypto To: Enji Cooper , src-committers@freebsd.org, svn-src-user@freebsd.org References: <201904201607.x3KG7m4A051487@repo.freebsd.org> From: John Baldwin Openpgp: preference=signencrypt Autocrypt: addr=jhb@FreeBSD.org; keydata= mQGiBETQ+XcRBADMFybiq69u+fJRy/0wzqTNS8jFfWaBTs5/OfcV7wWezVmf9sgwn8TW0Dk0 c9MBl0pz+H01dA2ZSGZ5fXlmFIsee1WEzqeJzpiwd/pejPgSzXB9ijbLHZ2/E0jhGBcVy5Yo /Tw5+U/+laeYKu2xb0XPvM0zMNls1ah5OnP9a6Ql6wCgupaoMySb7DXm2LHD1Z9jTsHcAQMD /1jzh2BoHriy/Q2s4KzzjVp/mQO5DSm2z14BvbQRcXU48oAosHA1u3Wrov6LfPY+0U1tG47X 1BGfnQH+rNAaH0livoSBQ0IPI/8WfIW7ub4qV6HYwWKVqkDkqwcpmGNDbz3gfaDht6nsie5Z pcuCcul4M9CW7Md6zzyvktjnbz61BADGDCopfZC4of0Z3Ka0u8Wik6UJOuqShBt1WcFS8ya1 oB4rc4tXfSHyMF63aPUBMxHR5DXeH+EO2edoSwViDMqWk1jTnYza51rbGY+pebLQOVOxAY7k do5Ordl3wklBPMVEPWoZ61SdbcjhHVwaC5zfiskcxj5wwXd2E9qYlBqRg7QeSm9obiBCYWxk d2luIDxqaGJARnJlZUJTRC5vcmc+iGAEExECACAFAkTQ+awCGwMGCwkIBwMCBBUCCAMEFgID AQIeAQIXgAAKCRBy3lIGd+N/BI6RAJ9S97fvbME+3hxzE3JUyUZ6vTewDACdE1stFuSfqMvM jomvZdYxIYyTUpC5Ag0ERND5ghAIAPwsO0B7BL+bz8sLlLoQktGxXwXQfS5cInvL17Dsgnr3 1AKa94j9EnXQyPEj7u0d+LmEe6CGEGDh1OcGFTMVrof2ZzkSy4+FkZwMKJpTiqeaShMh+Goj XlwIMDxyADYvBIg3eN5YdFKaPQpfgSqhT+7El7w+wSZZD8pPQuLAnie5iz9C8iKy4/cMSOrH YUK/tO+Nhw8Jjlw94Ik0T80iEhI2t+XBVjwdfjbq3HrJ0ehqdBwukyeJRYKmbn298KOFQVHO EVbHA4rF/37jzaMadK43FgJ0SAhPPF5l4l89z5oPu0b/+5e2inA3b8J3iGZxywjM+Csq1tqz hltEc7Q+E08AAwUIAL+15XH8bPbjNJdVyg2CMl10JNW2wWg2Q6qdljeaRqeR6zFus7EZTwtX sNzs5bP8y51PSUDJbeiy2RNCNKWFMndM22TZnk3GNG45nQd4OwYK0RZVrikalmJY5Q6m7Z16 4yrZgIXFdKj2t8F+x613/SJW1lIr9/bDp4U9tw0V1g3l2dFtD3p3ZrQ3hpoDtoK70ioIAjjH aIXIAcm3FGZFXy503DOA0KaTWwvOVdYCFLm3zWuSOmrX/GsEc7ovasOWwjPn878qVjbUKWwx Q4QkF4OhUV9zPtf9tDSAZ3x7QSwoKbCoRCZ/xbyTUPyQ1VvNy/mYrBcYlzHodsaqUDjHuW+I SQQYEQIACQUCRND5ggIbDAAKCRBy3lIGd+N/BCO8AJ9j1dWVQWxw/YdTbEyrRKOY8YZNwwCf afMAg8QvmOWnHx3wl8WslCaXaE8= Message-ID: <23c35177-f384-7f1f-3e4a-f8badcfac560@FreeBSD.org> Date: Sat, 20 Apr 2019 09:28:11 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <201904201607.x3KG7m4A051487@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: B0F3097AE9 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.95 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.95)[-0.946,0]; REPLY(-4.00)[]; 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Apr 2019 16:28:16 -0000 On 4/20/19 9:07 AM, Enji Cooper wrote: > Author: ngie > Date: Sat Apr 20 16:07:47 2019 > New Revision: 346449 > URL: https://svnweb.freebsd.org/changeset/base/346449 > > Log: > Replace `str.{decode,encode}("hex")` with binascii.(un)?hexlify > > Encoding/decoding base_string objects as "hex" was removed in py3 and replaced > with other methods, one being `binascii.(un)?hexlify`. I have several changes pending in review for these scripts that add new functions, etc. You might want to let those land in head first. I hope to merge them all to head this week. -- John Baldwin From owner-svn-src-user@freebsd.org Sat Apr 20 16:29:41 2019 Return-Path: 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 E1F58156C462 for ; Sat, 20 Apr 2019 16:29:40 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 648BD97C12; Sat, 20 Apr 2019 16:29:40 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: by mail-pl1-x631.google.com with SMTP id f36so3907503plb.5; Sat, 20 Apr 2019 09:29:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=Jxv8QSIDfgKKm7gTSKko5MGCbKN8Vl6QMGjLDk5vtEc=; b=hcp1Fjkn4NHpWUn9XVZ/b3NQTqgoMHHomVJsfn0S7KgejwE6zke3406kwslIXDmXh/ MwsP5UY0bH3/FuIY59inOSoRS+8Z58678jii4DdbMymHVM21MHLNhLQhhUT+VPUz3+xC 1cc7ChiwvgzNk/yC3uCwBvPpa/3Z/5XrAdYLLFTApdRAmTK1q9fqMO8xUJGM880b9/1C QuTFpBgp3SCnjyJx3+iOyKd886hCVjVK0forP6RBjezP391XO8miOw1HMGHVBrsYXVFD u5WML0v8WNXgu0dDwX1BBJ4iG3yRBaUyYoOo/2Urck/dCnJEhnqOxyye2oIRh8i5ZiLJ SP1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=Jxv8QSIDfgKKm7gTSKko5MGCbKN8Vl6QMGjLDk5vtEc=; b=uJsiqsu8DBwcQVfc0fWCJpoVQyMVAjzxsRJA5lEXnUSNIQ4hNuc3guKwJc1Ot6ncL5 s+sVamZgBV0Lrqvtc0iFRfz03Ub6ULACDa66x5SWwAM2sBJ4AKDaQ8dNpRePp4/UirHF W3ZIveCrPDh+9enizZ4slk0fiGA8Yzd9fO6hEcu2BXPkqh8xLA1vNsi/8VpIscxYJXf8 feX2NdkDYmErlMekDWumTyqnsC0hwKKqw/HnXIsOmXTmOsnYq3iHce+/bV2DbIml9jxL n1uAGv23Jro+tZDNBd0sWTmwT4tIgqHcoMOWcJQcexIpHyU5W8nLGwGtWNmjKxIUNyjM BXOQ== X-Gm-Message-State: APjAAAV0CL0Pdq3hB4cV9dCHfVg6U4on28UDWyaPXcqhWiQ3lVTrKw2a 0xboVOSE31UjuL6/00LbDfrZmttYuOc= X-Google-Smtp-Source: APXvYqwMR8Tel88CX0mMZHd9zOMkU6NADjHomflI68F7RVPNzO+vQEQC/2JnGiufok02d7ya77FWXg== X-Received: by 2002:a17:902:b190:: with SMTP id s16mr4470053plr.83.1555777779031; Sat, 20 Apr 2019 09:29:39 -0700 (PDT) Received: from [192.168.20.7] (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id f71sm14726351pfc.109.2019.04.20.09.29.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 20 Apr 2019 09:29:38 -0700 (PDT) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 12.2 \(3445.102.3\)) Subject: Re: svn commit: r346449 - user/ngie/bug-237403/tests/sys/opencrypto From: Enji Cooper In-Reply-To: <23c35177-f384-7f1f-3e4a-f8badcfac560@FreeBSD.org> Date: Sat, 20 Apr 2019 09:29:37 -0700 Cc: Enji Cooper , src-committers@freebsd.org, svn-src-user@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <153E9E58-3071-46FF-9A8E-61AE7FED49FA@gmail.com> References: <201904201607.x3KG7m4A051487@repo.freebsd.org> <23c35177-f384-7f1f-3e4a-f8badcfac560@FreeBSD.org> To: John Baldwin X-Mailer: Apple Mail (2.3445.102.3) X-Rspamd-Queue-Id: 648BD97C12 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.97 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.97)[-0.974,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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Apr 2019 16:29:41 -0000 > On Apr 20, 2019, at 9:28 AM, John Baldwin wrote: >=20 > On 4/20/19 9:07 AM, Enji Cooper wrote: >> Author: ngie >> Date: Sat Apr 20 16:07:47 2019 >> New Revision: 346449 >> URL: https://svnweb.freebsd.org/changeset/base/346449 >>=20 >> Log: >> Replace `str.{decode,encode}("hex")` with binascii.(un)?hexlify >>=20 >> Encoding/decoding base_string objects as "hex" was removed in py3 = and replaced >> with other methods, one being `binascii.(un)?hexlify`. >=20 > I have several changes pending in review for these scripts that add = new functions, > etc. You might want to let those land in head first. I hope to merge = them all to > head this week. Good to know! Is the code up for review somewhere, so I can get = ahead of the pending changes? Thanks so much for the heads up! -Enji= From owner-svn-src-user@freebsd.org Sat Apr 20 16:37:12 2019 Return-Path: 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 237E8156C9BB for ; Sat, 20 Apr 2019 16:37:12 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B5EF568484; Sat, 20 Apr 2019 16:37:11 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Received: from John-Baldwins-MacBook-Pro-3.local (unknown [IPv6:2601:648:8880:1e30:fd9b:9ce6:c8c:cc0]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 027A91CC75; Sat, 20 Apr 2019 16:37:10 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Subject: Re: svn commit: r346449 - user/ngie/bug-237403/tests/sys/opencrypto To: Enji Cooper Cc: Enji Cooper , src-committers@freebsd.org, svn-src-user@freebsd.org References: <201904201607.x3KG7m4A051487@repo.freebsd.org> <23c35177-f384-7f1f-3e4a-f8badcfac560@FreeBSD.org> <153E9E58-3071-46FF-9A8E-61AE7FED49FA@gmail.com> From: John Baldwin Openpgp: preference=signencrypt Autocrypt: addr=jhb@FreeBSD.org; keydata= mQGiBETQ+XcRBADMFybiq69u+fJRy/0wzqTNS8jFfWaBTs5/OfcV7wWezVmf9sgwn8TW0Dk0 c9MBl0pz+H01dA2ZSGZ5fXlmFIsee1WEzqeJzpiwd/pejPgSzXB9ijbLHZ2/E0jhGBcVy5Yo /Tw5+U/+laeYKu2xb0XPvM0zMNls1ah5OnP9a6Ql6wCgupaoMySb7DXm2LHD1Z9jTsHcAQMD /1jzh2BoHriy/Q2s4KzzjVp/mQO5DSm2z14BvbQRcXU48oAosHA1u3Wrov6LfPY+0U1tG47X 1BGfnQH+rNAaH0livoSBQ0IPI/8WfIW7ub4qV6HYwWKVqkDkqwcpmGNDbz3gfaDht6nsie5Z pcuCcul4M9CW7Md6zzyvktjnbz61BADGDCopfZC4of0Z3Ka0u8Wik6UJOuqShBt1WcFS8ya1 oB4rc4tXfSHyMF63aPUBMxHR5DXeH+EO2edoSwViDMqWk1jTnYza51rbGY+pebLQOVOxAY7k do5Ordl3wklBPMVEPWoZ61SdbcjhHVwaC5zfiskcxj5wwXd2E9qYlBqRg7QeSm9obiBCYWxk d2luIDxqaGJARnJlZUJTRC5vcmc+iGAEExECACAFAkTQ+awCGwMGCwkIBwMCBBUCCAMEFgID AQIeAQIXgAAKCRBy3lIGd+N/BI6RAJ9S97fvbME+3hxzE3JUyUZ6vTewDACdE1stFuSfqMvM jomvZdYxIYyTUpC5Ag0ERND5ghAIAPwsO0B7BL+bz8sLlLoQktGxXwXQfS5cInvL17Dsgnr3 1AKa94j9EnXQyPEj7u0d+LmEe6CGEGDh1OcGFTMVrof2ZzkSy4+FkZwMKJpTiqeaShMh+Goj XlwIMDxyADYvBIg3eN5YdFKaPQpfgSqhT+7El7w+wSZZD8pPQuLAnie5iz9C8iKy4/cMSOrH YUK/tO+Nhw8Jjlw94Ik0T80iEhI2t+XBVjwdfjbq3HrJ0ehqdBwukyeJRYKmbn298KOFQVHO EVbHA4rF/37jzaMadK43FgJ0SAhPPF5l4l89z5oPu0b/+5e2inA3b8J3iGZxywjM+Csq1tqz hltEc7Q+E08AAwUIAL+15XH8bPbjNJdVyg2CMl10JNW2wWg2Q6qdljeaRqeR6zFus7EZTwtX sNzs5bP8y51PSUDJbeiy2RNCNKWFMndM22TZnk3GNG45nQd4OwYK0RZVrikalmJY5Q6m7Z16 4yrZgIXFdKj2t8F+x613/SJW1lIr9/bDp4U9tw0V1g3l2dFtD3p3ZrQ3hpoDtoK70ioIAjjH aIXIAcm3FGZFXy503DOA0KaTWwvOVdYCFLm3zWuSOmrX/GsEc7ovasOWwjPn878qVjbUKWwx Q4QkF4OhUV9zPtf9tDSAZ3x7QSwoKbCoRCZ/xbyTUPyQ1VvNy/mYrBcYlzHodsaqUDjHuW+I SQQYEQIACQUCRND5ggIbDAAKCRBy3lIGd+N/BCO8AJ9j1dWVQWxw/YdTbEyrRKOY8YZNwwCf afMAg8QvmOWnHx3wl8WslCaXaE8= Message-ID: <876fef44-1b27-75e3-211c-8d8682b9f59b@FreeBSD.org> Date: Sat, 20 Apr 2019 09:37:09 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.12; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <153E9E58-3071-46FF-9A8E-61AE7FED49FA@gmail.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: B5EF568484 X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.92 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.92)[-0.918,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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 20 Apr 2019 16:37:12 -0000 On 4/20/19 9:29 AM, Enji Cooper wrote: > >> On Apr 20, 2019, at 9:28 AM, John Baldwin wrote: >> >> On 4/20/19 9:07 AM, Enji Cooper wrote: >>> Author: ngie >>> Date: Sat Apr 20 16:07:47 2019 >>> New Revision: 346449 >>> URL: https://svnweb.freebsd.org/changeset/base/346449 >>> >>> Log: >>> Replace `str.{decode,encode}("hex")` with binascii.(un)?hexlify >>> >>> Encoding/decoding base_string objects as "hex" was removed in py3 and replaced >>> with other methods, one being `binascii.(un)?hexlify`. >> >> I have several changes pending in review for these scripts that add new functions, >> etc. You might want to let those land in head first. I hope to merge them all to >> head this week. > > Good to know! Is the code up for review somewhere, so I can get ahead of the pending changes? > Thanks so much for the heads up! You can look at D19778 and then look at its stack of dependencies. I'm waiting for the ports one to hit maintainer timeout which will then unblock the remaining changes. Getting these tests to work with both python 3 and 2 is a useful exercise and appreciated. -- John Baldwin