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

login
register
mail settings
Submitter phabricator
Date March 6, 2018, 9:38 a.m.
Message ID <58cf84a1c1fd8e2ee66641300302cf9f@localhost.localdomain>
Download mbox | patch
Permalink /patch/29059/
State Not Applicable
Headers show

Comments

phabricator - March 6, 2018, 9:38 a.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG25798cf7dc9d: sslutil: sslcontext needs the cipher name as a sysstr (authored by durin42, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D2689?vs=6648&id=6666

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') %