diff options
| author | Jakub Jelen <jjelen@redhat.com> | 2018-11-15 10:44:37 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2018-11-23 17:31:53 +0100 |
| commit | 1d5215a5af2f6deed91060418bb2226cf6f64ae2 (patch) | |
| tree | 508d40e4e674f595495bd779209a876748679574 | |
| parent | 2d06a83b82cf7729a87b97099dadce0281d242b4 (diff) | |
| download | libssh-1d5215a5af2f6deed91060418bb2226cf6f64ae2.tar.gz libssh-1d5215a5af2f6deed91060418bb2226cf6f64ae2.tar.xz libssh-1d5215a5af2f6deed91060418bb2226cf6f64ae2.zip | |
server: Do not send SSH_MSG_EXT_INFO after rekey
This should not be a problem for well-behaving clients that do not
append the ext-info-c to the rekey, but if they do, we should not
send it either.
Resolves: T121
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
| -rw-r--r-- | src/server.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/server.c b/src/server.c index b998c9cb..8197fd86 100644 --- a/src/server.c +++ b/src/server.c @@ -518,20 +518,22 @@ static void ssh_server_connection_callback(ssh_session session){ goto error; } + /* + * If the client supports extension negotiation, we will send + * our supported extensions now. This is the first message after + * sending NEWKEYS message and after turning on crypto. + */ + if (session->extensions && + session->session_state != SSH_SESSION_STATE_AUTHENTICATED) { + ssh_server_send_extensions(session); + } + set_status(session,1.0f); session->connected = 1; session->session_state=SSH_SESSION_STATE_AUTHENTICATING; if (session->flags & SSH_SESSION_FLAG_AUTHENTICATED) session->session_state = SSH_SESSION_STATE_AUTHENTICATED; - /* - * If the client supports extension negotiation, we will send - * our supported extensions now. This is the first message after - * sending NEWKEYS message and after turning on crypto. - */ - if (session->extensions) { - ssh_server_send_extensions(session); - } } break; case SSH_SESSION_STATE_AUTHENTICATING: |