From 1df272c3cca091a45cecdc2d34354065bcd72fc5 Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Thu, 22 Nov 2018 10:45:20 +0100 Subject: [PATCH] packet_cb: Properly verify the signature type Issue reported by Tilo Eckert Signed-off-by: Jakub Jelen Reviewed-by: Andreas Schneider (cherry picked from commit bc91fa98eaafbe9b414c120044705fde441edeeb) --- src/packet_cb.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/packet_cb.c b/src/packet_cb.c index 5a008c23..6aa64766 100644 --- a/src/packet_cb.c +++ b/src/packet_cb.c @@ -194,15 +194,15 @@ SSH_PACKET_CALLBACK(ssh_packet_newkeys){ goto error; } - /* check if public key from server matches user preferences */ + /* Check if signature from server matches user preferences */ if (session->opts.wanted_methods[SSH_HOSTKEYS]) { - if(!ssh_match_group(session->opts.wanted_methods[SSH_HOSTKEYS], - server_key->type_c)) { + if (!ssh_match_group(session->opts.wanted_methods[SSH_HOSTKEYS], + sig->type_c)) { ssh_set_error(session, SSH_FATAL, "Public key from server (%s) doesn't match user " "preference (%s)", - server_key->type_c, + sig->type_c, session->opts.wanted_methods[SSH_HOSTKEYS]); goto error; }