This unit-test did not consider the case when USE_COMP is not defined,
thus generating a compiler error.
Adapt the test to the case when no compression is available and while at
it, decompose the expected MTU values by featureso that it is easier to
understand.
Cc: Arne Schwabe <a...@rfc2549.org>
Signed-off-by: Antonio Quartulli <a...@unstable.cc>
---
tests/unit_tests/openvpn/test_crypto.c | 52 +++++++++++++++-----------
1 file changed, 31 insertions(+), 21 deletions(-)
diff --git a/tests/unit_tests/openvpn/test_crypto.c
b/tests/unit_tests/openvpn/test_crypto.c
index 19ce174e..851696fe 100644
--- a/tests/unit_tests/openvpn/test_crypto.c
+++ b/tests/unit_tests/openvpn/test_crypto.c
@@ -255,7 +255,7 @@ test_occ_mtu_calculation(void **state)
o.ciphername = "none";
o.authname = "none";
linkmtu = calc_options_string_link_mtu(&o, &f);
- assert_int_equal(linkmtu, 1400);
+ assert_int_equal(linkmtu, o.ce.tun_mtu);
/* Static key OCC examples */
o.shared_secret_file = "not null";
@@ -264,44 +264,51 @@ test_occ_mtu_calculation(void **state)
o.ciphername = "none";
o.authname = "none";
linkmtu = calc_options_string_link_mtu(&o, &f);
- assert_int_equal(linkmtu, 1408);
+ assert_int_equal(linkmtu, o.ce.tun_mtu + 8);
/* secret, cipher AES-128-CBC, auth none */
o.ciphername = "AES-128-CBC";
o.authname = "none";
linkmtu = calc_options_string_link_mtu(&o, &f);
- assert_int_equal(linkmtu, 1440);
+ assert_int_equal(linkmtu, o.ce.tun_mtu + 8 + 32);
/* secret, cipher none, auth SHA256 */
o.ciphername = "none";
o.authname = "SHA256";
linkmtu = calc_options_string_link_mtu(&o, &f);
- assert_int_equal(linkmtu, 1440);
+ assert_int_equal(linkmtu, o.ce.tun_mtu + 8 + 32);
- /* --secret, cipher BF-CBC, auth SHA1 */
+ /* secret, cipher BF-CBC, auth SHA1 */
o.ciphername = "BF-CBC";
o.authname = "SHA1";
linkmtu = calc_options_string_link_mtu(&o, &f);
- assert_int_equal(linkmtu, 1444);
+ assert_int_equal(linkmtu, o.ce.tun_mtu + 8 + 36);
- /* --secret, cipher BF-CBC, auth SHA1, tcp-client */
+ /* secret, cipher BF-CBC, auth SHA1, tcp-client */
o.ce.proto = PROTO_TCP_CLIENT;
linkmtu = calc_options_string_link_mtu(&o, &f);
- assert_int_equal(linkmtu, 1446);
+ assert_int_equal(linkmtu, o.ce.tun_mtu + 8 + 36 + 2);
o.ce.proto = PROTO_UDP;
- /* --secret, comp-lzo yes, cipher BF-CBC, auth SHA1 */
+ int comp_bytes = 0;
+#if defined(USE_COMP)
+ /* secret, comp-lzo yes, cipher BF-CBC, auth SHA1 */
o.comp.alg = COMP_ALG_LZO;
+ comp_bytes = 1;
linkmtu = calc_options_string_link_mtu(&o, &f);
- assert_int_equal(linkmtu, 1445);
+ assert_int_equal(linkmtu, o.ce.tun_mtu + 8 + comp_bytes + 36);
+#endif
- /* --secret, comp-lzo yes, cipher BF-CBC, auth SHA1, fragment 1200 */
+ /* secret, comp-lzo yes, cipher BF-CBC, auth SHA1, fragment 1200 */
o.ce.fragment = 1200;
linkmtu = calc_options_string_link_mtu(&o, &f);
- assert_int_equal(linkmtu, 1449);
+ assert_int_equal(linkmtu, o.ce.tun_mtu + 8 + comp_bytes + 36 + 4);
+ comp_bytes = 0;
+#if defined(USE_COMP)
o.comp.alg = COMP_ALG_UNDEF;
+#endif
o.ce.fragment = 0;
/* TLS mode */
@@ -309,32 +316,32 @@ test_occ_mtu_calculation(void **state)
o.tls_client = true;
o.pull = true;
- /* tls client, cipher AES-128-CBC, auth SHA1, tls-auth*/
+ /* tls client, cipher AES-128-CBC, auth SHA1, tls-auth */
o.authname = "SHA1";
o.ciphername = "AES-128-CBC";
o.tls_auth_file = "dummy";
linkmtu = calc_options_string_link_mtu(&o, &f);
- assert_int_equal(linkmtu, 1457);
+ assert_int_equal(linkmtu, o.ce.tun_mtu + 5 + 8 + 32 + 12);
/* tls client, cipher AES-128-CBC, auth SHA1 */
o.tls_auth_file = NULL;
linkmtu = calc_options_string_link_mtu(&o, &f);
- assert_int_equal(linkmtu, 1457);
+ assert_int_equal(linkmtu, o.ce.tun_mtu + 5 + 8 + 32 + 12);
/* tls client, cipher none, auth none */
o.authname = "none";
o.ciphername = "none";
linkmtu = calc_options_string_link_mtu(&o, &f);
- assert_int_equal(linkmtu, 1405);
+ assert_int_equal(linkmtu, o.ce.tun_mtu + 5);
/* tls client, auth none, cipher none, no-replay */
o.replay = false;
linkmtu = calc_options_string_link_mtu(&o, &f);
- assert_int_equal(linkmtu, 1401);
+ assert_int_equal(linkmtu, o.ce.tun_mtu + 1);
o.replay = true;
@@ -343,19 +350,22 @@ test_occ_mtu_calculation(void **state)
o.authname = "SHA1";
o.ciphername = "AES-256-GCM";
linkmtu = calc_options_string_link_mtu(&o, &f);
- assert_int_equal(linkmtu, 1449);
+ assert_int_equal(linkmtu, o.ce.tun_mtu + 5 + 44);
+ o.ce.fragment = 1200;
+#if defined(USE_COMP)
/* tls client, auth SHA1, cipher AES-256-GCM, fragment, comp-lzo yes */
o.comp.alg = COMP_ALG_LZO;
- o.ce.fragment = 1200;
+ comp_bytes = 1;
+#endif
linkmtu = calc_options_string_link_mtu(&o, &f);
- assert_int_equal(linkmtu, 1454);
+ assert_int_equal(linkmtu, o.ce.tun_mtu + 5 + 44 + 4 + comp_bytes);
/* tls client, auth SHA1, cipher AES-256-GCM, fragment, comp-lzo yes,
socks */
o.ce.socks_proxy_server = "socks.example.com";
linkmtu = calc_options_string_link_mtu(&o, &f);
- assert_int_equal(linkmtu, 1464);
+ assert_int_equal(linkmtu, o.ce.tun_mtu + 5 + 44 + 4 + comp_bytes + 10);
gc_free(&gc);
}
--
2.34.1
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
