tls: fix wrong pre_master_key length

irontec · Sep 22, 2021 · 1b18bde · 1b18bde
1 parent c3b4694
commit 1b18bde
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/src/packet/packet_tls.c b/src/packet/packet_tls.c
@@ -638,12 +638,11 @@ static gboolean
 packet_tls_process_record_key_exchange(SSLConnection *conn, GBytes *data)
 {
     // Decrypt PreMasterKey
-    struct ClientKeyExchange clientkeyex;
-    memcpy(&clientkeyex, g_bytes_get_data(data, NULL), sizeof(struct ClientKeyExchange));
+    struct ClientKeyExchange *clientkeyex = (struct ClientKeyExchange *) g_bytes_get_data(data, NULL);
 
     gnutls_datum_t exkeys, pms;
-    exkeys.size = UINT16_INT(clientkeyex.length);
-    exkeys.data = (unsigned char *) &clientkeyex.exchange_keys;
+    exkeys.size = UINT16_INT(clientkeyex->length);
+    exkeys.data = (unsigned char *) &clientkeyex->pre_master_secret;
     packet_tls_debug_print_hex("exchange keys", exkeys.data, exkeys.size);
 
     packet_tls_privkey_decrypt_data(conn->server_private_key, 0, &exkeys, &pms);

diff --git a/src/packet/packet_tls.h b/src/packet/packet_tls.h
@@ -215,16 +215,11 @@ struct PreMasterSecret
     guint8 random[46];
 };
 
-struct EncryptedPreMasterSecret
-{
-    guint8 pre_master_secret[128];
-};
-
 //! ClientKeyExchange type in Handshake records
 struct ClientKeyExchange
 {
     uint16 length;
-    struct EncryptedPreMasterSecret exchange_keys;
+    guint8 pre_master_secret[];
 };
 
 /**