From: Victor Stinner Date: Tue, 2 Mar 2010 22:48:17 +0000 (+0000) Subject: Merged revisions 78596 via svnmerge from X-Git-Tag: v3.2a1~1590 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7124a41da295a39360d423a4c3d49902eeee1a9e;p=python 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 dfe2fb06f5..a6c3eb8b2c 100644 --- 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;