diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-03-02 22:46:25 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-03-02 22:46:25 (GMT) |
| commit | 8898b24bf919da00cb43f5834c74c71c78d1ccd6 (patch) | |
| tree | 0923ff0b60af2c96feb5811b9ec64ab8586a7a5e | |
| parent | 63f2bee57f1bddd4e635d7207de1ca92c23162c5 (diff) | |
| download | cpython-8898b24bf919da00cb43f5834c74c71c78d1ccd6.zip cpython-8898b24bf919da00cb43f5834c74c71c78d1ccd6.tar.gz cpython-8898b24bf919da00cb43f5834c74c71c78d1ccd6.tar.bz2 | |
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.
........
| -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 4b0958a..107fe13 100644 --- 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; |