Merged revisions 78596 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78596 | victor.stinner | 2010-03-02 23:44:42 +0100 (mar., 02 mars 2010) | 4 lines

  Issue #2973: Fix gcc warning on the 2nd argument of ASN1_item_d2i() and
  method->d2i(): OpenSSL API changed in OpenSSL 0.9.6m. Patch written by Daniel
  Black.
........

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 4b0958a6bb9318dadadc43acd52faa122d288ea1..107fe130fb0f18d721496c832f3e9e5f9166bf21 100644 (file)
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -667,7 +667,12 @@ _get_peer_alt_names (X509 *certificate) {
        char buf[2048];
        char *vptr;
        int len;
+       /* Issue #2973: ASN1_item_d2i() API changed in OpenSSL 0.9.6m */
+#if OPENSSL_VERSION_NUMBER >= 0x009060dfL
        const unsigned char *p;
+#else
+       unsigned char *p;
+#endif
 
        if (certificate == NULL)
                return peer_alt_names;