summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-10-13 22:10:31 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-10-13 22:10:31 (GMT)
commit8e73403284b1c2a1e38ec63986e30b7080058cdb (patch)
tree1ee9bce5f0b6fe40d6d8675d48d59769e1632e68 /Modules
parent4de6b06134370c974b18ffd8077f864972248ee4 (diff)
downloadcpython-8e73403284b1c2a1e38ec63986e30b7080058cdb.zip
cpython-8e73403284b1c2a1e38ec63986e30b7080058cdb.tar.gz
cpython-8e73403284b1c2a1e38ec63986e30b7080058cdb.tar.bz2
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 ........
Diffstat (limited to 'Modules')
-rw-r--r--Modules/_ssl.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 1131bfa..5595c15 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -680,7 +680,7 @@ _get_peer_alt_names (X509 *certificate) {
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;
@@ -1041,7 +1041,7 @@ return the certificate even if it wasn't validated.");
static PyObject *PySSL_cipher (PySSLObject *self) {
PyObject *retval, *v;
- SSL_CIPHER *current;
+ const SSL_CIPHER *current;
char *cipher_name;
char *cipher_protocol;