Patchwork D2689: sslutil: sslcontext needs the cipher name as a sysstr

login
register
mail settings
Submitter phabricator
Date March 5, 2018, 2:20 a.m.
Message ID <differential-rev-PHID-DREV-jioh5qjepovge47iobh4-req@phab.mercurial-scm.org>
Download mbox | patch
Permalink /patch/29040/
State Superseded
Headers show

Comments

phabricator - March 5, 2018, 2:20 a.m.
durin42 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D2689

AFFECTED FILES
  mercurial/sslutil.py

CHANGE DETAILS




To: durin42, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/sslutil.py b/mercurial/sslutil.py
--- a/mercurial/sslutil.py
+++ b/mercurial/sslutil.py
@@ -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') %