Merged revisions 78598 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r78598 | victor.stinner | 2010-03-02 23:48:17 +0100 (mar., 02 mars 2010) | 11 lines

  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 906138da71ad0f36ed8c796ba2db8e3e51fd3b6a..45c44f888fdb9587c10059da0ff6896598079ebf 100644 (file)
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -658,7 +658,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;