OpenSSL: Support configuration of TLSv1.3 ciphersuites

The OpenSSL developers decided, during the OpenSSL 1.1.1 development
phase, to use a different API and different set of lists for TLSv1.3
ciphersuites, than for every TLS version preceeding it.

This is stupid, but we have to work with it.

This commit also improves configuration fault resilience. The reason
is that if you don't pass any valid old-style ciphersuites, OpenSSL
will not negotiate an older protocol at all. However, when they
implemented the new API, they decided that lack of any valid
ciphersuites should result in using the defaults. This means that if
you pass a completely invalid ciphersuite list (like "foo"), OR if
you pass a TLSv1.2-only ciphersuite list, TLSv1.3 continues to work.
This is not mirrored; passing a TLSv1.3-only ciphersuite list will
break TLSv1.2 and below.

Therefore we work around this lack of mirroring by falling back to
the default list for each protocol. This means that if
ssl_cipher_list is complete garbage, the default will be used, and
TLS setup will succeed for both protocols. This is logged, so that
administrators can fix their configuration.

I prefer this approach over explicitly disabling the protocols if
their respective ciphersuite lists are invalid, because it will
result in unusable TLSv1.3 if people run newer solanum with their
older charybdis/solanum configuration files that contain custom
ssl_cipher_list definitions. Hindering TLSv1.3 adoption is not an
option, in my opinion.

The downside of this is that it is no longer possible to disable a
protocol family by not including any of its ciphersuites. This could
be remedied by an ssl_protocol_list configuration directive if it is
decided that this functionality is ultimately necessary.

This work is not required for either of the other TLS backends,
because neither of those libraries yet support TLSv1.3, and in the
event that they eventually do, I expect them to allow configuration
of newer ciphersuites with the existing APIs. This can be revisited
if it turns out not to be the case.

Signed-off-by: Aaron Jones <redacted>
Tested-by: Aaron Jones <redacted>

diff --git a/librb/src/openssl.c b/librb/src/openssl.c
index 4d3994ceed7a8bb3eb9f40d6a0cfe00e485b027e..6c5a9fbf18c88a8e948a3d6f82075857a540b5f5 100644 (file)
--- a/librb/src/openssl.c
+++ b/librb/src/openssl.c
@@ -413,13 +413,41 @@ rb_setup_ssl_server(const char *const certfile, const char *keyfile,
                }
        }
 
-       if(SSL_CTX_set_cipher_list(ssl_ctx_new, cipherlist) != 1)
+
+       int ret_old = SSL_CTX_set_cipher_list(ssl_ctx_new, cipherlist);
+
+       if (ret_old != 1)
+       {
+               (void) rb_lib_log("%s: no valid old-style ciphersuites found "
+                                 "in ssl_cipher_list; will use defaults",
+                                 __func__);
+
+               ret_old = SSL_CTX_set_cipher_list(ssl_ctx_new, rb_default_ciphers);
+       }
+
+       #ifndef LRB_HAVE_TLS13
+       int ret_new = 0;
+       #else
+       int ret_new = SSL_CTX_set_ciphersuites(ssl_ctx_new, cipherlist);
+
+       if (ret_new != 1)
        {
-               rb_lib_log("%s: SSL_CTX_set_cipher_list: could not configure any ciphers", __func__);
+               (void) rb_lib_log("%s: no valid new-style ciphersuites found "
+                                 "in ssl_cipher_list; will use defaults",
+                                 __func__);
+
+               ret_new = SSL_CTX_set_ciphersuites(ssl_ctx_new, rb_default_ciphers);
+       }
+       #endif
+
+       if (ret_old != 1 && ret_new != 1)
+       {
+               rb_lib_log("%s: could not configure any ciphers", __func__);
                SSL_CTX_free(ssl_ctx_new);
                return 0;
        }
 
+
        SSL_CTX_set_session_cache_mode(ssl_ctx_new, SSL_SESS_CACHE_OFF);
        SSL_CTX_set_verify(ssl_ctx_new, SSL_VERIFY_PEER | SSL_VERIFY_CLIENT_ONCE, verify_accept_all_cb);
 

diff --git a/librb/src/openssl_ratbox.h b/librb/src/openssl_ratbox.h
index 130d8096797cd2b4ab7dc2a5347e23039e0aa2f3..ecd6d3d650a92f779c0f13a571d46c808b167a10 100644 (file)
--- a/librb/src/openssl_ratbox.h
+++ b/librb/src/openssl_ratbox.h
@@ -95,6 +95,10 @@
 #  endif
 #endif
 
+#if !defined(LIBRESSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >= 0x10101000L)
+#  define LRB_HAVE_TLS13                1
+#endif
+
 
 
 /*
@@ -107,6 +111,11 @@
  */
 
 static const char rb_default_ciphers[] = ""
+#ifdef LRB_HAVE_TLS13
+       "TLS_AES_256_GCM_SHA384:"
+       "TLS_CHACHA20_POLY1305_SHA256:"
+       "TLS_AES_128_GCM_SHA256:"
+#endif
        "aECDSA+kEECDH+CHACHA20:"
        "aRSA+kEECDH+CHACHA20:"
        "aRSA+kEDH+CHACHA20:"