summaryrefslogtreecommitdiff
path: root/tests/unit_tests
diff options
context:
space:
mode:
authorBernhard Schmidt <berni@debian.org>2020-10-20 19:17:07 +0200
committerBernhard Schmidt <berni@debian.org>2020-10-20 19:17:07 +0200
commit63934be0e9a494086d103bc3ba43c444b5460b5b (patch)
treee2b5876072df6d56023d21a66379544e2bef9d5f /tests/unit_tests
parent4ca7910f8fbd80a28780cff34d27b481ae882f67 (diff)
parent80285c31e83a8e233016e227a393543d508194eb (diff)
Update upstream source from tag 'upstream/2.5_rc3'
Update to upstream version '2.5~rc3' with Debian dir 654a857be97a3895ea7ff814fea7c3f9f80e8794
Diffstat (limited to 'tests/unit_tests')
-rw-r--r--tests/unit_tests/openvpn/test_ncp.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/tests/unit_tests/openvpn/test_ncp.c b/tests/unit_tests/openvpn/test_ncp.c
index a4334c8..4077be5 100644
--- a/tests/unit_tests/openvpn/test_ncp.c
+++ b/tests/unit_tests/openvpn/test_ncp.c
@@ -50,7 +50,9 @@ test_check_ncp_ciphers_list(void **state)
struct gc_arena gc = gc_new();
bool have_chacha = cipher_kt_get("CHACHA20-POLY1305");
-
+ assert_string_equal(mutate_ncp_cipher_list("none", &gc), "none");
+ assert_string_equal(mutate_ncp_cipher_list("AES-256-GCM:none", &gc),
+ "AES-256-GCM:none");
assert_string_equal(mutate_ncp_cipher_list(aes_ciphers, &gc), aes_ciphers);
@@ -139,7 +141,7 @@ test_poor_man(void **state)
char *best_cipher;
const char *serverlist = "CHACHA20_POLY1305:AES-128-GCM";
- const char *serverlistbfcbc = "CHACHA20_POLY1305:AES-128-GCM:BF-CBC";
+ const char *serverlistbfcbc = "CHACHA20_POLY1305:AES-128-GCM:BF-CBC:none";
best_cipher = ncp_get_best_cipher(serverlist,
"IV_YOLO=NO\nIV_BAR=7",
@@ -166,6 +168,14 @@ test_poor_man(void **state)
assert_string_equal(best_cipher, "AES-128-GCM");
+ best_cipher = ncp_get_best_cipher(serverlist, NULL,
+ "none", &gc);
+ assert_ptr_equal(best_cipher, NULL);
+
+ best_cipher = ncp_get_best_cipher(serverlistbfcbc, NULL,
+ "none", &gc);
+ assert_string_equal(best_cipher, "none");
+
best_cipher = ncp_get_best_cipher(serverlist, NULL,NULL, &gc);
assert_ptr_equal(best_cipher, NULL);