diff options
| author | matejcik <matejcik@gmail.com> | 2017-02-16 14:41:31 +0100 |
|---|---|---|
| committer | Victor Stinner <victor.stinner@gmail.com> | 2017-02-16 14:41:31 +0100 |
| commit | 9764c151c51480a7ca6042b1ccd69be2620ff360 (patch) | |
| tree | 109709a221e1259a738cc2240e8015564ddf9d4a | |
| parent | 23557d59b819f57800ddef0b1373acef8e024670 (diff) | |
| download | cpython-git-9764c151c51480a7ca6042b1ccd69be2620ff360.tar.gz | |
update test_socket AEAD test for kernel 4.9 and up (#133)
| -rw-r--r-- | Lib/test/test_socket.py | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index b5c9c0cf21..81f7cf774b 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -5487,7 +5487,7 @@ class LinuxKernelCryptoAPI(unittest.TestCase): self.assertEqual(len(dec), msglen * multiplier) self.assertEqual(dec, msg * multiplier) - @support.requires_linux_version(4, 3) # see test_aes_cbc + @support.requires_linux_version(4, 9) # see issue29324 def test_aead_aes_gcm(self): key = bytes.fromhex('c939cc13397c1d37de6ae0e1cb7c423c') iv = bytes.fromhex('b3d8cc017cbb89b39e0f67e2') @@ -5510,8 +5510,7 @@ class LinuxKernelCryptoAPI(unittest.TestCase): op.sendmsg_afalg(op=socket.ALG_OP_ENCRYPT, iv=iv, assoclen=assoclen, flags=socket.MSG_MORE) op.sendall(assoc, socket.MSG_MORE) - op.sendall(plain, socket.MSG_MORE) - op.sendall(b'\x00' * taglen) + op.sendall(plain) res = op.recv(assoclen + len(plain) + taglen) self.assertEqual(expected_ct, res[assoclen:-taglen]) self.assertEqual(expected_tag, res[-taglen:]) @@ -5519,7 +5518,7 @@ class LinuxKernelCryptoAPI(unittest.TestCase): # now with msg op, _ = algo.accept() with op: - msg = assoc + plain + b'\x00' * taglen + msg = assoc + plain op.sendmsg_afalg([msg], op=socket.ALG_OP_ENCRYPT, iv=iv, assoclen=assoclen) res = op.recv(assoclen + len(plain) + taglen) @@ -5530,7 +5529,7 @@ class LinuxKernelCryptoAPI(unittest.TestCase): pack_uint32 = struct.Struct('I').pack op, _ = algo.accept() with op: - msg = assoc + plain + b'\x00' * taglen + msg = assoc + plain op.sendmsg( [msg], ([socket.SOL_ALG, socket.ALG_SET_OP, pack_uint32(socket.ALG_OP_ENCRYPT)], @@ -5538,7 +5537,7 @@ class LinuxKernelCryptoAPI(unittest.TestCase): [socket.SOL_ALG, socket.ALG_SET_AEAD_ASSOCLEN, pack_uint32(assoclen)], ) ) - res = op.recv(len(msg)) + res = op.recv(len(msg) + taglen) self.assertEqual(expected_ct, res[assoclen:-taglen]) self.assertEqual(expected_tag, res[-taglen:]) @@ -5548,8 +5547,8 @@ class LinuxKernelCryptoAPI(unittest.TestCase): msg = assoc + expected_ct + expected_tag op.sendmsg_afalg([msg], op=socket.ALG_OP_DECRYPT, iv=iv, assoclen=assoclen) - res = op.recv(len(msg)) - self.assertEqual(plain, res[assoclen:-taglen]) + res = op.recv(len(msg) - taglen) + self.assertEqual(plain, res[assoclen:]) @support.requires_linux_version(4, 3) # see test_aes_cbc def test_drbg_pr_sha256(self): |