##// END OF EJS Templates
sslutil: move code examining _canloaddefaultcerts out of _defaultcacerts...
Gregory Szorc -
r29107:c8fbfb91 default
parent child Browse files
Show More
@@ -222,14 +222,13 b' def _plainapplepython():'
222 exe.startswith('/system/library/frameworks/python.framework/'))
222 exe.startswith('/system/library/frameworks/python.framework/'))
223
223
224 def _defaultcacerts():
224 def _defaultcacerts():
225 """return path to CA certificates; None for system's store; ! to disable"""
225 """return path to default CA certificates or None."""
226 if _plainapplepython():
226 if _plainapplepython():
227 dummycert = os.path.join(os.path.dirname(__file__), 'dummycert.pem')
227 dummycert = os.path.join(os.path.dirname(__file__), 'dummycert.pem')
228 if os.path.exists(dummycert):
228 if os.path.exists(dummycert):
229 return dummycert
229 return dummycert
230 if _canloaddefaultcerts:
230
231 return None
231 return None
232 return '!'
233
232
234 def sslkwargs(ui, host):
233 def sslkwargs(ui, host):
235 """Determine arguments to pass to wrapsocket().
234 """Determine arguments to pass to wrapsocket().
@@ -262,8 +261,12 b' def sslkwargs(ui, host):'
262
261
263 # No CAs in config. See if we can load defaults.
262 # No CAs in config. See if we can load defaults.
264 cacerts = _defaultcacerts()
263 cacerts = _defaultcacerts()
265 if cacerts and cacerts != '!':
264 if cacerts:
266 ui.debug('using %s to enable OS X system CA\n' % cacerts)
265 ui.debug('using %s to enable OS X system CA\n' % cacerts)
266 else:
267 if not _canloaddefaultcerts:
268 cacerts = '!'
269
267 ui.setconfig('web', 'cacerts', cacerts, 'defaultcacerts')
270 ui.setconfig('web', 'cacerts', cacerts, 'defaultcacerts')
268
271
269 if cacerts != '!':
272 if cacerts != '!':
@@ -416,7 +416,7 b' def has_sslcontext():'
416 @check("defaultcacerts", "can verify SSL certs by system's CA certs store")
416 @check("defaultcacerts", "can verify SSL certs by system's CA certs store")
417 def has_defaultcacerts():
417 def has_defaultcacerts():
418 from mercurial import sslutil
418 from mercurial import sslutil
419 return sslutil._defaultcacerts() != '!'
419 return sslutil._defaultcacerts() or sslutil._canloaddefaultcerts
420
420
421 @check("windows", "Windows")
421 @check("windows", "Windows")
422 def has_windows():
422 def has_windows():
General Comments 0
You need to be logged in to leave comments. Login now