From: Antonio Quartulli Date: Fri, 21 Jan 2022 15:43:13 +0100 Message-Id: <20220121144313.24961-1-a@...2181...> In-Reply-To: <20220121140941.13930-1-a@...2181...> References: <20220121140941.13930-1-a@...2181...> MIME-Version: 1.0 Subject: [Openvpn-devel] [PATCH v3] unit-test: fix test_crypto when USE_COMP is not defined List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit To: openvpn-devel@lists.sourceforge.net Cc: Antonio Quartulli , Arne Schwabe 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. Cc: Arne Schwabe Signed-off-by: Antonio Quartulli --- v2: * restore original MTU numbers - this can be addressed by another patch v3: * skip *ALL* tests assuming encryption enabled tests/unit_tests/openvpn/test_crypto.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/tests/unit_tests/openvpn/test_crypto.c b/tests/unit_tests/openvpn/test_crypto.c index 19ce174e..4fa96806 100644 --- a/tests/unit_tests/openvpn/test_crypto.c +++ b/tests/unit_tests/openvpn/test_crypto.c @@ -278,38 +278,41 @@ test_occ_mtu_calculation(void **state) linkmtu = calc_options_string_link_mtu(&o, &f); assert_int_equal(linkmtu, 1440); - /* --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); - /* --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); o.ce.proto = PROTO_UDP; - /* --secret, comp-lzo yes, cipher BF-CBC, auth SHA1 */ +#if defined(USE_COMP) o.comp.alg = COMP_ALG_LZO; + + /* secret, comp-lzo yes, cipher BF-CBC, auth SHA1 */ linkmtu = calc_options_string_link_mtu(&o, &f); assert_int_equal(linkmtu, 1445); - /* --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); o.comp.alg = COMP_ALG_UNDEF; o.ce.fragment = 0; +#endif /* TLS mode */ o.shared_secret_file = NULL; 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"; @@ -346,8 +349,10 @@ test_occ_mtu_calculation(void **state) assert_int_equal(linkmtu, 1449); - /* tls client, auth SHA1, cipher AES-256-GCM, fragment, comp-lzo yes */ +#if defined(USE_COMP) o.comp.alg = COMP_ALG_LZO; + + /* tls client, auth SHA1, cipher AES-256-GCM, fragment, comp-lzo yes */ o.ce.fragment = 1200; linkmtu = calc_options_string_link_mtu(&o, &f); assert_int_equal(linkmtu, 1454); @@ -356,6 +361,7 @@ test_occ_mtu_calculation(void **state) o.ce.socks_proxy_server = "socks.example.com"; linkmtu = calc_options_string_link_mtu(&o, &f); assert_int_equal(linkmtu, 1464); +#endif gc_free(&gc); } -- 2.34.1