comparison mercurial/sslutil.py @ 44899:4ca1110991c4

sslutil: rename 'minimumprotocolui' -> 'minimumprotocol'

Before, both 'minimumprotocolui' and 'minimumprotocol' were used, but meaning
the same.

44898:d61c05450b37

        b'legacyfingerprint': False,
        # PROTOCOL_* constant to use for SSLContext.__init__.
        b'protocol': None,
        # String representation of minimum protocol to be used for UI
        # presentation.
        b'minimumprotocolui': None,
        # ssl.CERT_* constant used by SSLContext.verify_mode.
        b'verifymode': None,
        # Defines extra ssl.OP* bitwise options to set.
        b'ctxoptions': None,
        # OpenSSL Cipher List to use (instead of default).

    # We always print a "connection security to %s is disabled..." message when
    # --insecure is used. So no need to print anything more here.
    if ui.insecureconnections:
        minimumprotocol = b'tls1.0'

    s[b'minimumprotocolui'] = minimumprotocol
    s[b'protocol'], s[b'ctxoptions'] = protocolsettings(minimumprotocol)

    ciphers = ui.config(b'hostsecurity', b'ciphers')
    ciphers = ui.config(b'hostsecurity', b'%s:ciphers' % bhostname, ciphers)
    s[b'ciphers'] = ciphers

            # outright. Hopefully the reason for this error is that we require
            # TLS 1.1+ and the server only supports TLS 1.0. Whatever the
            # reason, try to emit an actionable warning.
            if e.reason == 'UNSUPPORTED_PROTOCOL':
                # We attempted TLS 1.0+.
                if settings[b'minimumprotocolui'] == b'tls1.0':
                    # We support more than just TLS 1.0+. If this happens,
                    # the likely scenario is either the client or the server
                    # is really old. (e.g. server doesn't support TLS 1.0+ or
                    # client doesn't support modern TLS versions introduced
                    # several years from when this comment was written).

                            b'(could not negotiate a common security protocol (%s+) '
                            b'with %s; the likely cause is Mercurial is configured '
                            b'to be more secure than the server can support)\n'
                        )
                        % (
                            settings[b'minimumprotocolui'],
                            pycompat.bytesurl(serverhostname),
                        )
                    )
                    ui.warn(
                        _(

44899:4ca1110991c4

        b'legacyfingerprint': False,
        # PROTOCOL_* constant to use for SSLContext.__init__.
        b'protocol': None,
        # String representation of minimum protocol to be used for UI
        # presentation.
        b'minimumprotocol': None,
        # ssl.CERT_* constant used by SSLContext.verify_mode.
        b'verifymode': None,
        # Defines extra ssl.OP* bitwise options to set.
        b'ctxoptions': None,
        # OpenSSL Cipher List to use (instead of default).

    # We always print a "connection security to %s is disabled..." message when
    # --insecure is used. So no need to print anything more here.
    if ui.insecureconnections:
        minimumprotocol = b'tls1.0'

    s[b'minimumprotocol'] = minimumprotocol
    s[b'protocol'], s[b'ctxoptions'] = protocolsettings(minimumprotocol)

    ciphers = ui.config(b'hostsecurity', b'ciphers')
    ciphers = ui.config(b'hostsecurity', b'%s:ciphers' % bhostname, ciphers)
    s[b'ciphers'] = ciphers

            # outright. Hopefully the reason for this error is that we require
            # TLS 1.1+ and the server only supports TLS 1.0. Whatever the
            # reason, try to emit an actionable warning.
            if e.reason == 'UNSUPPORTED_PROTOCOL':
                # We attempted TLS 1.0+.
                if settings[b'minimumprotocol'] == b'tls1.0':
                    # We support more than just TLS 1.0+. If this happens,
                    # the likely scenario is either the client or the server
                    # is really old. (e.g. server doesn't support TLS 1.0+ or
                    # client doesn't support modern TLS versions introduced
                    # several years from when this comment was written).

                            b'(could not negotiate a common security protocol (%s+) '
                            b'with %s; the likely cause is Mercurial is configured '
                            b'to be more secure than the server can support)\n'
                        )
                        % (
                            settings[b'minimumprotocol'],
                            pycompat.bytesurl(serverhostname),
                        )
                    )
                    ui.warn(
                        _(