summaryrefslogtreecommitdiff
path: root/src/serv.c
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@crystal.(none)>2008-06-20 22:46:23 +0300
committerNikos Mavrogiannopoulos <nmav@crystal.(none)>2008-06-20 22:46:23 +0300
commit7f632c6e4164a75136751a8f728c43af92215e43 (patch)
treee259faafaabd494ca77795dbd29dcb946f6d886f /src/serv.c
parent801eadca84b227d51e55d65b0249f992cdda3680 (diff)
downloadgnutls-7f632c6e4164a75136751a8f728c43af92215e43.tar.gz
merged with master.
Diffstat (limited to 'src/serv.c')
-rw-r--r--src/serv.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/src/serv.c b/src/serv.c
index 2edaca30e6..c03c191fc5 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -987,6 +987,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
@@ -1143,7 +1154,7 @@ main (int argc, char **argv)
addr_ntop ((struct sockaddr *)&client_address, calen,
topbuf, sizeof (topbuf)),
get_port (&client_address));
- print_info (j->tls_session, NULL);
+ print_info (j->tls_session, NULL, 1);
}
j->handshake_ok = 1;
}
@@ -1240,7 +1251,7 @@ main (int argc, char **argv)
topbuf, sizeof (topbuf)),
get_port (&client_address));
- print_info (j->tls_session, NULL);
+ print_info (j->tls_session, NULL, 1);
}
j->handshake_ok = 1;
}