From 581d2aecadb68f43e70691001d772fe46b459e24 Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Mon, 28 Apr 2014 23:00:55 +0300 Subject: [PATCH] silcd: show MAC in welcome notifys Shoe cipher and MAC currently in use in the welcome messages servers sends to client. --- apps/silcd/server.c | 2 +- apps/silcd/server_util.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/silcd/server.c b/apps/silcd/server.c index 4712bb2d..7441676b 100644 --- a/apps/silcd/server.c +++ b/apps/silcd/server.c @@ -1749,7 +1749,7 @@ void silc_server_start_key_exchange(SilcServerConnection sconn) SilcServer server = sconn->server; SilcServerConfigRouter *conn = sconn->conn.ref_ptr; SilcUnknownEntry entry; - SilcSKEParamsStruct params; + SilcSKEParamsStruct params = {}; SilcSKE ske; /* Cancel any possible retry timeouts */ diff --git a/apps/silcd/server_util.c b/apps/silcd/server_util.c index c48e9a54..23329957 100644 --- a/apps/silcd/server_util.c +++ b/apps/silcd/server_util.c @@ -1426,6 +1426,7 @@ void silc_server_send_connect_notifys(SilcServer server, SilcClientEntry client) { SilcCipher key; + SilcHmac hmac; SILC_LOG_DEBUG(("Send welcome notifys")); @@ -1486,12 +1487,12 @@ void silc_server_send_connect_notifys(SilcServer server, server->stat.my_router_ops + server->stat.my_server_ops)); - silc_packet_get_keys(sock, &key, NULL, NULL, NULL); + silc_packet_get_keys(sock, &key, NULL, &hmac, NULL); SILC_SERVER_SEND_NOTIFY(server, sock, SILC_NOTIFY_TYPE_NONE, - ("Your connection is secured with %s cipher, " - "key length %d bits", + ("Your connection is secured with %s cipher " + "and %s MAC", silc_cipher_get_name(key), - silc_cipher_get_key_len(key))); + silc_hmac_get_name(hmac))); SILC_SERVER_SEND_NOTIFY(server, sock, SILC_NOTIFY_TYPE_NONE, ("Your current nickname is %s", client->nickname)); -- 2.24.0