This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	durin42	D2690 sslutil: some more forcebytes() on some exception messages
Closed	durin42	D2689 sslutil: sslcontext needs the cipher name as a sysstr
Closed	durin42	D2688 hgweb: adapt to socket._fileobject changes in Python 3
Closed	durin42	D2687 sslutil: lots of unicode/bytes cleanup

Diff 6666

	# This is a no-op unless using modern ssl.			# This is a no-op unless using modern ssl.
	sslcontext.options \|= settings['ctxoptions']			sslcontext.options \|= settings['ctxoptions']

	# This still works on our fake SSLContext.			# This still works on our fake SSLContext.
	sslcontext.verify_mode = settings['verifymode']			sslcontext.verify_mode = settings['verifymode']

	if settings['ciphers']:			if settings['ciphers']:
	try:			try:
	sslcontext.set_ciphers(settings['ciphers'])			sslcontext.set_ciphers(pycompat.sysstr(settings['ciphers']))
	except ssl.SSLError as e:			except ssl.SSLError as e:
	raise error.Abort(_('could not set ciphers: %s') % e.args[0],			raise error.Abort(_('could not set ciphers: %s') % e.args[0],
	hint=_('change cipher string (%s) in config') %			hint=_('change cipher string (%s) in config') %
	settings['ciphers'])			settings['ciphers'])

	if certfile is not None:			if certfile is not None:
	def password():			def password():
	f = keyfile or certfile			f = keyfile or certfile