tls-crypto: Support EdDSA keys with ECDSA cipher suites

Ed25519 and Ed448 are now usable in all TLS versions for connections that
use an ECDSA cipher suite, as per RFC 8422.

diff --git a/src/libtls/tls_crypto.c b/src/libtls/tls_crypto.c
index cb4ed9c530d9ad4873bcfe8eba101c4b77d46db6..2d047527477bdce75770051fa138b1456da32628 100644 (file)
--- a/src/libtls/tls_crypto.c
+++ b/src/libtls/tls_crypto.c
@@ -1397,7 +1397,9 @@ METHOD(tls_crypto_t, select_cipher_suite, tls_cipher_suite_t,
                                algs = find_suite(this->suites[i]);
                                if (algs)
                                {
-                                       if (key == KEY_ANY || key == algs->key)
+                                       if (key == KEY_ANY || key == algs->key ||
+                                               (algs->key == KEY_ECDSA && key == KEY_ED25519) ||
+                                               (algs->key == KEY_ECDSA && key == KEY_ED448))
                                        {
                                                if (create_ciphers(this, algs))
                                                {
@@ -1455,9 +1457,9 @@ static struct {
        { TLS_SIG_ECDSA_SHA512, { .scheme = SIGN_ECDSA_WITH_SHA512_DER },
                TLS_1_0, TLS_1_3 },
        { TLS_SIG_ED25519, { .scheme = SIGN_ED25519 },
-               TLS_1_3, TLS_1_3 },
+               TLS_1_0, TLS_1_3 },
        { TLS_SIG_ED448, { .scheme = SIGN_ED448 },
-               TLS_1_3, TLS_1_3 },
+               TLS_1_0, TLS_1_3 },
        { TLS_SIG_RSA_PSS_RSAE_SHA256, { .scheme = SIGN_RSA_EMSA_PSS, .params = &pss_params_sha256, },
                TLS_1_2, TLS_1_3 },
        { TLS_SIG_RSA_PSS_RSAE_SHA384, { .scheme = SIGN_RSA_EMSA_PSS, .params = &pss_params_sha384, },
@@ -1815,6 +1817,20 @@ METHOD(tls_crypto_t, sign, bool,
                                }
                                DBG2(DBG_TLS, "created signature with SHA1/ECDSA");
                                break;
+                       case KEY_ED25519:
+                               if (!key->sign(key, SIGN_ED25519, NULL, data, &sig))
+                               {
+                                       return FALSE;
+                               }
+                               DBG2(DBG_TLS, "created signature with Ed25519");
+                               break;
+                       case KEY_ED448:
+                               if (!key->sign(key, SIGN_ED448, NULL, data, &sig))
+                               {
+                                       return FALSE;
+                               }
+                               DBG2(DBG_TLS, "created signature with Ed448");
+                               break;
                        default:
                                return FALSE;
                }
@@ -1902,6 +1918,20 @@ METHOD(tls_crypto_t, verify, bool,
                                }
                                DBG2(DBG_TLS, "verified signature with SHA1/ECDSA");
                                break;
+                       case KEY_ED25519:
+                               if (!key->verify(key, SIGN_ED25519, NULL, data, sig))
+                               {
+                                       return FALSE;
+                               }
+                               DBG2(DBG_TLS, "verified signature with Ed25519");
+                               break;
+                       case KEY_ED448:
+                               if (!key->verify(key, SIGN_ED448, NULL, data, sig))
+                               {
+                                       return FALSE;
+                               }
+                               DBG2(DBG_TLS, "verified signature with Ed448");
+                               break;
                        default:
                                return FALSE;
                }
@@ -2300,6 +2330,8 @@ tls_crypto_t *tls_crypto_create(tls_t *tls, tls_cache_t *cache)
                .cache = cache,
        );
 
+       /* FIXME: EDDSA keys are currently treated like ECDSA keys. A cleaner
+        * separation would be welcome. */
        enumerator = lib->creds->create_builder_enumerator(lib->creds);
        while (enumerator->enumerate(enumerator, &type, &subtype))
        {
@@ -2311,6 +2343,8 @@ tls_crypto_t *tls_crypto_create(tls_t *tls, tls_cache_t *cache)
                                        this->rsa = TRUE;
                                        break;
                                case KEY_ECDSA:
+                               case KEY_ED25519:
+                               case KEY_ED448:
                                        this->ecdsa = TRUE;
                                        break;
                                default: