wt/mongoose
1
0 Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2026-11-06 15:51:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2043 from cesanta/randomize

Browse Source 
Seed fallback clib PRNG with some entropy
This commit is contained in:
Sergey Lyubka authored and GitHub committed 2023-02-15 19:20:50 +00:00
2 parents 9deaa81a72 60c6b04a01
commit 64f069ec24
2 files changed
+12 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mongoose.c
+6 -2
View File
@@ -7355,6 +7355,7 @@ static void onstatechange(struct mg_tcpip_if *ifp) {
arp_ask(ifp, ifp->gw); arp_ask(ifp, ifp->gw);
} else if (ifp->state == MIP_STATE_UP) { } else if (ifp->state == MIP_STATE_UP) {
MG_ERROR(("Link up")); MG_ERROR(("Link up"));
srand((unsigned int) mg_millis());
} else if (ifp->state == MIP_STATE_DOWN) { } else if (ifp->state == MIP_STATE_DOWN) {
MG_ERROR(("Link down")); MG_ERROR(("Link down"));
} }
@@ -7528,6 +7529,9 @@ static void rx_dhcp_client(struct mg_tcpip_if *ifp, struct pkt *pkt) {
ifp->state = MIP_STATE_READY; ifp->state = MIP_STATE_READY;
onstatechange(ifp); onstatechange(ifp);
tx_dhcp_request(ifp, pkt->eth->src, ip, pkt->dhcp->siaddr); tx_dhcp_request(ifp, pkt->eth->src, ip, pkt->dhcp->siaddr);
uint64_t rand;
mg_random(&rand, sizeof(rand));
srand((unsigned int) (rand + mg_millis()));
} }
} }
@@ -7967,8 +7971,8 @@ void mg_tcpip_init(struct mg_mgr *mgr, struct mg_tcpip_if *ifp) {
// If MAC address is not set, make a random one // If MAC address is not set, make a random one
if (ifp->mac[0] == 0 && ifp->mac[1] == 0 && ifp->mac[2] == 0 && if (ifp->mac[0] == 0 && ifp->mac[1] == 0 && ifp->mac[2] == 0 &&
ifp->mac[3] == 0 && ifp->mac[4] == 0 && ifp->mac[5] == 0) { ifp->mac[3] == 0 && ifp->mac[4] == 0 && ifp->mac[5] == 0) {
mg_random(ifp->mac, sizeof(ifp->mac)); ifp->mac[0] = 0x02; // Locally administered, unicast
ifp->mac[0] &= (uint8_t) ~1; // Clear bit 0. 1st byte is even (unicast) mg_random(&ifp->mac[1], sizeof(ifp->mac) - 1);
MG_INFO(("MAC not set. Generated random: %M", mg_print_mac, ifp->mac)); MG_INFO(("MAC not set. Generated random: %M", mg_print_mac, ifp->mac));
} }
src/tcpip/tcpip.c
+6 -2
View File
@@ -227,6 +227,7 @@ static void onstatechange(struct mg_tcpip_if *ifp) {
arp_ask(ifp, ifp->gw); arp_ask(ifp, ifp->gw);
} else if (ifp->state == MIP_STATE_UP) { } else if (ifp->state == MIP_STATE_UP) {
MG_ERROR(("Link up")); MG_ERROR(("Link up"));
srand((unsigned int) mg_millis());
} else if (ifp->state == MIP_STATE_DOWN) { } else if (ifp->state == MIP_STATE_DOWN) {
MG_ERROR(("Link down")); MG_ERROR(("Link down"));
} }
@@ -400,6 +401,9 @@ static void rx_dhcp_client(struct mg_tcpip_if *ifp, struct pkt *pkt) {
ifp->state = MIP_STATE_READY; ifp->state = MIP_STATE_READY;
onstatechange(ifp); onstatechange(ifp);
tx_dhcp_request(ifp, pkt->eth->src, ip, pkt->dhcp->siaddr); tx_dhcp_request(ifp, pkt->eth->src, ip, pkt->dhcp->siaddr);
uint64_t rand;
mg_random(&rand, sizeof(rand));
srand((unsigned int) (rand + mg_millis()));
} }
} }
@@ -839,8 +843,8 @@ void mg_tcpip_init(struct mg_mgr *mgr, struct mg_tcpip_if *ifp) {
// If MAC address is not set, make a random one // If MAC address is not set, make a random one
if (ifp->mac[0] == 0 && ifp->mac[1] == 0 && ifp->mac[2] == 0 && if (ifp->mac[0] == 0 && ifp->mac[1] == 0 && ifp->mac[2] == 0 &&
ifp->mac[3] == 0 && ifp->mac[4] == 0 && ifp->mac[5] == 0) { ifp->mac[3] == 0 && ifp->mac[4] == 0 && ifp->mac[5] == 0) {
mg_random(ifp->mac, sizeof(ifp->mac)); ifp->mac[0] = 0x02; // Locally administered, unicast
ifp->mac[0] &= (uint8_t) ~1; // Clear bit 0. 1st byte is even (unicast) mg_random(&ifp->mac[1], sizeof(ifp->mac) - 1);
MG_INFO(("MAC not set. Generated random: %M", mg_print_mac, ifp->mac)); MG_INFO(("MAC not set. Generated random: %M", mg_print_mac, ifp->mac));
} }