Show More
@@ -81,7 +81,7 b' def _hostsettings(ui, hostname):' | |||||
81 | b'protocol': None, |
|
81 | b'protocol': None, | |
82 | # String representation of minimum protocol to be used for UI |
|
82 | # String representation of minimum protocol to be used for UI | |
83 | # presentation. |
|
83 | # presentation. | |
84 |
b'minimumprotocol |
|
84 | b'minimumprotocol': None, | |
85 | # ssl.CERT_* constant used by SSLContext.verify_mode. |
|
85 | # ssl.CERT_* constant used by SSLContext.verify_mode. | |
86 | b'verifymode': None, |
|
86 | b'verifymode': None, | |
87 | # Defines extra ssl.OP* bitwise options to set. |
|
87 | # Defines extra ssl.OP* bitwise options to set. | |
@@ -123,7 +123,7 b' def _hostsettings(ui, hostname):' | |||||
123 | if ui.insecureconnections: |
|
123 | if ui.insecureconnections: | |
124 | minimumprotocol = b'tls1.0' |
|
124 | minimumprotocol = b'tls1.0' | |
125 |
|
125 | |||
126 |
s[b'minimumprotocol |
|
126 | s[b'minimumprotocol'] = minimumprotocol | |
127 | s[b'protocol'], s[b'ctxoptions'] = protocolsettings(minimumprotocol) |
|
127 | s[b'protocol'], s[b'ctxoptions'] = protocolsettings(minimumprotocol) | |
128 |
|
128 | |||
129 | ciphers = ui.config(b'hostsecurity', b'ciphers') |
|
129 | ciphers = ui.config(b'hostsecurity', b'ciphers') | |
@@ -402,7 +402,7 b' def wrapsocket(sock, keyfile, certfile, ' | |||||
402 | # reason, try to emit an actionable warning. |
|
402 | # reason, try to emit an actionable warning. | |
403 | if e.reason == 'UNSUPPORTED_PROTOCOL': |
|
403 | if e.reason == 'UNSUPPORTED_PROTOCOL': | |
404 | # We attempted TLS 1.0+. |
|
404 | # We attempted TLS 1.0+. | |
405 |
if settings[b'minimumprotocol |
|
405 | if settings[b'minimumprotocol'] == b'tls1.0': | |
406 | # We support more than just TLS 1.0+. If this happens, |
|
406 | # We support more than just TLS 1.0+. If this happens, | |
407 | # the likely scenario is either the client or the server |
|
407 | # the likely scenario is either the client or the server | |
408 | # is really old. (e.g. server doesn't support TLS 1.0+ or |
|
408 | # is really old. (e.g. server doesn't support TLS 1.0+ or | |
@@ -447,7 +447,7 b' def wrapsocket(sock, keyfile, certfile, ' | |||||
447 | b'to be more secure than the server can support)\n' |
|
447 | b'to be more secure than the server can support)\n' | |
448 | ) |
|
448 | ) | |
449 | % ( |
|
449 | % ( | |
450 |
settings[b'minimumprotocol |
|
450 | settings[b'minimumprotocol'], | |
451 | pycompat.bytesurl(serverhostname), |
|
451 | pycompat.bytesurl(serverhostname), | |
452 | ) |
|
452 | ) | |
453 | ) |
|
453 | ) |
General Comments 0
You need to be logged in to leave comments.
Login now