diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-03-02 22:44:42 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-03-02 22:44:42 (GMT) |
| commit | 3f75cc5cb59fde350c64f4584966b59038faaa05 (patch) | |
| tree | ba9da382bdba5581f1c2148947f14475c7958660 /Modules | |
| parent | c0a9d4152d78da943b1d63727d0f79b9da751eb1 (diff) | |
| download | cpython-3f75cc5cb59fde350c64f4584966b59038faaa05.zip cpython-3f75cc5cb59fde350c64f4584966b59038faaa05.tar.gz cpython-3f75cc5cb59fde350c64f4584966b59038faaa05.tar.bz2 | |
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 87408c9..f5f9eba 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; |