qulogic/pidgin

jabber.c: remove the historical giant #if 0 bloclk in jabber_process_starttls()
release-2.x.y
2017-11-28, Tom Li
d121a4418d1f
Parents a79591f914bd
Children 7f478dc7e64f
jabber.c: remove the historical giant #if 0 bloclk in jabber_process_starttls()

jabber_process_starttls() has a big piece of commented code for years. This
piece of code should be removed from the file.
1 files changed, 1 insertions(+), 17 deletions(-)
  • +1 -17
    libpurple/protocols/jabber/jabber.c
    • --- a/libpurple/protocols/jabber/jabber.c Tue Nov 28 16:20:03 2017 +0800
    +++ b/libpurple/protocols/jabber/jabber.c Tue Nov 28 16:24:12 2017 +0800
    @@ -220,22 +220,6 @@
    account = purple_connection_get_account(js->gc);
    -#if 0
    - /*
    - * This code DOES NOT EXIST, will never be enabled by default, and
    - * will never ever be supported (by me).
    - * It's literally *only* for developer testing.
    - */
    - {
    - const gchar *connection_security = purple_account_get_string(account, "connection_security", JABBER_DEFAULT_REQUIRE_TLS);
    - if (!purple_strequal(connection_security, "none") &&
    - purple_ssl_is_supported()) {
    - jabber_send_raw(js,
    - "<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>", -1);
    - return TRUE;
    - }
    - }
    -#else
    /* It's a secure BOSH connection, just return FALSE and skip, without doing anything extra.
    * XEP-0206 (XMPP Over BOSH): The client SHOULD ignore any Transport Layer Security (TLS)
    * feature since BOSH channel encryption SHOULD be negotiated at the HTTP layer.
    @@ -255,7 +239,7 @@
    "<starttls xmlns='urn:ietf:params:xml:ns:xmpp-tls'/>", -1);
    return TRUE;
    }
    -#endif
    +
    /* It's an insecure standard XMPP connection, or an insecure BOSH connection, let's
    * ignore STARTTLS even it's required by the server to prevent disabling HTTP BOSH
    * entirely (sysadmin is responsible to provide HTTPS-only BOSH if security is required),