From: Barry Warsaw <barry@python.org>
Date: Wed, 3 Mar 2010 12:34:43 +0000 (+0000)
Subject: Reverting r78597.  This is not a critical fix and we're in rc mode.
X-Git-Tag: v2.6.5rc2~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3c67d6ae545dca6b9b2bc933ddec774ad8e65292;p=python

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 107fe130fb..4b0958a6bb 100644
--- 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;