Reverting r78597. This is not a critical fix and we're in rc mode.

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 107fe130fb0f18d721496c832f3e9e5f9166bf21..4b0958a6bb9318dadadc43acd52faa122d288ea1 100644 (file)
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -667,12 +667,7 @@ _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;