diff options
| author | Jakub Jelen <jjelen@redhat.com> | 2021-06-23 13:16:33 +0200 |
|---|---|---|
| committer | Jakub Jelen <jjelen@redhat.com> | 2021-08-18 14:16:18 +0200 |
| commit | d3060bc84ed4e160082e819b4d404f76df7c8063 (patch) | |
| tree | ded6214dfa8f9692dce1cfed783e5df4aef8929d /include/libssh/crypto.h | |
| parent | 948bcb773e99139a22adf7be07fb079ab2c3ac5e (diff) | |
| download | libssh-d3060bc84ed4e160082e819b4d404f76df7c8063.tar.gz libssh-d3060bc84ed4e160082e819b4d404f76df7c8063.tar.xz libssh-d3060bc84ed4e160082e819b4d404f76df7c8063.zip | |
CVE-2021-3634: Create a separate length for session_id
Normally, the length of session_id and secret_hash is the same,
but if we will get into rekeying with a peer that changes preference
of key exchange algorithm, the new secret hash can be larger or
smaller than the previous session_id causing invalid reads or writes.
Resolves https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=35485
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
Diffstat (limited to 'include/libssh/crypto.h')
| -rw-r--r-- | include/libssh/crypto.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/libssh/crypto.h b/include/libssh/crypto.h index ede71661..489b4905 100644 --- a/include/libssh/crypto.h +++ b/include/libssh/crypto.h @@ -126,8 +126,9 @@ struct ssh_crypto_struct { ssh_curve25519_pubkey curve25519_server_pubkey; #endif ssh_string dh_server_signature; /* information used by dh_handshake. */ - size_t digest_len; /* len of the two fields below */ + size_t session_id_len; unsigned char *session_id; + size_t digest_len; /* len of the secret hash */ unsigned char *secret_hash; /* Secret hash is same as session id until re-kex */ unsigned char *encryptIV; unsigned char *decryptIV; |