From 4c4650ea172a5030d3b63d0e2db2b5bc4dd98484 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Thu, 20 Mar 2014 22:54:55 +0100 Subject: [PATCH] dropped support for Salsa20 and UMAC. They are not supported by openconnect and the latest IETF drafts use Chacha20 with poly1305. --- src/worker-vpn.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/src/worker-vpn.c b/src/worker-vpn.c index c4cccf1f..e074219f 100644 --- a/src/worker-vpn.c +++ b/src/worker-vpn.c @@ -173,8 +173,6 @@ int url_cb(http_parser * parser, const char *at, size_t length) } -#define CS_ESALSA20 "OC-DTLS1_2-ESALSA20-SHA" -#define CS_SALSA20 "OC-DTLS1_2-SALSA20-SHA" #define CS_AES128_GCM "OC-DTLS1_2-AES128-GCM" #define CS_AES256_GCM "OC-DTLS1_2-AES256-GCM" @@ -183,22 +181,6 @@ int url_cb(http_parser * parser, const char *at, size_t length) static const dtls_ciphersuite_st ciphersuites[] = { #if GNUTLS_VERSION_NUMBER >= 0x030207 - { - .oc_name = CS_ESALSA20, - .gnutls_name = "NONE:+VERS-DTLS1.2:+COMP-NULL:+ESTREAM-SALSA20-256:+SHA1:+RSA:%COMPAT:%DISABLE_SAFE_RENEGOTIATION", - .gnutls_version = GNUTLS_DTLS1_2, - .gnutls_mac = GNUTLS_MAC_SHA1, - .gnutls_cipher = GNUTLS_CIPHER_ESTREAM_SALSA20_256, - .server_prio = 100 - }, - { - .oc_name = CS_SALSA20, - .gnutls_name = "NONE:+VERS-DTLS1.2:+COMP-NULL:+SALSA20-256:+SHA1:+RSA:%COMPAT:%DISABLE_SAFE_RENEGOTIATION", - .gnutls_version = GNUTLS_DTLS1_2, - .gnutls_mac = GNUTLS_MAC_SHA1, - .gnutls_cipher = GNUTLS_CIPHER_SALSA20_256, - .server_prio = 100 - }, { .oc_name = CS_AES128_GCM, .gnutls_name = "NONE:+VERS-DTLS1.2:+COMP-NULL:+AES-128-GCM:+AEAD:+RSA:%COMPAT:%DISABLE_SAFE_RENEGOTIATION:+SIGN-ALL",