diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-03-02 22:49:30 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-03-02 22:49:30 (GMT) |
| commit | 117ff17da3d032f10019be534d94be802702cd45 (patch) | |
| tree | 09a7a3bffe60e88e7bd26821b37bb484bbb09e86 /Modules | |
| parent | bf15dce0a37b9bfdc6c1cbc9e8e094ce61994dc3 (diff) | |
| download | cpython-117ff17da3d032f10019be534d94be802702cd45.zip cpython-117ff17da3d032f10019be534d94be802702cd45.tar.gz cpython-117ff17da3d032f10019be534d94be802702cd45.tar.bz2 | |
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.
........
................
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/_ssl.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c index 906138d..45c44f8 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; |