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

[neal.norwitz]

Author: neal.norwitz
Date: Sat Aug 25 18:58:09 2007
New Revision: 57467

Modified:
   python/trunk/Modules/_ssl.c
Log:
Fix a few more variables to try to get this to compile with Visual Studio.


Modified: python/trunk/Modules/_ssl.c
==============================================================================
--- python/trunk/Modules/_ssl.c	(original)
+++ python/trunk/Modules/_ssl.c	Sat Aug 25 18:58:09 2007
@@ -440,6 +440,7 @@
 		PyObject *name_obj;
 		ASN1_STRING *value;
 		PyObject *value_obj;
+		unsigned char *valuebuf = NULL;
 
 		X509_NAME_ENTRY *entry = X509_NAME_get_entry(xname,
 							     index_counter);
@@ -453,7 +454,6 @@
 			goto fail0;
 
 		value = X509_NAME_ENTRY_get_data(entry);
-		unsigned char *valuebuf = NULL;
 		buflen = ASN1_STRING_to_UTF8(&valuebuf, value);
 		if (buflen < 0) {
 			Py_DECREF(name_obj);
@@ -493,6 +493,7 @@
 	int len;
 	ASN1_TIME *notBefore, *notAfter;
 	PyObject *pnotBefore, *pnotAfter;
+	int verification;
 
 	if (!self->peer_cert)
 		Py_RETURN_NONE;
@@ -501,7 +502,7 @@
 	if (retval == NULL)
 		return NULL;
 
-	int verification = SSL_CTX_get_verify_mode(self->ctx);
+	verification = SSL_CTX_get_verify_mode(self->ctx);
 	if ((verification & SSL_VERIFY_PEER) == 0)
 		return retval;