GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-02-10 08:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

estream ciphersuite was given priority

Browse Source
This commit is contained in:
Nikos Mavrogiannopoulos
2013-05-19 14:10:08 +02:00
parent dac888f1f5
commit f803b2bdf6
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/worker-vpn.c
View File

@@ -294,16 +294,16 @@ uint8_t* p;
case HEADER_DTLS_CIPHERSUITE:
#if GNUTLS_VERSION_NUMBER >= 0x030200
if (memmem(req->value.data, req->value.length, "SALSA20-UMAC96", 14) != NULL) {
req->gnutls_ciphersuite = "NONE:+VERS-DTLS0.9:+COMP-NULL:+SALSA20:+UMAC96:+RSA:%COMPAT:%DISABLE_SAFE_RENEGOTIATION";
if (memmem(req->value.data, req->value.length, "ESTREAM-SALSA20-UMAC96", 21) != NULL) {
req->selected_ciphersuite = "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;
} else if (memmem(req->value.data, req->value.length, "SALSA20-UMAC96", 14) != NULL) {
req->gnutls_ciphersuite = "NONE:+VERS-DTLS0.9:+COMP-NULL:+SALSA20-256:+UMAC-96:+RSA:%COMPAT:%DISABLE_SAFE_RENEGOTIATION";
req->selected_ciphersuite = "SALSA20-UMAC96";
req->gnutls_cipher = GNUTLS_CIPHER_SALSA20_256;
req->gnutls_mac = GNUTLS_MAC_UMAC_96;
} else if (memmem(req->value.data, req->value.length, "ESTREAM-SALSA20-UMAC96", 21) != NULL) {
req->selected_ciphersuite = "ESTREAM-SALSA20-UMAC96";
req->gnutls_ciphersuite = "NONE:+VERS-DTLS0.9:+COMP-NULL:+ESTREAM-SALSA20:+UMAC96:+RSA:%COMPAT:%DISABLE_SAFE_RENEGOTIATION";
req->gnutls_cipher = GNUTLS_CIPHER_ESTREAM_SALSA20_256;
req->gnutls_mac = GNUTLS_MAC_UMAC_96;
} else
#endif
if (memmem(req->value.data, req->value.length, "AES128-SHA", 10) != NULL) {
@@ -470,6 +470,7 @@ gnutls_datum_t sid = { ws->session_id, sizeof(ws->session_id) };
return -1;
}
oclog(ws, LOG_INFO, "setting up DTLS connection");
/* DTLS cookie verified.
* Initialize session.
*/