The inline logic was recently changed by commit
("convert *_inline attributes to bool"), however the code testing a
newly created tls-crypt-v2 client key was not adapted.
Adapt tls-crypt-v2 test routine by properly signaling when the passed
key is inlined or not.
Signed-off-by: Antonio Quartulli <a...@unstable.cc>
---
src/openvpn/tls_crypt.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/openvpn/tls_crypt.c b/src/openvpn/tls_crypt.c
index 484d4d46..a3894d66 100644
--- a/src/openvpn/tls_crypt.c
+++ b/src/openvpn/tls_crypt.c
@@ -697,14 +697,14 @@ tls_crypt_v2_write_client_key_file(const char *filename,
goto cleanup;
}
- const char *client_filename = filename;
- const char *client_inline = NULL;
+ const char *client_file = filename;
+ bool client_inline = false;
if (!filename || streq(filename, ""))
{
printf("%s\n", BPTR(&client_key_pem));
- client_filename = INLINE_FILE_TAG;
- client_inline = (const char *)BPTR(&client_key_pem);
+ client_file = (const char *)BPTR(&client_key_pem);
+ client_inline = true;
}
else if (!buffer_write_file(filename, &client_key_pem))
{
@@ -717,7 +717,7 @@ tls_crypt_v2_write_client_key_file(const char *filename,
struct buffer test_wrapped_client_key;
msg(D_GENKEY, "Testing client-side key loading...");
tls_crypt_v2_init_client_key(&test_client_key, &test_wrapped_client_key,
- client_filename, client_inline);
+ client_file, client_inline);
free_key_ctx_bi(&test_client_key);
/* Sanity check: unwrap and load client key (as "server") */
--
2.26.2
_______________________________________________
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
