From f9ca5e8930e906b5418f90c3921290df5eb40522 Mon Sep 17 00:00:00 2001 From: emanuele-f Date: Mon, 7 Dec 2020 15:02:49 +0100 Subject: [PATCH] Fix n2n v2 connection with empty encryption key When an empty encryption key is set, hin2n disables the encryption --- .../src/main/cpp/edge_jni/edge_android_v2.c | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/Hin2n_android/app/src/main/cpp/edge_jni/edge_android_v2.c b/Hin2n_android/app/src/main/cpp/edge_jni/edge_android_v2.c index abd3510..ff769d2 100644 --- a/Hin2n_android/app/src/main/cpp/edge_jni/edge_android_v2.c +++ b/Hin2n_android/app/src/main/cpp/edge_jni/edge_android_v2.c @@ -353,20 +353,21 @@ int start_edge_v2(n2n_edge_status_t* status) conf.transop_id = N2N_TRANSFORM_ID_TWOFISH; conf.encrypt_key = strdup(cmd->enc_key); traceEvent(TRACE_DEBUG, "encrypt_key = '%s'\n", encrypt_key); - } - if(cmd->encryption_mode[0]) { - if(!strcmp(cmd->encryption_mode, "Twofish")) - conf.transop_id = N2N_TRANSFORM_ID_TWOFISH; - else if(!strcmp(cmd->encryption_mode, "AES-CBC")) - conf.transop_id = N2N_TRANSFORM_ID_AESCBC; - else if(!strcmp(cmd->encryption_mode, "Speck-CTR")) - conf.transop_id = N2N_TRANSFORM_ID_SPECK; - else if(!strcmp(cmd->encryption_mode, "ChaCha20")) - conf.transop_id = N2N_TRANSFORM_ID_CHACHA20; - else - traceEvent(TRACE_WARNING, "unknown encryption mode:'%s'\n", cmd->encryption_mode); - } + if(cmd->encryption_mode[0]) { + if(!strcmp(cmd->encryption_mode, "Twofish")) + conf.transop_id = N2N_TRANSFORM_ID_TWOFISH; + else if(!strcmp(cmd->encryption_mode, "AES-CBC")) + conf.transop_id = N2N_TRANSFORM_ID_AESCBC; + else if(!strcmp(cmd->encryption_mode, "Speck-CTR")) + conf.transop_id = N2N_TRANSFORM_ID_SPECK; + else if(!strcmp(cmd->encryption_mode, "ChaCha20")) + conf.transop_id = N2N_TRANSFORM_ID_CHACHA20; + else + traceEvent(TRACE_WARNING, "unknown encryption mode:'%s'\n", cmd->encryption_mode); + } + } else + conf.transop_id = N2N_TRANSFORM_ID_NULL; scan_address(ip_addr, N2N_NETMASK_STR_SIZE, ip_mode, N2N_IF_MODE_SIZE,