Mercurial > cpython-lru_cache-weakref
diff Modules/_ssl.c @ 59278:01d6a14aba65
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.
........
| author | Victor Stinner <victor.stinner@haypocalc.com> |
|---|---|
| date | Tue, 02 Mar 2010 22:48:17 +0000 |
| parents | a1d166ab18c4 |
| children | e407eba8e38d |
line wrap: on
line diff
--- a/Modules/_ssl.c Tue Mar 02 22:34:37 2010 +0000 +++ b/Modules/_ssl.c Tue Mar 02 22:48:17 2010 +0000 @@ -658,7 +658,12 @@ 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;