[Python-checkins] r78630 - python/branches/release26-maint/Modules/_ssl.c

Wed Mar 3 13:34:43 CET 2010

Author: barry.warsaw
Date: Wed Mar 3 13:34:43 2010
New Revision: 78630
Log:
Reverting r78597. This is not a critical fix and we're in rc mode.
Modified:
 python/branches/release26-maint/Modules/_ssl.c
Modified: python/branches/release26-maint/Modules/_ssl.c
==============================================================================

--- python/branches/release26-maint/Modules/_ssl.c	(original)
+++ python/branches/release26-maint/Modules/_ssl.c	Wed Mar 3 13:34:43 2010
@@ -667,12 +667,7 @@
 	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;
