aboutsummaryrefslogtreecommitdiff
path: root/src/packet_crypt.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/packet_crypt.c')
-rw-r--r--src/packet_crypt.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/packet_crypt.c b/src/packet_crypt.c
index b2f075c4..7306e4b3 100644
--- a/src/packet_crypt.c
+++ b/src/packet_crypt.c
@@ -151,7 +151,6 @@ unsigned char *ssh_packet_encrypt(ssh_session session, void *data, uint32_t len)
crypto->aead_encrypt(crypto, data, out, len,
session->current_crypto->hmacbuf, session->send_seq);
} else {
- if (session->version == 2) {
ctx = hmac_init(session->current_crypto->encryptMAC, hmac_digest_len(type), type);
if (ctx == NULL) {
SAFE_FREE(out);
@@ -168,18 +167,13 @@ unsigned char *ssh_packet_encrypt(ssh_session session, void *data, uint32_t len)
}
ssh_print_hexa("Packet hmac", session->current_crypto->hmacbuf, hmac_digest_len(type));
#endif
- }
- crypto->encrypt(crypto, data, out, len);
+ crypto->encrypt(crypto, data, out, len);
}
memcpy(data, out, len);
explicit_bzero(out, len);
SAFE_FREE(out);
- if (session->version == 2) {
- return session->current_crypto->hmacbuf;
- }
-
- return NULL;
+ return session->current_crypto->hmacbuf;
}
/**