Mercurial > hg

changeset 36746:25798cf7dc9d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sslutil: sslcontext needs the cipher name as a sysstr Differential Revision: https://phab.mercurial-scm.org/D2689
author Augie Fackler <augie@google.com>
date Sun, 04 Mar 2018 21:15:37 -0500
parents 424994a0adfd
children 4c71a26a4009
files mercurial/sslutil.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/sslutil.py	Sun Mar 04 18:03:55 2018 -0500
+++ b/mercurial/sslutil.py	Sun Mar 04 21:15:37 2018 -0500
@@ -370,7 +370,7 @@
 
     if settings['ciphers']:
         try:
-            sslcontext.set_ciphers(settings['ciphers'])
+            sslcontext.set_ciphers(pycompat.sysstr(settings['ciphers']))
         except ssl.SSLError as e:
             raise error.Abort(_('could not set ciphers: %s') % e.args[0],
                               hint=_('change cipher string (%s) in config') %