MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-18 17:23:16 +00:00
Code Issues Releases Wiki Activity

Fixed TLS 1.3 state machine.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire
2020-01-20 22:49:10 -08:00
parent 90888b711f
commit cc3fe1461e
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
microstack/ILibAsyncSocket.c
View File

@@ -1215,7 +1215,9 @@ void ILibProcessAsyncSocket(struct ILibAsyncSocketModule *Reader, int pendingRea
} }
SSL_TRACE2("SSL_handshake()"); SSL_TRACE2("SSL_handshake()");
} }
else
// Even if we get completed the TLS handshake, we must still read if data remains, this is possible with TLS 1.3
if ((Reader->TLSHandshakeCompleted == 1) && (Reader->readBioBuffer->length > 0))
{ {
SSL_TRACE1("SSL_read()"); SSL_TRACE1("SSL_read()");
while ((j = SSL_read(Reader->ssl, Reader->buffer + Reader->EndPointer, Reader->MallocSize - Reader->EndPointer))>0) while ((j = SSL_read(Reader->ssl, Reader->buffer + Reader->EndPointer, Reader->MallocSize - Reader->EndPointer))>0)

5
microstack/ILibCrypto.c
View File

@@ -1085,12 +1085,13 @@ void __fastcall util_savekeys(SSL* ssl) {
if (ssl == NULL) return; if (ssl == NULL) return;
if (SSL_get_client_random(ssl, clientRandom, 32) != 32) return; if (SSL_get_client_random(ssl, clientRandom, 32) != 32) return;
if (SSL_get_server_random(ssl, serverRandom, 32) != 32) return; if (SSL_get_server_random(ssl, serverRandom, 32) != 32) return;
if (SSL_SESSION_get_master_key(SSL_get_session(ssl), sessionSecret, 48) != 48) return; len = SSL_SESSION_get_master_key(SSL_get_session(ssl), sessionSecret, 48);
if (len <= 0) return;
// Convert the randoms and key into hex // Convert the randoms and key into hex
util_tohex(clientRandom, 32, clientRandomHex); util_tohex(clientRandom, 32, clientRandomHex);
util_tohex(serverRandom, 32, serverRandomHex); util_tohex(serverRandom, 32, serverRandomHex);
util_tohex(sessionSecret, 48, sessionSecretHex); util_tohex(sessionSecret, len, sessionSecretHex);
// Append the client random and key to the log file. // Append the client random and key to the log file.
len = snprintf(text, 1000, "CLIENT_RANDOM %s %s\r\nCLIENT_RANDOM %s %s\r\n", clientRandomHex, sessionSecretHex, serverRandomHex, sessionSecretHex); len = snprintf(text, 1000, "CLIENT_RANDOM %s %s\r\nCLIENT_RANDOM %s %s\r\n", clientRandomHex, sessionSecretHex, serverRandomHex, sessionSecretHex);