diff mbox series

[Openvpn-devel] test_crypto: fix test_occ_mtu_calculation with --disable-fragment

Message ID 20220624122657.28675-1-frank@lichtenheld.com
State Accepted
Headers
Series [Openvpn-devel] test_crypto: fix test_occ_mtu_calculation with --disable-fragment |

Commit Message

Frank Lichtenheld June 24, 2022, 2:26 a.m. UTC 
  Doesn't make sense to test with fragment, if the code
ignores it.

Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
---
 tests/unit_tests/openvpn/test_crypto.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Arne Schwabe Oct. 19, 2022, 4:34 p.m. UTC | #1 
Am 24.06.22 um 14:26 schrieb Frank Lichtenheld:
> Doesn't make sense to test with fragment, if the code
> ignores it.
> 

Acked-By: Arne Schwabe <arne@rfc2543.org>
Gert Doering Oct. 19, 2022, 5:39 p.m. UTC | #2 
Change makes sense :-) - have not tested any actual builds without
ENABLE_FRAGMENT to verify that it exploded *before*, but it looks
like this will fix it.

Your patch has been applied to the master branch.

commit 252e5d6888261d7b2aae1034c834fba8a393cef4
Author: Frank Lichtenheld
Date:   Fri Jun 24 14:26:57 2022 +0200

     test_crypto: fix test_occ_mtu_calculation with --disable-fragment

     Signed-off-by: Frank Lichtenheld <frank@lichtenheld.com>
     Acked-by: Arne Schwabe <arne@rfc2549.org>
     Message-Id: <20220624122657.28675-1-frank@lichtenheld.com>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg24550.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering
diff mbox series

Patch

diff --git a/tests/unit_tests/openvpn/test_crypto.c b/tests/unit_tests/openvpn/test_crypto.c
index 83572b82..aec4e049 100644
--- a/tests/unit_tests/openvpn/test_crypto.c
+++ b/tests/unit_tests/openvpn/test_crypto.c
@@ -299,13 +299,15 @@  test_occ_mtu_calculation(void **state)
     linkmtu = calc_options_string_link_mtu(&o, &f);
     assert_int_equal(linkmtu, 1445);
 
+#if defined(ENABLE_FRAGMENT)
     /* 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.ce.fragment = 0;
+#endif
 
     o.comp.alg = COMP_ALG_UNDEF;
-    o.ce.fragment = 0;
 #endif
 
     /* TLS mode */
@@ -350,7 +352,7 @@  test_occ_mtu_calculation(void **state)
     assert_int_equal(linkmtu, 1449);
 
 
-#if defined(USE_COMP)
+#if defined(USE_COMP) && defined(ENABLE_FRAGMENT)
     o.comp.alg = COMP_ALG_LZO;
 
     /* tls client, auth SHA1, cipher AES-256-GCM, fragment, comp-lzo yes */