[XS] Change in openvpn[master]: test_tls_crypt: Fix issue with temp file name on big endian systems

cron2 has uploaded a new patch set (#2) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1761?usp=email )

The following approvals got outdated and were removed:
Code-Review+2 by plaisthos


Change subject: test_tls_crypt: Fix issue with temp file name on big endian systems
......................................................................

test_tls_crypt: Fix issue with temp file name on big endian systems

Encountered by Fedora s390x build instances.

Change-Id: Iba577d662b389de539b81034735e437199cb495d
Signed-off-by: Frank Lichtenheld <[email protected]>
Acked-by: Arne Schwabe <[email protected]>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1761
Message-Id: <[email protected]>
URL: https://www.mail-archive.com/[email protected]/msg37454.html
Signed-off-by: Gert Doering <[email protected]>
---
M tests/unit_tests/openvpn/test_tls_crypt.c
1 file changed, 7 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/61/1761/2

diff --git a/tests/unit_tests/openvpn/test_tls_crypt.c b/tests/unit_tests/openvpn/test_tls_crypt.c
index 82b1dc8..1d8ac25 100644
--- a/tests/unit_tests/openvpn/test_tls_crypt.c
+++ b/tests/unit_tests/openvpn/test_tls_crypt.c
@@ -722,8 +722,13 @@
 
     tls_options.tmp_dir = "/tmp";
 
-    /* Since we override rand_bytes the tmpfile name is non-random as well */
-    const char *non_random_tmpfile = "/tmp/openvpn_tls_crypt_v2_metadata__706050403020100706050403020100.tmp";
+    /* Since we override rand_bytes the tmpfile name is non-random as well.
+     * Build the expected name via the same code path as
+     * platform_create_temp_file() */
+    char non_random_tmpfile[128];
+    snprintf(non_random_tmpfile, sizeof(non_random_tmpfile),
+             "%s/" PACKAGE "_tls_crypt_v2_metadata__%08" PRIx64 "%08" PRIx64 ".tmp",
+             tls_options.tmp_dir, get_random(), get_random());
     unlink(non_random_tmpfile);
 
     expect_string(__wrap_buffer_write_file, filename, non_random_tmpfile);

-- 
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1761?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email

Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Iba577d662b389de539b81034735e437199cb495d
Gerrit-Change-Number: 1761
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]>
Gerrit-Reviewer: plaisthos <[email protected]>
Gerrit-CC: openvpn-devel <[email protected]>

_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel