wartana/WLED
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

refactor to use a common sha1 function

Browse Source
This commit is contained in:
Will Tatam
2025-11-18 05:53:12 +00:00
parent 4db86ebf7f
commit 85b3c5d91b
3 changed files with 56 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
wled00/json.cpp
View File

@@ -1,12 +1,5 @@
#include "wled.h"
// Include SHA1 libraries for device ID generation
#ifdef ESP8266
#include <Hash.h>
#endif
#ifdef ESP32
#include "mbedtls/sha1.h"
#endif
#define JSON_PATH_STATE 1
#define JSON_PATH_INFO 2
@@ -698,66 +691,6 @@ void serializeState(JsonObject root, bool forPreset, bool includeBri, bool segme
}
}
String getDeviceId() {
static String cachedDeviceId = "";
if (cachedDeviceId.length() > 0) return cachedDeviceId;
uint8_t mac[6];
WiFi.macAddress(mac);
#ifdef ESP8266
// For ESP8266 we use the Hash.h library which is built into the ESP8266 Core
char macStr[18];
sprintf(macStr, "%02x:%02x:%02x:%02x:%02x:%02x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
String macString = String(macStr) + "WLED"; // Salt with "WLED"
String firstHash = sha1(macString);
String secondHash = sha1(firstHash);
cachedDeviceId = firstHash + secondHash.substring(38); // Concatenate first hash + last 2 chars of second
return cachedDeviceId;
#endif
#ifdef ESP32
// For ESP32 we use the mbedtls library which is built into the ESP32 core
unsigned char shaResult[20]; // SHA1 produces a hash of 20 bytes (which is 40 HEX characters)
mbedtls_sha1_context ctx;
// First hash: MAC address + "WLED" salt
mbedtls_sha1_init(&ctx);
mbedtls_sha1_starts_ret(&ctx);
mbedtls_sha1_update_ret(&ctx, mac, 6);
mbedtls_sha1_update_ret(&ctx, (const unsigned char*)"WLED", 4);
mbedtls_sha1_finish_ret(&ctx, shaResult);
mbedtls_sha1_free(&ctx);
// Convert first hash to hexadecimal string
char firstHash[41];
for (int i = 0; i < 20; i++) {
sprintf(&firstHash[i*2], "%02x", shaResult[i]);
}
// Second hash: SHA1 of the first hash
unsigned char shaResult2[20];
mbedtls_sha1_init(&ctx);
mbedtls_sha1_starts_ret(&ctx);
mbedtls_sha1_update_ret(&ctx, (const unsigned char*)firstHash, 40);
mbedtls_sha1_finish_ret(&ctx, shaResult2);
mbedtls_sha1_free(&ctx);
// Convert second hash to hexadecimal string
char secondHash[41];
for (int i = 0; i < 20; i++) {
sprintf(&secondHash[i*2], "%02x", shaResult2[i]);
}
// Return first hash + last 2 chars of second hash
char result[43];
sprintf(result, "%s%c%c", firstHash, secondHash[38], secondHash[39]);
cachedDeviceId = String(result);
return cachedDeviceId;
#endif
return String("");
}
void serializeInfo(JsonObject root)
{