From 6f89074953f08df1c605fec6258c073fd53ff459 Mon Sep 17 00:00:00 2001 From: Simon Josefsson Date: Wed, 4 Jun 2008 06:57:20 +0200 Subject: [PATCH] Add gnutls-serv --pskhint. --- NEWS | 2 ++ src/serv.c | 11 +++++++++++ src/serv.gaa | 3 +++ 3 files changed, 16 insertions(+) diff --git a/NEWS b/NEWS index 9b0fbd3db..f7304ab12 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,8 @@ The function is gnutls_psk_client_get_hint. ** psktool: Support new --netconf-hint to generate PSK key from password. Uses the Netconf algorithm to derive PSK key from password. +** gnutls-serv: Support new --pskhint parameter to set PSK identity hint. + ** API and ABI modifications: gnutls_psk_client_get_hint: ADDED. diff --git a/src/serv.c b/src/serv.c index d77d0c67b..01af77c82 100644 --- a/src/serv.c +++ b/src/serv.c @@ -985,6 +985,17 @@ main (int argc, char **argv) GERR (ret); } + if (info.psk_hint) + { + ret = gnutls_psk_set_server_credentials_hint (psk_cred, + info.psk_hint); + if (ret) + { + fprintf (stderr, "Error setting PSK identity hint.\n"); + GERR (ret); + } + } + gnutls_psk_set_server_params_function (psk_cred, get_params); } #endif diff --git a/src/serv.gaa b/src/serv.gaa index 2f83e995e..ed0137b6d 100644 --- a/src/serv.gaa +++ b/src/serv.gaa @@ -73,6 +73,9 @@ option (a, disable-client-cert) { $disable_client_cert = 1 } "Disable request fo #char *psk_passwd; option (pskpasswd) STR "FILE" { $psk_passwd = $1 } "PSK password file to use." +#char *psk_hint; +option (pskhint) STR "HINT" { $psk_hint = $1 } "PSK identity hint to use." + #char *srp_passwd; option (srppasswd) STR "FILE" { $srp_passwd = $1 } "SRP password file to use." -- 2.11.4.GIT