packet: Check hmac return codes in ssh_packet_hmac_verify()
CID #1490530 Signed-off-by: Andreas Schneider <asn@cryptomilk.org> Reviewed-by: Jakub Jelen <jjelen@redhat.com>
Этот коммит содержится в:
родитель
e27ee9d0a4
Коммит
b42e9a19a3
@ -266,6 +266,7 @@ int ssh_packet_hmac_verify(ssh_session session,
|
|||||||
size_t hmaclen = DIGEST_MAX_LEN;
|
size_t hmaclen = DIGEST_MAX_LEN;
|
||||||
uint32_t seq;
|
uint32_t seq;
|
||||||
int cmp;
|
int cmp;
|
||||||
|
int rc;
|
||||||
|
|
||||||
/* AEAD types have no mac checking */
|
/* AEAD types have no mac checking */
|
||||||
if (type == SSH_HMAC_AEAD_POLY1305 ||
|
if (type == SSH_HMAC_AEAD_POLY1305 ||
|
||||||
@ -288,15 +289,24 @@ int ssh_packet_hmac_verify(ssh_session session,
|
|||||||
|
|
||||||
seq = htonl(session->recv_seq);
|
seq = htonl(session->recv_seq);
|
||||||
|
|
||||||
hmac_update(ctx,
|
rc = hmac_update(ctx,
|
||||||
(unsigned char *)&seq,
|
(unsigned char *) &seq,
|
||||||
sizeof(uint32_t));
|
sizeof(uint32_t));
|
||||||
hmac_update(ctx,
|
if (rc != 1) {
|
||||||
data,
|
return SSH_ERROR;
|
||||||
len);
|
}
|
||||||
hmac_final(ctx,
|
rc = hmac_update(ctx,
|
||||||
hmacbuf,
|
data,
|
||||||
&hmaclen);
|
len);
|
||||||
|
if (rc != 1) {
|
||||||
|
return SSH_ERROR;
|
||||||
|
}
|
||||||
|
rc = hmac_final(ctx,
|
||||||
|
hmacbuf,
|
||||||
|
&hmaclen);
|
||||||
|
if (rc != 1) {
|
||||||
|
return SSH_ERROR;
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef DEBUG_CRYPTO
|
#ifdef DEBUG_CRYPTO
|
||||||
ssh_log_hexdump("received mac",
|
ssh_log_hexdump("received mac",
|
||||||
|
Загрузка…
Ссылка в новой задаче
Block a user