From: Victor Stinner <victor.stinner@haypocalc.com>
Date: Tue, 2 Mar 2010 22:44:42 +0000 (+0000)
Subject: Issue #2973: Fix gcc warning on the 2nd argument of ASN1_item_d2i() and
X-Git-Tag: v2.7a4~57
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3f75cc5cb59fde350c64f4584966b59038faaa05;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 87408c927913..f5f9ebaeb1b4 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -667,7 +667,12 @@ _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;