Mercurial > public > mercurial-scm > hg
comparison mercurial/sslutil.py @ 29557:53de8255ec4e
sslutil: update comment about create_default_context()
While ssl.create_default_context() creates a SSLContext with
reasonable default options, we can't use it because it conflicts with
our CA loading controls. So replace the comment with reality.
(FWIW the comment was written before the existing CA loading code
was in place.)
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Thu, 14 Jul 2016 19:56:39 -0700 |
| parents | 4a7b0c696fbc |
| children | a935cd7d51a6 |
comparison
equal
deleted
inserted
replaced
| 29556:1b8b6adb2365 | 29557:53de8255ec4e |
|---|---|
| 262 if not serverhostname: | 262 if not serverhostname: |
| 263 raise error.Abort(_('serverhostname argument is required')) | 263 raise error.Abort(_('serverhostname argument is required')) |
| 264 | 264 |
| 265 settings = _hostsettings(ui, serverhostname) | 265 settings = _hostsettings(ui, serverhostname) |
| 266 | 266 |
| 267 # TODO use ssl.create_default_context() on modernssl. | 267 # We can't use ssl.create_default_context() because it calls |
| 268 # load_default_certs() unless CA arguments are passed to it. We want to | |
| 269 # have explicit control over CA loading because implicitly loading | |
| 270 # CAs may undermine the user's intent. For example, a user may define a CA | |
| 271 # bundle with a specific CA cert removed. If the system/default CA bundle | |
| 272 # is loaded and contains that removed CA, you've just undone the user's | |
| 273 # choice. | |
| 268 sslcontext = SSLContext(settings['protocol']) | 274 sslcontext = SSLContext(settings['protocol']) |
| 269 | 275 |
| 270 # This is a no-op unless using modern ssl. | 276 # This is a no-op unless using modern ssl. |
| 271 sslcontext.options |= settings['ctxoptions'] | 277 sslcontext.options |= settings['ctxoptions'] |
| 272 | 278 |