[Python-checkins] r85437 - in python/branches/release31-maint: Modules/_ssl.c

[benjamin.peterson]

Author: benjamin.peterson
Date: Thu Oct 14 00:20:48 2010
New Revision: 85437

Log:
Merged revisions 85432 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r85432 | benjamin.peterson | 2010-10-13 17:06:39 -0500 (Wed, 13 Oct 2010) | 1 line
  
  constify to appease compiler warnings
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Modules/_ssl.c

Modified: python/branches/release31-maint/Modules/_ssl.c
==============================================================================
--- python/branches/release31-maint/Modules/_ssl.c	(original)
+++ python/branches/release31-maint/Modules/_ssl.c	Thu Oct 14 00:20:48 2010
@@ -670,7 +670,7 @@
     X509_EXTENSION *ext = NULL;
     GENERAL_NAMES *names = NULL;
     GENERAL_NAME *name;
-    X509V3_EXT_METHOD *method;
+    const X509V3_EXT_METHOD *method;
     BIO *biobuf = NULL;
     char buf[2048];
     char *vptr;
@@ -1042,7 +1042,7 @@
 static PyObject *PySSL_cipher (PySSLObject *self) {
 
     PyObject *retval, *v;
-    SSL_CIPHER *current;
+    const SSL_CIPHER *current;
     char *cipher_name;
     char *cipher_protocol;