From c30996af95f68c13af622e91401108aeea394c1a Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Sun, 19 Mar 2023 13:00:36 +0900 Subject: src: print_info: prefer gnutls_psk_server_get_username2 gnutls_psk_server_get_username only supports NUL-terminated usernames, while we added support for non-NULL terminated usernames in d00638997fa269a975095d852633b48b2b64fbf9. Signed-off-by: Daiki Ueno --- src/common.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/common.c b/src/common.c index 73b6949279..fbe043bd79 100644 --- a/src/common.c +++ b/src/common.c @@ -545,12 +545,14 @@ int print_info(gnutls_session_t session, int verbose, int flags) if (gnutls_psk_client_get_hint(session) != NULL) log_msg(stdout, "- PSK authentication. PSK hint '%s'\n", gnutls_psk_client_get_hint(session)); - /* This returns NULL in client side. + /* This returns an error in client side. */ - if (gnutls_psk_server_get_username(session) != NULL) + rc = gnutls_psk_server_get_username2(session, &p); + if (rc == 0) { log_msg(stdout, - "- PSK authentication. Connected as '%s'\n", - gnutls_psk_server_get_username(session)); + "- PSK authentication. Connected as '%.*s'\n", + p.size, p.data); + } if (kx == GNUTLS_KX_DHE_PSK) print_dh_info(session, "Ephemeral ", verbose); if (kx == GNUTLS_KX_ECDHE_PSK) -- cgit v1.2.1