aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel P. Berrangé <berrange@redhat.com>2022-09-28 15:57:24 +0100
committerDaniel P. Berrangé <berrange@redhat.com>2022-10-27 11:55:41 +0100
commitf1018ea0a30f577d1e3515d0a6362e362a0cb86f (patch)
treed3e864f0cd098cb53d8b6bf23a41e51fd666eb0c
parent3983bf1b41cefcf553a2c6316f767367d6977b51 (diff)
downloadqemu-f1018ea0a30f577d1e3515d0a6362e362a0cb86f.zip
qemu-f1018ea0a30f577d1e3515d0a6362e362a0cb86f.tar.gz
qemu-f1018ea0a30f577d1e3515d0a6362e362a0cb86f.tar.bz2
tests: avoid DOS line endings in PSK file
Using FILE * APIs for writing the PSK file results in translation from UNIX to DOS line endings on Windows. When the crypto PSK code later loads the credentials the stray \r will result in failure to load the PSK credentials into GNUTLS. Rather than switching the FILE* APIs to open in binary format, just switch to the more concise g_file_set_contents API. Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Tested-by: Bin Meng <bmeng.cn@gmail.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-rw-r--r--tests/unit/crypto-tls-psk-helpers.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/tests/unit/crypto-tls-psk-helpers.c b/tests/unit/crypto-tls-psk-helpers.c
index 511e08c..c6cc740 100644
--- a/tests/unit/crypto-tls-psk-helpers.c
+++ b/tests/unit/crypto-tls-psk-helpers.c
@@ -27,15 +27,14 @@
static void
test_tls_psk_init_common(const char *pskfile, const char *user, const char *key)
{
- FILE *fp;
+ g_autoptr(GError) gerr = NULL;
+ g_autofree char *line = g_strdup_printf("%s:%s\n", user, key);
- fp = fopen(pskfile, "w");
- if (fp == NULL) {
- g_critical("Failed to create pskfile %s: %s", pskfile, strerror(errno));
+ g_file_set_contents(pskfile, line, strlen(line), &gerr);
+ if (gerr != NULL) {
+ g_critical("Failed to create pskfile %s: %s", pskfile, gerr->message);
abort();
}
- fprintf(fp, "%s:%s\n", user, key);
- fclose(fp);
}
void test_tls_psk_init(const char *pskfile)