mirror/mongoose
1
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2024-11-24 02:59:01 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Cleanup debugging leftovers

Browse Source
This commit is contained in:
Sergey Lyubka 2024-03-26 11:33:59 +00:00
parent f3ad0572e2
commit e4cd6bd824
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mongoose.c
View File

@ -9310,7 +9310,6 @@ int mg_aes_gcm_decrypt(unsigned char *output, const unsigned char *input,
#define mg_tls_random(x, n) memset(x, 0xab, n)
#if MG_TLS == MG_TLS_BUILTIN
/* TLS 1.3 Record Content Type (RFC8446 B.1) */
@ -9887,7 +9886,7 @@ static void mg_tls_server_send_hello(struct mg_connection *c) {
// calculate keyshare
uint8_t x25519_pub[X25519_BYTES];
uint8_t x25519_prv[X25519_BYTES];
mg_tls_random(x25519_prv, sizeof(x25519_prv));
mg_random(x25519_prv, sizeof(x25519_prv));
mg_tls_x25519(x25519_pub, x25519_prv, X25519_BASE_POINT, 1);
mg_tls_x25519(tls->x25519_sec, x25519_prv, tls->x25519_cli, 1);
mg_tls_hexdump("s x25519 sec", tls->x25519_sec, sizeof(tls->x25519_sec));
@ -10178,12 +10177,12 @@ static void mg_tls_client_send_hello(struct mg_connection *c) {
MG_STORE_BE16(msg_client_hello + 192, hostnamesz);
// calculate keyshare
mg_tls_random(tls->x25519_cli, sizeof(tls->x25519_cli));
mg_random(tls->x25519_cli, sizeof(tls->x25519_cli));
mg_tls_x25519(x25519_pub, tls->x25519_cli, X25519_BASE_POINT, 1);
// fill in the gaps: random + session ID + keyshare
mg_tls_random(tls->session_id, sizeof(tls->session_id));
mg_tls_random(tls->random, sizeof(tls->random));
mg_random(tls->session_id, sizeof(tls->session_id));
mg_random(tls->random, sizeof(tls->random));
memmove(msg_client_hello + 11, tls->random, sizeof(tls->random));
memmove(msg_client_hello + 44, tls->session_id, sizeof(tls->session_id));
memmove(msg_client_hello + 94, x25519_pub, sizeof(x25519_pub));

9
src/tls_builtin.c
View File

@ -2,7 +2,6 @@
#include "tls_aes128.h"
#include "tls_x25519.h"
#define mg_tls_random(x, n) memset(x, 0xab, n)
#if MG_TLS == MG_TLS_BUILTIN
/* TLS 1.3 Record Content Type (RFC8446 B.1) */
@ -579,7 +578,7 @@ static void mg_tls_server_send_hello(struct mg_connection *c) {
// calculate keyshare
uint8_t x25519_pub[X25519_BYTES];
uint8_t x25519_prv[X25519_BYTES];
mg_tls_random(x25519_prv, sizeof(x25519_prv));
mg_random(x25519_prv, sizeof(x25519_prv));
mg_tls_x25519(x25519_pub, x25519_prv, X25519_BASE_POINT, 1);
mg_tls_x25519(tls->x25519_sec, x25519_prv, tls->x25519_cli, 1);
mg_tls_hexdump("s x25519 sec", tls->x25519_sec, sizeof(tls->x25519_sec));
@ -870,12 +869,12 @@ static void mg_tls_client_send_hello(struct mg_connection *c) {
MG_STORE_BE16(msg_client_hello + 192, hostnamesz);
// calculate keyshare
mg_tls_random(tls->x25519_cli, sizeof(tls->x25519_cli));
mg_random(tls->x25519_cli, sizeof(tls->x25519_cli));
mg_tls_x25519(x25519_pub, tls->x25519_cli, X25519_BASE_POINT, 1);
// fill in the gaps: random + session ID + keyshare
mg_tls_random(tls->session_id, sizeof(tls->session_id));
mg_tls_random(tls->random, sizeof(tls->random));
mg_random(tls->session_id, sizeof(tls->session_id));
mg_random(tls->random, sizeof(tls->random));
memmove(msg_client_hello + 11, tls->random, sizeof(tls->random));
memmove(msg_client_hello + 44, tls->session_id, sizeof(tls->session_id));
memmove(msg_client_hello + 94, x25519_pub, sizeof(x25519_pub));