From owner-svn-src-user@freebsd.org  Tue Sep  3 14:07:13 2019
Return-Path: <owner-svn-src-user@freebsd.org>
Delivered-To: svn-src-user@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id D218BDD69D
 for <svn-src-user@mailman.nyi.freebsd.org>;
 Tue,  3 Sep 2019 14:07:12 +0000 (UTC)
 (envelope-from yuripv@freebsd.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
 [IPv6:2610:1c1:1:6074::16:84])
 (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 "freefall.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 46N80J3lmxz4QML;
 Tue,  3 Sep 2019 14:07:12 +0000 (UTC)
 (envelope-from yuripv@freebsd.org)
Received: by freefall.freebsd.org (Postfix, from userid 1452)
 id 20F291B27E; Tue,  3 Sep 2019 14:06:32 +0000 (UTC)
X-Original-To: yuripv@localmail.freebsd.org
Delivered-To: yuripv@localmail.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
 (Client CN "mx1.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by freefall.freebsd.org (Postfix) with ESMTPS id 60331DB8E;
 Sat, 20 Apr 2019 16:07:52 +0000 (UTC)
 (envelope-from owner-src-committers@freebsd.org)
Received: from freefall.freebsd.org (freefall.freebsd.org
 [IPv6:2610:1c1:1:6074::16:84])
 (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 "freefall.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 2CFB196EB9;
 Sat, 20 Apr 2019 16:07:52 +0000 (UTC)
 (envelope-from owner-src-committers@freebsd.org)
Received: by freefall.freebsd.org (Postfix, from userid 538)
 id 1D2DFDB8D; Sat, 20 Apr 2019 16:07:52 +0000 (UTC)
Delivered-To: src-committers@localmail.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
 (Client CN "mx1.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by freefall.freebsd.org (Postfix) with ESMTPS id 0FCF8DB8A
 for <src-committers@localmail.freebsd.org>;
 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 <ngie@FreeBSD.org>
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
Precedence: bulk
X-Loop: FreeBSD.org
Sender: owner-src-committers@freebsd.org
X-Rspamd-Queue-Id: 2CFB196EB9
X-Spamd-Bar: --
Authentication-Results: mx1.freebsd.org
X-Spamd-Result: default: False [-2.97 / 15.00];
 local_wl_from(0.00)[freebsd.org];
 NEURAL_HAM_MEDIUM(-1.00)[-0.999,0];
 NEURAL_HAM_SHORT(-0.98)[-0.975,0];
 NEURAL_HAM_LONG(-1.00)[-1.000,0];
 ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]
Status: O
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.29
List-Id: "SVN commit messages for the experimental &quot; user&quot;
 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>
Date: Tue, 03 Sep 2019 14:07:13 -0000
X-Original-Date: Sat, 20 Apr 2019 16:07:48 +0000 (UTC)
X-List-Received-Date: Tue, 03 Sep 2019 14:07:13 -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: