diff options
Diffstat (limited to 'dev-lang/python')
| -rw-r--r-- | dev-lang/python/Manifest | 1 | ||||
| -rw-r--r-- | dev-lang/python/files/3.6.1-test_socket-AEAD.patch | 75 |
2 files changed, 0 insertions, 76 deletions
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest index a267d71cb50f..5fdfa4663fcc 100644 --- a/dev-lang/python/Manifest +++ b/dev-lang/python/Manifest @@ -2,7 +2,6 @@ AUX 2.7-disable-nis.patch 823 BLAKE2B eccd1ceb7e7e66848e1c7520ae9c5f2f57a27203a5 AUX 3.4-getentropy-linux.patch 1766 BLAKE2B b0999a96833f2b6db936f0c97f8405c8b6eb2fcf926f4c4c41590d903435c1435be21795ea1d44355f5c2e3a745b1528bf04cfda362372a12f796fd1bb51629a SHA512 52e888819b3c265e0920efa00911311a2029a6a80162ca56e69892ffc49c28487852882b27e560b9f8ff1c16ee41d074423b6c565596b37c6efca2dd8eb45675 AUX 3.6-blake2.patch 1335 BLAKE2B af3acdee3c789199fab8a2eb0140ff7a470f2873db506163d2e81117e1efed2c245d629f13a49d313a63af98200d5dad5f3d5bcc3e43e66af5bb0e39778faa55 SHA512 f8f9b4424df36f58354c24b7eb571c63a7bb49a1d2fd5399562ab28371eb3a80ed829c7e4fc19f5b3d9955a83a46d09a63819e4da0dafdef0a5a3f6b1e679d71 AUX 3.6-disable-nis.patch 864 BLAKE2B a960b2f44ff1358677ebb0cf82bcff1ddc7812ed511d0f492fdac07c848f0de8dbd0e8a9200b276709532b5524eed9e779b33d6c4ee34c1f9d23e4eb1f862d99 SHA512 a86a17c90743e8a3712ceaf14ea1a88b96bd5504a4feaadc0168f3211c2afbc130fad8147a40d7ac65268ff1d6293b0c3f98ad36845efebeacfc628149ef13f3 -AUX 3.6.1-test_socket-AEAD.patch 3501 BLAKE2B c35283bf715dcab4c7b368645850f35b0c8e2f479dc9e2595d9ad8e5ec1c1e11372f01ff5fa612f9068862ef3ab5c335b273f13bb698e120a826df69ae41220e SHA512 7c813ea3c9eb45f50164b58fd4908e6ccf48eba7d027f252a2c13dab09662a52c4d950c4c7583d50a8752848f52e0854e6974d8c2ebbb38a38fedaa97878bc28 AUX pydoc.conf 169 BLAKE2B ce40bb3d5f858bd7a8d9ef5bf215a8ab592568a724f0e08aea219da014dac12fdfcbcf5fb168bb9aa57be110f74d656aed46179ffe11e3c992d84a647e442b7b SHA512 30d0776a4004cd641e6f283658c3c24915a21ea15fe40e506ff2c3a5f95936aa00c9490b04ab25f29e9b7ac65cd88fd54ca0b08e000e73820b13c7c57c0bf5b2 AUX pydoc.init 600 BLAKE2B fb8775a6663483e5112ec283627610b746020d88494e772b92bb718a9493a52606e565c6c2fa4917a5cb963f166283d09883bd26903f2f3ced6c240d4e292a7f SHA512 9e71ad53486b6882a8441b24225c602195ee33d29dd1b60df27febbc6b752e79929be356152a489f893dcfb11f9c066b999787bc27a8ac61062c86e67a69e87a AUX python-2.7.10-cross-compile-warn-test.patch 775 BLAKE2B 617938353c7e19a9b931544ff1fdcd60cf46e3a68f3ff63bc6ac16432220aad13df4d2b405a968505fb64d31da51a478c46499944ab58e9bbfa5a5b44d392f00 SHA512 652941239541f6139ee3580ec0ea5240baf07ae1afb786f76a69b1d748de1f4dda2740a95c28866e9b0b59023410f8a1e86507642595991c0d90d187519cb758 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 deleted file mode 100644 index 426e3371441c..000000000000 --- a/dev-lang/python/files/3.6.1-test_socket-AEAD.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 4ac01f0ff3e3c9c02f5cc8c55f2fbe4639808f5e Mon Sep 17 00:00:00 2001 -From: Mariatta <Mariatta@users.noreply.github.com> -Date: Thu, 16 Mar 2017 20:58:42 -0700 -Subject: [PATCH] update test_socket AEAD test for kernel 4.9 and up (GH-133) - (GH-548) - -(cherry picked from commit 9764c151c51480a7ca6042b1ccd69be2620ff360) ---- - Lib/test/test_socket.py | 15 +++++++-------- - 1 file changed, 7 insertions(+), 8 deletions(-) - -diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py -index 5315d475df..1508f20c9f 100644 ---- a/Lib/test/test_socket.py -+++ b/Lib/test/test_socket.py -@@ -5479,7 +5479,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') -@@ -5502,8 +5502,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:]) -@@ -5511,7 +5510,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) -@@ -5522,7 +5521,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)], -@@ -5530,7 +5529,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:]) - -@@ -5540,8 +5539,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): --- -2.12.2 - |