pyOpenSSL

Merge lp:~sileht/pyopenssl/pyopenssl into lp:~exarkun/pyopenssl/trunk

  1. pyopenssl
  2. Merge into trunk
Proposed by Mehdi Abaakouk
Status: Merged
Merge reported by: Jean-Paul Calderone
Merged at revision: not available
Proposed branch: lp:~sileht/pyopenssl/pyopenssl
Merge into: lp:~exarkun/pyopenssl/trunk
Diff against target: 13 lines (+2/-0)
1 file modified
OpenSSL/ssl/ssl.c (+2/-0)
To merge this branch: bzr merge lp:~sileht/pyopenssl/pyopenssl
Reviewer Review Type Date Requested Status
Jean-Paul Calderone Pending
Review via email: mp+200842@code.launchpad.net

Description of the change

Hi,

this is a fix for https://bugs.launchpad.net/pyopenssl/+bug/1266521

Detail in the commit message, too:

  Make SSL_OP_MSIE_SSLV2_RSA_PADDING optionnal

  Since 0.9.7h SSL_OP_MSIE_SSLV2_RSA_PADDING has no effect and
  it have been removed in version 0.9.8a

  This patch make it opentionnal

  Closes bug #1266521

Thanks in advance,
Best regards

To post a comment you must log in.
Revision history for this message
Jean-Paul Calderone (exarkun) wrote :

This is now fixed in master@HEAD on github. Thanks.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'OpenSSL/ssl/ssl.c'
2--- OpenSSL/ssl/ssl.c 2013-10-03 20:05:00 +0000
3+++ OpenSSL/ssl/ssl.c 2014-01-08 14:15:25 +0000
4@@ -219,7 +219,9 @@
5 PyModule_AddIntConstant(module, "OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG", SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG);
6 PyModule_AddIntConstant(module, "OP_SSLREF2_REUSE_CERT_TYPE_BUG", SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG);
7 PyModule_AddIntConstant(module, "OP_MICROSOFT_BIG_SSLV3_BUFFER", SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER);
8+#ifdef SSL_OP_MSIE_SSLV2_RSA_PADDING
9 PyModule_AddIntConstant(module, "OP_MSIE_SSLV2_RSA_PADDING", SSL_OP_MSIE_SSLV2_RSA_PADDING);
10+#endif
11 PyModule_AddIntConstant(module, "OP_SSLEAY_080_CLIENT_DH_BUG", SSL_OP_SSLEAY_080_CLIENT_DH_BUG);
12 PyModule_AddIntConstant(module, "OP_TLS_D5_BUG", SSL_OP_TLS_D5_BUG);
13 PyModule_AddIntConstant(module, "OP_TLS_BLOCK_PADDING_BUG", SSL_OP_TLS_BLOCK_PADDING_BUG);

Subscribers

People subscribed via source and target branches

to status/vote changes: