lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2026-10-24 03:48:58 +03:00
Code Activity

Fix AES-GCM when the last few bytes aren't received

Browse Source
This commit is contained in:
Dan Fandrich
2023-02-21 10:55:58 -08:00
parent 35ca19e0c8
commit 4ac055f3ce
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/openssl.c
View File

@@ -492,6 +492,7 @@ _libssh2_cipher_crypt(_libssh2_cipher_ctx * ctx,
(void) algo;
assert(blocksize <= sizeof(buf));
assert(cryptlen >= 0);
/* First block */
if(IS_FIRST(firstlast)) {

14
src/transport.c
View File

@@ -51,6 +51,9 @@
#include "transport.h"
#include "mac.h"
#ifndef MAX
#define MAX(x,y) ((x)>(y)?(x):(y))
#endif
#ifndef MIN
#define MIN(x,y) ((x)<(y)?(x):(y))
#endif
@@ -638,7 +641,8 @@ int _libssh2_transport_read(LIBSSH2_SESSION * session)
amount to decrypt even more */
if((p->data_num + numbytes) >= (p->total_num - skip)) {
/* decrypt the entire rest of the package */
numdecrypt = (p->total_num - skip) - p->data_num;
numdecrypt = MAX(0,
(int)(p->total_num - skip) - (int)p->data_num);
firstlast = LAST_BLOCK;
}
else {
@@ -653,6 +657,13 @@ int _libssh2_transport_read(LIBSSH2_SESSION * session)
after it */
numbytes = 0;
}
if(CRYPT_FLAG_R(session, INTEGRATED_MAC)) {
/* Make sure that we save enough bytes to make the last
* block large enough to hold the entire integrated MAC */
numdecrypt = MIN(numdecrypt, (int)
(p->total_num - skip - blocksize - p->data_num));
numbytes = 0;
}
firstlast = MIDDLE_BLOCK;
}
@@ -661,6 +672,7 @@ int _libssh2_transport_read(LIBSSH2_SESSION * session)
/* unencrypted data should not be decrypted at all */
numdecrypt = 0;
}
assert(numdecrypt >= 0);
/* if there are bytes to decrypt, do that */
if(numdecrypt > 0) {