svn commit: r347993 - user/ngie/bug-237403/tests/sys/opencrypto
Enji Cooper
ngie at FreeBSD.org
Mon May 20 16:16:29 UTC 2019
Author: ngie
Date: Mon May 20 16:16:28 2019
New Revision: 347993
URL: https://svnweb.freebsd.org/changeset/base/347993
Log:
Fix some improper binascii conversions
.encode should use .hexlify, not .unhexlify.
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 Mon May 20 16:00:32 2019 (r347992)
+++ user/ngie/bug-237403/tests/sys/opencrypto/cryptodev.py Mon May 20 16:16:28 2019 (r347993)
@@ -552,15 +552,15 @@ if __name__ == '__main__':
c = Crypto(CRYPTO_AES_ICM, key)
enc = c.encrypt(pt, iv)
- print('enc:', binascii.unhexlify(enc))
- print(' ct:', binascii.unhexlify(ct))
+ print('enc:', binascii.hexlify(enc))
+ print(' ct:', binascii.hexlify(ct))
assert ct == enc
dec = c.decrypt(ct, iv)
- print('dec:', binascii.unhexlify(dec))
- print(' pt:', binascii.unhexlify(pt))
+ print('dec:', binascii.hexlify(dec))
+ print(' pt:', binascii.hexlify(pt))
assert pt == dec
elif False:
Modified: user/ngie/bug-237403/tests/sys/opencrypto/cryptotest.py
==============================================================================
--- user/ngie/bug-237403/tests/sys/opencrypto/cryptotest.py Mon May 20 16:00:32 2019 (r347992)
+++ user/ngie/bug-237403/tests/sys/opencrypto/cryptotest.py Mon May 20 16:16:28 2019 (r347993)
@@ -164,8 +164,8 @@ def GenTestCase(cname):
if e.errno != errno.EINVAL:
raise
continue
- data['rpt'] = binascii.unhexlify(rpt)
- data['rtag'] = binascii.unhexlify(rtag)
+ data['rpt'] = binascii.hexlify(rpt)
+ data['rtag'] = binascii.hexlify(rtag)
self.assertEqual(rpt, pt,
repr(data))
More information about the svn-src-user
mailing list