From e50059b385e860ffecda2c63756ac1fc1fc3cca2 Mon Sep 17 00:00:00 2001 From: Nikos Mavrogiannopoulos Date: Fri, 7 Jun 2013 11:33:15 +0200 Subject: [PATCH] use X-SALSA20 to avoid any future conflicts --- src/worker-vpn.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/worker-vpn.c b/src/worker-vpn.c index 379b9a7a..eb815998 100644 --- a/src/worker-vpn.c +++ b/src/worker-vpn.c @@ -206,15 +206,15 @@ char * str; str = (char*)req->value.data; while ((token = strtok(str, ":")) != NULL) { #if GNUTLS_VERSION_NUMBER >= 0x030201 - if (strcmp(token, "ESTREAM-SALSA20-UMAC96") == 0) { - req->selected_ciphersuite = "ESTREAM-SALSA20-UMAC96"; + if (strcmp(token, "X-ESTREAM-SALSA20-UMAC96") == 0) { + req->selected_ciphersuite = "X-ESTREAM-SALSA20-UMAC96"; req->gnutls_ciphersuite = "NONE:+VERS-DTLS0.9:+COMP-NULL:+ESTREAM-SALSA20-256:+UMAC-96:+RSA:%COMPAT:%DISABLE_SAFE_RENEGOTIATION"; req->gnutls_cipher = GNUTLS_CIPHER_ESTREAM_SALSA20_256; req->gnutls_mac = GNUTLS_MAC_UMAC_96; break; - } else if (strcmp(token, "SALSA20-UMAC96") == 0) { + } else if (strcmp(token, "X-SALSA20-UMAC96") == 0) { req->gnutls_ciphersuite = "NONE:+VERS-DTLS0.9:+COMP-NULL:+SALSA20-256:+UMAC-96:+RSA:%COMPAT:%DISABLE_SAFE_RENEGOTIATION"; - req->selected_ciphersuite = "SALSA20-UMAC96"; + req->selected_ciphersuite = "X-SALSA20-UMAC96"; req->gnutls_cipher = GNUTLS_CIPHER_SALSA20_256; req->gnutls_mac = GNUTLS_MAC_UMAC_96; break;