From c0c19ea3dab55220dd2d6469deaab5d82d2ea13a Mon Sep 17 00:00:00 2001 From: Ryan Castellucci Date: Sat, 4 Jul 2020 11:56:05 +0100 Subject: [PATCH] Transparent default value for MqttFingerprint2 I was unable to find any information on where the existing default MqttFingerprint2 value came from, and can't be sure that someone doesn't have a key matching it. For transparency, this patch replaces the default MqttFingerprint2 value with the result of SHA1("Tasmota") as a "nothing-up-my-sleeve number". --- tasmota/my_user_config.h | 4 ++-- tasmota/tasmota_globals.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h index a097b6154..0ab09d224 100644 --- a/tasmota/my_user_config.h +++ b/tasmota/my_user_config.h @@ -97,8 +97,8 @@ #define MQTT_USE true // [SetOption3] Select default MQTT use (false = Off, true = On) #define MQTT_HOST "" // [MqttHost] -#define MQTT_FINGERPRINT1 "00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00" // [MqttFingerprint1] -#define MQTT_FINGERPRINT2 "A5 02 FF 13 99 9F 8B 39 8E F1 83 4F 11 23 65 0B 32 36 FC 07" // [MqttFingerprint2] +#define MQTT_FINGERPRINT1 "00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00" // [MqttFingerprint1] (auto-learn) +#define MQTT_FINGERPRINT2 "DA 39 A3 EE 5E 6B 4B 0D 32 55 BF EF 95 60 18 90 AF D8 07 09" // [MqttFingerprint2] (invalid) #define MQTT_PORT 1883 // [MqttPort] MQTT port (10123 on CloudMQTT) #define MQTT_USER "DVES_USER" // [MqttUser] MQTT user #define MQTT_PASS "DVES_PASS" // [MqttPassword] MQTT password diff --git a/tasmota/tasmota_globals.h b/tasmota/tasmota_globals.h index a4df0c4f7..42e63f206 100644 --- a/tasmota/tasmota_globals.h +++ b/tasmota/tasmota_globals.h @@ -114,8 +114,8 @@ String EthernetMacAddress(void); // Set an all-zeros default fingerprint to activate auto-learning on first connection (AWS IoT) #define MQTT_FINGERPRINT1 "00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00" #endif -#ifndef MQTT_FINGERPRINT2 -#define MQTT_FINGERPRINT2 "A5 02 FF 13 99 9F 8B 39 8E F1 83 4F 11 23 65 0B 32 36 FC 07" +#ifndef MQTT_FINGERPRINT2 // SHA1('') +#define MQTT_FINGERPRINT2 "DA 39 A3 EE 5E 6B 4B 0D 32 55 BF EF 95 60 18 90 AF D8 07 09" #endif #ifndef WS2812_LEDS