[Python-checkins] r78597 - in python/branches/release26-maint: Modules/_ssl.c

[victor.stinner]

Author: victor.stinner
Date: Tue Mar  2 23:46:25 2010
New Revision: 78597

Log:
Merged revisions 78596 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78596 | victor.stinner | 2010-03-02 23:44:42 +0100 (mar., 02 mars 2010) | 4 lines
  
  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/branches/release26-maint/   (props changed)
   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	Tue Mar  2 23:46:25 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;