Commit bbf2e0e7 authored by Niels Möller's avatar Niels Möller
Browse files

* src/client_keyexchange.c (do_init_client_dh): Use C_WRITE_NOW.

(do_handle_srp_reply): Likewise.
(do_init_client_srp): Likewise.
* src/server_keyexchange.c (do_handle_dh_init): Likewise.
(do_srp_server_proof_handler): Likewise.
(do_server_srp_read_verifier): Likewise.

Rev: src/client_keyexchange.c:1.59
Rev: src/server_keyexchange.c:1.52
parent 8162034d
......@@ -154,7 +154,7 @@ do_init_client_dh(struct keyexchange_algorithm *c,
dh->algorithms = algorithms;
/* Send client's message */
C_WRITE(connection, dh_make_client_msg(&dh->dh));
C_WRITE_NOW(connection, dh_make_client_msg(&dh->dh));
/* Install handler */
connection->dispatch[SSH_MSG_KEXDH_REPLY] = &dh->super;
......@@ -285,7 +285,7 @@ do_handle_srp_reply(struct packet_handler *s,
PROTOCOL_ERROR(connection->e,
"SRP failure: Invalid public value from server.");
C_WRITE(connection, response);
C_WRITE_NOW(connection, response);
connection->dispatch[SSH_MSG_KEXSRP_PROOF]
= make_srp_client_proof_handler(self->srp);
......@@ -331,7 +331,7 @@ do_init_client_srp(struct keyexchange_algorithm *s,
srp->m2 = NULL;
/* Send client's message */
C_WRITE(connection, srp_make_init_msg(&srp->dh, self->name));
C_WRITE_NOW(connection, srp_make_init_msg(&srp->dh, self->name));
/* Install handler */
connection->dispatch[SSH_MSG_KEXSRP_REPLY] = make_srp_reply_handler(srp);
......
......@@ -78,11 +78,11 @@ do_handle_dh_init(struct packet_handler *c,
}
/* Send server's message, to complete key exchange */
C_WRITE(connection,
dh_make_server_msg(&closure->dh,
closure->server_key,
closure->hostkey_algorithm,
closure->signer));
C_WRITE_NOW(connection,
dh_make_server_msg(&closure->dh,
closure->server_key,
closure->hostkey_algorithm,
closure->signer));
connection->dispatch[SSH_MSG_KEXDH_INIT] = &connection_fail_handler;
......@@ -195,7 +195,7 @@ do_srp_server_proof_handler(struct packet_handler *s,
if (response)
{
C_WRITE(connection, response);
C_WRITE_NOW(connection, response);
/* Remember that a user was authenticated. */
connection->user = self->srp->user;
......@@ -276,8 +276,9 @@ do_server_srp_read_verifier(struct abstract_write *s,
{
/* Success */
C_WRITE(self->connection,
srp_make_reply_msg(&self->srp->dh, self->srp->entry));
C_WRITE_NOW(self->connection,
srp_make_reply_msg(&self->srp->dh,
self->srp->entry));
self->connection->dispatch[SSH_MSG_KEXSRP_PROOF]
= make_srp_server_proof_handler(self->srp);
}
......
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