[Python-checkins] r78596 - python/trunk/Modules/_ssl.c

[victor.stinner]

Author: victor.stinner
Date: Tue Mar  2 23:44:42 2010
New Revision: 78596

Log:
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.


Modified:
   python/trunk/Modules/_ssl.c

Modified: python/trunk/Modules/_ssl.c
==============================================================================
--- python/trunk/Modules/_ssl.c	(original)
+++ python/trunk/Modules/_ssl.c	Tue Mar  2 23:44:42 2010
@@ -667,7 +667,12 @@
 	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;