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.

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 87408c927913acc16d8967fdd652d70c254a6842..f5f9ebaeb1b4226b7692f9a6cda333c1904a508d 100644 (file)
--- 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;