Merge lp:~stepankk/pyopenssl/bug-845445 into lp:~exarkun/pyopenssl/trunk

[stepankk]

Excluded some parts of C code according to OpenSSL version.

[Jean-Paul Calderone (exarkun)]

Thanks. It looks like this branch does fix the build problems. A few tweaks are probably in order:

  1. The setup.py changes look superfluous. Can you drop them?
  2. 8 unit tests fail with the branch. Unsurprisingly, these are the tests for the APIs being disabled. Can you change the test suite to skip these tests if the version of OpenSSL in use is too old to have them?
  3. Is a version check in the implementation the ideal way to do this? Another approach would be to check if the API symbols themselves are defined. I don't feel too strongly about this either way, I mostly want to see if you considered it or if you have any thoughts on the alternate approach.

Thanks again.

review: Needs Fixing

[Keshav Kini (keshav-kini)]

See also a patch on the actual bug #845445 page, which checks whether the API symbols themselves are defined, but doesn't skip any unit tests.

Unmerged revisions

166. By stepankk on 2012-01-16

updated version in setup.py

165. By stepankk on 2012-01-16

updated version and url in setup.py

164. By stepankk on 2012-01-12

compatibility with openssl <= 0.9.8.e

=== modified file 'OpenSSL/ssl/connection.c'
--- OpenSSL/ssl/connection.c	2011-07-16 05:14:58 +0000
+++ OpenSSL/ssl/connection.c	2012-01-19 14:05:27 +0000
@@ -263,6 +263,7 @@
     return (PyObject *)self->context;
 }
 
+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER > 0x0090802fL
 static char ssl_Connection_set_context_doc[] = "\n\
 Switch this connection to a new session context\n\
 \n\
@@ -308,6 +309,7 @@
 :return: A byte string giving the server name or :py:data:`None`.\n\
 \n\
 ";
+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER > 0x0090802fL
 static PyObject *
 ssl_Connection_get_servername(ssl_ConnectionObj *self, PyObject *args) {
     int type = TLSEXT_NAMETYPE_host_name;
@@ -326,6 +328,7 @@
         return PyBytes_FromString(name);
     }
 }
+#endif
 
 
 static char ssl_Connection_set_tlsext_host_name_doc[] = "\n\
@@ -348,6 +351,7 @@
     Py_INCREF(Py_None);
     return Py_None;
 }
+#endif
 
 
 
@@ -1269,9 +1273,11 @@
 static PyMethodDef ssl_Connection_methods[] =
 {
     ADD_METHOD(get_context),
+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER > 0x0090802fL
     ADD_METHOD(set_context),
     ADD_METHOD(get_servername),
     ADD_METHOD(set_tlsext_host_name),
+#endif
     ADD_METHOD(pending),
     ADD_METHOD(send),
     ADD_ALIAS (write, send),

=== modified file 'OpenSSL/ssl/context.c'
--- OpenSSL/ssl/context.c	2011-09-11 13:35:32 +0000
+++ OpenSSL/ssl/context.c	2012-01-19 14:05:27 +0000
@@ -1125,6 +1125,7 @@
     return PyLong_FromLong(SSL_CTX_set_mode(self->ctx, mode));
 }
 
+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER > 0x0090802fL
 static char ssl_Context_set_tlsext_servername_callback_doc[] = "\n\
 Specify a callback function to be called when clients specify a server name.\n\
 \n\
@@ -1152,6 +1153,7 @@
     Py_INCREF(Py_None);
     return Py_None;
 }
+#endif
 
 
 /*
@@ -1192,7 +1194,9 @@
     ADD_METHOD(get_cert_store),
     ADD_METHOD(set_options),
     ADD_METHOD(set_mode),
+#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER > 0x0090802fL
     ADD_METHOD(set_tlsext_servername_callback),
+#endif
     { NULL, NULL }
 };
 #undef ADD_METHOD

=== modified file 'setup.py'
--- setup.py	2011-12-19 18:32:29 +0000
+++ setup.py	2012-01-19 14:05:27 +0000
@@ -15,7 +15,7 @@
 from distutils.command.build_ext import build_ext
 
 # XXX Deduplicate this
-__version__ = '0.13'
+__version__ = '0.13.2'
 
 crypto_src = ['OpenSSL/crypto/crypto.c', 'OpenSSL/crypto/x509.c',
               'OpenSSL/crypto/x509name.c', 'OpenSSL/crypto/pkey.c',
@@ -205,12 +205,12 @@
                      'OpenSSL.test.test_ssl'],
       zip_safe = False,
       cmdclass = {"build_ext": BuildExtension},
-      description = 'Python wrapper module around the OpenSSL library',
+      description = 'Python wrapper module around the OpenSSL library.',
       author = 'Martin Sjögren, AB Strakt',
       author_email = '[e-mail]',
       maintainer = 'Jean-Paul Calderone',
       maintainer_email = '[e-mail]',
-      url = 'http://pyopenssl.sourceforge.net/',
+      url = 'https://code.launchpad.net/~stepankk/pyopenssl/bug-845445',
       license = 'APL2',
       long_description = """\
 High-level wrapper around a subset of the OpenSSL library, includes