Commit a2eb8ddd authored by Balázs Scheidler's avatar Balázs Scheidler Committed by Niels Möller
Browse files

* keyexchange.c (do_install): Bugfix: Look at closure->is_server

when generating MAC-keys (noted by Baszi).

Rev: src/keyexchange.c:1.34
parent 64eb7b30
......@@ -601,7 +601,8 @@ static int do_install(struct install_keys *c,
connection->dispatch[SSH_MSG_NEWKEYS] = make_newkeys_handler
(rec,
kex_make_mac(secret, closure->algorithms,
KEX_MAC_SERVER_TO_CLIENT, connection->session_id));
KEX_MAC_SERVER_TO_CLIENT ^ closure->is_server,
connection->session_id));
/* Keys for sending */
/* NOTE: The NEWKEYS-message should have been sent before this
......@@ -610,7 +611,8 @@ static int do_install(struct install_keys *c,
connection->send_mac
= kex_make_mac(secret, closure->algorithms,
KEX_MAC_CLIENT_TO_SERVER, connection->session_id);
KEX_MAC_CLIENT_TO_SERVER ^ closure->is_server,
connection->session_id);
return 1;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment