kennethreitz/requests
1
0
Fork 0
mirror of https://github.com/kennethreitz/requests.git synced 2026-06-05 22:50:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix SSL3 error on Ubuntu 12.04"

Browse Source 
This reverts commit c19650b00f.
This commit is contained in:
Kenneth Reitz
2012-09-24 11:05:53 -05:00
parent 1b70385d4a
commit 5ce25688e0
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
requests/packages/urllib3/connectionpool.py
+3 -11
View File
@@ -96,17 +96,9 @@ class VerifiedHTTPSConnection(HTTPSConnection):
# Wrap socket using verification with the root certs in
# trusted_root_certs
try:
self.sock = ssl.wrap_socket(sock, self.key_file, self.cert_file,
cert_reqs=self.cert_reqs,
ca_certs=self.ca_certs,
ssl_version=ssl.PROTOCOL_SSLv3)
except ssl.SSLError:
self.sock = ssl.wrap_socket(sock, self.key_file, self.cert_file,
cert_reqs=self.cert_reqs,
ca_certs=self.ca_certs,
ssl_version=ssl.PROTOCOL_SSLv23)
self.sock = ssl.wrap_socket(sock, self.key_file, self.cert_file,
cert_reqs=self.cert_reqs,
ca_certs=self.ca_certs)
if self.ca_certs:
match_hostname(self.sock.getpeercert(), self.host)