| 1 |
commit: e0dc893a2306e868f65f5067e46abba8c18e0911 |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Dec 3 12:32:52 2017 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 3 21:08:08 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0dc893a |
| 7 |
|
| 8 |
dev-lang/python: remove unused patch |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/6418 |
| 11 |
|
| 12 |
dev-lang/python/files/3.6.1-test_socket-AEAD.patch | 75 ---------------------- |
| 13 |
1 file changed, 75 deletions(-) |
| 14 |
|
| 15 |
diff --git a/dev-lang/python/files/3.6.1-test_socket-AEAD.patch b/dev-lang/python/files/3.6.1-test_socket-AEAD.patch |
| 16 |
deleted file mode 100644 |
| 17 |
index 426e3371441..00000000000 |
| 18 |
--- a/dev-lang/python/files/3.6.1-test_socket-AEAD.patch |
| 19 |
+++ /dev/null |
| 20 |
@@ -1,75 +0,0 @@ |
| 21 |
-From 4ac01f0ff3e3c9c02f5cc8c55f2fbe4639808f5e Mon Sep 17 00:00:00 2001 |
| 22 |
-From: Mariatta <Mariatta@××××××××××××××××××××.com> |
| 23 |
-Date: Thu, 16 Mar 2017 20:58:42 -0700 |
| 24 |
-Subject: [PATCH] update test_socket AEAD test for kernel 4.9 and up (GH-133) |
| 25 |
- (GH-548) |
| 26 |
- |
| 27 |
-(cherry picked from commit 9764c151c51480a7ca6042b1ccd69be2620ff360) |
| 28 |
---- |
| 29 |
- Lib/test/test_socket.py | 15 +++++++-------- |
| 30 |
- 1 file changed, 7 insertions(+), 8 deletions(-) |
| 31 |
- |
| 32 |
-diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py |
| 33 |
-index 5315d475df..1508f20c9f 100644 |
| 34 |
---- a/Lib/test/test_socket.py |
| 35 |
-+++ b/Lib/test/test_socket.py |
| 36 |
-@@ -5479,7 +5479,7 @@ class LinuxKernelCryptoAPI(unittest.TestCase): |
| 37 |
- self.assertEqual(len(dec), msglen * multiplier) |
| 38 |
- self.assertEqual(dec, msg * multiplier) |
| 39 |
- |
| 40 |
-- @support.requires_linux_version(4, 3) # see test_aes_cbc |
| 41 |
-+ @support.requires_linux_version(4, 9) # see issue29324 |
| 42 |
- def test_aead_aes_gcm(self): |
| 43 |
- key = bytes.fromhex('c939cc13397c1d37de6ae0e1cb7c423c') |
| 44 |
- iv = bytes.fromhex('b3d8cc017cbb89b39e0f67e2') |
| 45 |
-@@ -5502,8 +5502,7 @@ class LinuxKernelCryptoAPI(unittest.TestCase): |
| 46 |
- op.sendmsg_afalg(op=socket.ALG_OP_ENCRYPT, iv=iv, |
| 47 |
- assoclen=assoclen, flags=socket.MSG_MORE) |
| 48 |
- op.sendall(assoc, socket.MSG_MORE) |
| 49 |
-- op.sendall(plain, socket.MSG_MORE) |
| 50 |
-- op.sendall(b'\x00' * taglen) |
| 51 |
-+ op.sendall(plain) |
| 52 |
- res = op.recv(assoclen + len(plain) + taglen) |
| 53 |
- self.assertEqual(expected_ct, res[assoclen:-taglen]) |
| 54 |
- self.assertEqual(expected_tag, res[-taglen:]) |
| 55 |
-@@ -5511,7 +5510,7 @@ class LinuxKernelCryptoAPI(unittest.TestCase): |
| 56 |
- # now with msg |
| 57 |
- op, _ = algo.accept() |
| 58 |
- with op: |
| 59 |
-- msg = assoc + plain + b'\x00' * taglen |
| 60 |
-+ msg = assoc + plain |
| 61 |
- op.sendmsg_afalg([msg], op=socket.ALG_OP_ENCRYPT, iv=iv, |
| 62 |
- assoclen=assoclen) |
| 63 |
- res = op.recv(assoclen + len(plain) + taglen) |
| 64 |
-@@ -5522,7 +5521,7 @@ class LinuxKernelCryptoAPI(unittest.TestCase): |
| 65 |
- pack_uint32 = struct.Struct('I').pack |
| 66 |
- op, _ = algo.accept() |
| 67 |
- with op: |
| 68 |
-- msg = assoc + plain + b'\x00' * taglen |
| 69 |
-+ msg = assoc + plain |
| 70 |
- op.sendmsg( |
| 71 |
- [msg], |
| 72 |
- ([socket.SOL_ALG, socket.ALG_SET_OP, pack_uint32(socket.ALG_OP_ENCRYPT)], |
| 73 |
-@@ -5530,7 +5529,7 @@ class LinuxKernelCryptoAPI(unittest.TestCase): |
| 74 |
- [socket.SOL_ALG, socket.ALG_SET_AEAD_ASSOCLEN, pack_uint32(assoclen)], |
| 75 |
- ) |
| 76 |
- ) |
| 77 |
-- res = op.recv(len(msg)) |
| 78 |
-+ res = op.recv(len(msg) + taglen) |
| 79 |
- self.assertEqual(expected_ct, res[assoclen:-taglen]) |
| 80 |
- self.assertEqual(expected_tag, res[-taglen:]) |
| 81 |
- |
| 82 |
-@@ -5540,8 +5539,8 @@ class LinuxKernelCryptoAPI(unittest.TestCase): |
| 83 |
- msg = assoc + expected_ct + expected_tag |
| 84 |
- op.sendmsg_afalg([msg], op=socket.ALG_OP_DECRYPT, iv=iv, |
| 85 |
- assoclen=assoclen) |
| 86 |
-- res = op.recv(len(msg)) |
| 87 |
-- self.assertEqual(plain, res[assoclen:-taglen]) |
| 88 |
-+ res = op.recv(len(msg) - taglen) |
| 89 |
-+ self.assertEqual(plain, res[assoclen:]) |
| 90 |
- |
| 91 |
- @support.requires_linux_version(4, 3) # see test_aes_cbc |
| 92 |
- def test_drbg_pr_sha256(self): |
| 93 |
--- |
| 94 |
-2.12.2 |
| 95 |
- |
Archives