Differential D4721 Diff 11741 lang/python33/files/patch-PR195511

Changeset View

Standalone View

	Show First 20 Lines • Show All 94 Lines • ▼ Show 20 Lines
	else:			else:
	_PROTOCOL_NAMES[PROTOCOL_SSLv2] = "SSLv2"			_PROTOCOL_NAMES[PROTOCOL_SSLv2] = "SSLv2"
	+try:			+try:
	+ from _ssl import PROTOCOL_SSLv3			+ from _ssl import PROTOCOL_SSLv3
	+ _SSLv3_IF_EXISTS = PROTOCOL_SSLv3			+ _SSLv3_IF_EXISTS = PROTOCOL_SSLv3
	+except ImportError:			+except ImportError:
	+ _SSLv3_IF_EXISTS = None			+ _SSLv3_IF_EXISTS = None
	+else:			+else:
	+ _PROTOCOL_NAMES[PROTOCOL_SSLv2] = "SSLv3"			+ _PROTOCOL_NAMES[PROTOCOL_SSLv3] = "SSLv3"

	from socket import getnameinfo as _getnameinfo			from socket import getnameinfo as _getnameinfo
	from socket import error as socket_error			from socket import error as socket_error
	@@ -664,7 +678,7 @@ def PEM_cert_to_DER_cert(pem_cert_string			@@ -664,7 +678,7 @@ def PEM_cert_to_DER_cert(pem_cert_string
	d = pem_cert_string.strip()[len(PEM_HEADER):-len(PEM_FOOTER)]			d = pem_cert_string.strip()[len(PEM_HEADER):-len(PEM_FOOTER)]
	return base64.decodebytes(d.encode('ASCII', 'strict'))			return base64.decodebytes(d.encode('ASCII', 'strict'))

	-def get_server_certificate(addr, ssl_version=PROTOCOL_SSLv3, ca_certs=None):			-def get_server_certificate(addr, ssl_version=PROTOCOL_SSLv3, ca_certs=None):
	▲ Show 20 Lines • Show All 55 Lines • Show Last 20 Lines