pool/python-M2Crypto
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update openssl 1.1.1 patch

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-M2Crypto?expand=0&rev=68
This commit is contained in:
Matej Cepl 2018-11-08 16:06:09 +00:00 committed by Git OBS Bridge
parent 8bbb80cc80
commit 51970a19dc
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
openssl-1_1_1-compat.patch
View File

@ -41,7 +41,7 @@
s.close() s.close()
finally: finally:
self.stop_server(pid) self.stop_server(pid)
@@ -444,45 +449,53 @@ class MiscSSLClientTestCase(BaseSSLClien @@ -444,45 +449,54 @@ class MiscSSLClientTestCase(BaseSSLClien
ctx = SSL.Context() ctx = SSL.Context()
s = SSL.Connection(ctx) s = SSL.Connection(ctx)
s.set_cipher_list('EXP-RC2-MD5') s.set_cipher_list('EXP-RC2-MD5')
@ -102,13 +102,14 @@
- '"%s"' % cipher.name()) - '"%s"' % cipher.name())
- self.assertEqual('AES128-SHA-128', str(cipher)) - self.assertEqual('AES128-SHA-128', str(cipher))
+ if not OPENSSL111: + if not OPENSSL111:
+ self.assertEqual(cipher.name(), 'AES128-SHA-128', + cipname = cipher.name()
+ '"%s"' % cipher.name()) + self.assertEqual(cipname, 'AES128-SHA',
+ '"%s" (%s)' % (cipname, type(cipname)))
+ self.assertEqual('AES128-SHA-128', str(cipher)) + self.assertEqual('AES128-SHA-128', str(cipher))
# For some reason there are 2 entries in the stack # For some reason there are 2 entries in the stack
# self.assertEqual(i, 1, i) # self.assertEqual(i, 1, i)
self.assertEqual(i, len(cipher_stack)) self.assertEqual(i, len(cipher_stack))
@@ -754,8 +767,9 @@ class MiscSSLClientTestCase(BaseSSLClien @@ -754,8 +768,9 @@ class MiscSSLClientTestCase(BaseSSLClien
9) 9)
ctx.load_verify_locations('tests/ca.pem') ctx.load_verify_locations('tests/ca.pem')
s = SSL.Connection(ctx) s = SSL.Connection(ctx)
@ -120,6 +121,15 @@
s.close() s.close()
finally: finally:
self.stop_server(pid) self.stop_server(pid)
@@ -1045,7 +1060,7 @@ class TwistedSSLClientTestCase(BaseSSLCl
# TODO: Figure out which exception should be raised for timeout.
# The following assertion originally expected only a
- # SSL.SSLTimeoutError exception, but what is raised is actually a
+ # SSL.SSLTimeoutError exception, but what is raised is actually a
# socket.timeout exception. As a temporary circumvention to this
# issue, both exceptions are now tolerated. A final fix would need
# to figure out which of these two exceptions is supposed to be
--- a/tests/test_evp.py --- a/tests/test_evp.py
+++ b/tests/test_evp.py +++ b/tests/test_evp.py
@@ -465,7 +465,6 @@ class CipherTestCase(unittest.TestCase): @@ -465,7 +465,6 @@ class CipherTestCase(unittest.TestCase):