summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBarry Warsaw <barry@python.org>2010-03-03 12:34:43 (GMT)
committerBarry Warsaw <barry@python.org>2010-03-03 12:34:43 (GMT)
commit3c67d6ae545dca6b9b2bc933ddec774ad8e65292 (patch)
tree6bde9dad0e2352576f25c1a9719328d349e9348c
parent1545d80e07861ca8de2d138a64a146264d42cd58 (diff)
downloadcpython-3c67d6ae545dca6b9b2bc933ddec774ad8e65292.zip
cpython-3c67d6ae545dca6b9b2bc933ddec774ad8e65292.tar.gz
cpython-3c67d6ae545dca6b9b2bc933ddec774ad8e65292.tar.bz2
Reverting r78597. This is not a critical fix and we're in rc mode.
-rw-r--r--Modules/_ssl.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/Modules/_ssl.c b/Modules/_ssl.c
index 107fe13..4b0958a 100644
--- a/Modules/_ssl.c
+++ b/Modules/_ssl.c
@@ -667,12 +667,7 @@ _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;