diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-03-02 22:48:17 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-03-02 22:48:17 (GMT) |
| commit | 7124a41da295a39360d423a4c3d49902eeee1a9e (patch) | |
| tree | 4d7a245992005241a339e80afb11365ae0bf3658 | |
| parent | 698a18aa9e8e0f3fca081dc12544002a4d0e83ec (diff) | |
| download | cpython-7124a41da295a39360d423a4c3d49902eeee1a9e.zip cpython-7124a41da295a39360d423a4c3d49902eeee1a9e.tar.gz cpython-7124a41da295a39360d423a4c3d49902eeee1a9e.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 dfe2fb0..a6c3eb8 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; |