From 9f71a6ab182027ee0673079d79a9766833791d41 Mon Sep 17 00:00:00 2001 From: Blaz Kristan Date: Sun, 1 May 2022 22:09:40 +0200 Subject: [PATCH] Arduino OTA lock fix. --- wled00/data/settings_sec.htm | 8 +- wled00/html_settings.h | 264 +++++++++++++++++------------------ wled00/wled.cpp | 2 +- wled00/wled_server.cpp | 14 +- 4 files changed, 144 insertions(+), 144 deletions(-) diff --git a/wled00/data/settings_sec.htm b/wled00/data/settings_sec.htm index 479b5f89..c40f7bb9 100644 --- a/wled00/data/settings_sec.htm +++ b/wled00/data/settings_sec.htm @@ -57,7 +57,7 @@

Security & Update setup

Settings PIN:
- ⚠ Unencrypted transmission. Do NOT use your banking, door, or SIM pin!

+
⚠ Unencrypted transmission. Be prudent when selecting PIN, do NOT use your banking, door, SIM, etc. pin!


Lock wireless (OTA) software update:
Passphrase:
To enable OTA, for security reasons you need to also enter the correct password!
@@ -67,7 +67,7 @@ Deny access to WiFi settings if locked:

Factory reset:
All settings and presets will be erased.

- ⚠ HTTP traffic is unencrypted. An attacker in the same network can intercept form data! +
⚠ Unencrypted transmission. An attacker on the same network can intercept form data!

Software Update


@@ -75,9 +75,9 @@

Backup & Restore

Backup presets
-
Restore presets


+
Restore presets


Backup configuration
-
Restore configuration

+
Restore configuration

⚠ Restoring presets/configuration will OVERWRITE your current presets/configuration.
Incorrect configuration may require a factory reset or re-flashing of your ESP.
For security reasons, passwords are not backed up. diff --git a/wled00/html_settings.h b/wled00/html_settings.h index 60df0e99..5f673526 100644 --- a/wled00/html_settings.h +++ b/wled00/html_settings.h @@ -1295,139 +1295,139 @@ const uint8_t PAGE_settings_time[] PROGMEM = { // Autogenerated from wled00/data/settings_sec.htm, do not edit!! -const uint16_t PAGE_settings_sec_length = 2091; +const uint16_t PAGE_settings_sec_length = 2095; const uint8_t PAGE_settings_sec[] PROGMEM = { - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0x95, 0x58, 0x6d, 0x73, 0xd3, 0xb8, - 0x16, 0xfe, 0x9e, 0x5f, 0xa1, 0x98, 0x19, 0x36, 0xb9, 0x93, 0xd8, 0x25, 0xb0, 0x3b, 0xbc, 0x24, - 0xe1, 0x16, 0x1a, 0x6e, 0x3b, 0xd3, 0xd2, 0x4e, 0x93, 0x2e, 0xf7, 0x0e, 0xc3, 0x30, 0xb2, 0x2d, - 0xc7, 0x22, 0x8e, 0xe4, 0x95, 0xe4, 0x86, 0x5c, 0x96, 0xff, 0xbe, 0xcf, 0x91, 0xed, 0x24, 0x2d, - 0x30, 0x0c, 0x1f, 0x48, 0xad, 0xb7, 0xf3, 0xf2, 0x9c, 0x73, 0x9e, 0x23, 0x31, 0xee, 0x9e, 0x5c, - 0xbe, 0x5e, 0xfc, 0xef, 0x6a, 0xc6, 0x72, 0xb7, 0x2e, 0xa6, 0x63, 0xfa, 0x65, 0x05, 0x57, 0xcb, - 0x49, 0x20, 0x54, 0x80, 0xb1, 0xe0, 0xe9, 0x74, 0xbc, 0x16, 0x8e, 0x33, 0xc5, 0xd7, 0x62, 0x12, - 0xdc, 0x4a, 0xb1, 0x29, 0xb5, 0x71, 0x01, 0x4b, 0xb4, 0x72, 0x42, 0xb9, 0x49, 0xb0, 0x91, 0xa9, - 0xcb, 0x27, 0xbf, 0x1f, 0x1d, 0x05, 0xd3, 0x4e, 0xbd, 0xb5, 0x73, 0x6f, 0x2d, 0x15, 0xb7, 0x32, - 0x11, 0x43, 0x3f, 0x18, 0x48, 0x25, 0x9d, 0xe4, 0xc5, 0xd0, 0x26, 0xbc, 0x10, 0x93, 0x47, 0x83, - 0x35, 0xff, 0x2c, 0xd7, 0xd5, 0x7a, 0x37, 0xae, 0xac, 0x30, 0x7e, 0xc0, 0x63, 0x8c, 0x95, 0x0e, - 0x58, 0xe7, 0x9e, 0xea, 0xc6, 0xa0, 0x24, 0xe7, 0xc6, 0x0a, 0x28, 0xa9, 0x5c, 0x36, 0x7c, 0x8a, - 0x59, 0x27, 0x5d, 0x21, 0xa6, 0x17, 0xd2, 0x26, 0x6c, 0x2e, 0x9c, 0x93, 0x6a, 0x69, 0xc7, 0x51, - 0x3d, 0x39, 0xb6, 0x89, 0x91, 0xa5, 0x9b, 0x76, 0x6e, 0xb9, 0x61, 0x4e, 0xae, 0x85, 0xae, 0xdc, - 0x20, 0x9d, 0xa4, 0x3a, 0xa9, 0xd6, 0x30, 0xf4, 0x45, 0x56, 0xa9, 0xc4, 0x49, 0xad, 0xd8, 0x69, - 0xaf, 0xff, 0x65, 0x23, 0x55, 0xaa, 0x37, 0xa1, 0x2e, 0x85, 0xea, 0x05, 0xb9, 0x73, 0xa5, 0x7d, - 0x1e, 0x45, 0x2b, 0xa5, 0xc3, 0x4d, 0x21, 0xd2, 0x70, 0x29, 0xa2, 0x4c, 0x70, 0x57, 0x19, 0x61, - 0x23, 0xdb, 0xa8, 0x89, 0x1e, 0x58, 0x91, 0x54, 0x46, 0xba, 0xed, 0xb0, 0x9d, 0x0a, 0xfa, 0x5f, - 0x77, 0x42, 0x5f, 0xdd, 0x17, 0xba, 0x3b, 0x18, 0x0c, 0x82, 0x8f, 0x56, 0x14, 0xd9, 0xe1, 0xee, - 0x9b, 0x6f, 0x76, 0x57, 0x65, 0xca, 0x9d, 0xf8, 0xde, 0xde, 0xe5, 0x59, 0xda, 0x13, 0xfd, 0x2f, - 0x46, 0xc0, 0x1e, 0xc5, 0xc8, 0x38, 0x37, 0x2b, 0x04, 0xb9, 0xf4, 0x6a, 0xeb, 0x97, 0xf6, 0x5b, - 0xa5, 0xbd, 0x8c, 0x3f, 0x1d, 0x6c, 0x16, 0x0f, 0x1f, 0x06, 0x3a, 0xfe, 0x24, 0x12, 0x17, 0x4c, - 0x26, 0x6e, 0x5b, 0x0a, 0x9d, 0xd1, 0x5c, 0xf7, 0xd8, 0x18, 0xbe, 0x0d, 0xa5, 0xf5, 0x7f, 0xef, - 0x48, 0xb0, 0xb9, 0xde, 0x2c, 0x34, 0xb7, 0xae, 0x27, 0x06, 0x6e, 0xd2, 0x7d, 0xd4, 0xff, 0x42, - 0x68, 0xaa, 0x09, 0x19, 0x11, 0x38, 0x5a, 0x08, 0xfa, 0x2f, 0x54, 0x28, 0x95, 0x12, 0xe6, 0x74, - 0x71, 0x71, 0x3e, 0x11, 0x03, 0x15, 0x26, 0x05, 0xb7, 0xf6, 0x5c, 0x5a, 0x17, 0xf2, 0x34, 0xed, - 0xb9, 0x97, 0x81, 0x30, 0x46, 0x9b, 0xe0, 0x79, 0x40, 0xd2, 0x82, 0xfe, 0x20, 0x29, 0x04, 0x37, - 0x8b, 0x3a, 0x22, 0xbd, 0x26, 0x32, 0x7d, 0x9c, 0xb3, 0x6e, 0x5b, 0x88, 0x90, 0x2b, 0xb9, 0xe6, - 0xa4, 0x7c, 0x12, 0x28, 0xad, 0x00, 0x41, 0xb3, 0x63, 0x02, 0x00, 0xdb, 0x43, 0xbd, 0xd6, 0x40, - 0xe0, 0x76, 0xa8, 0xcf, 0x88, 0xb5, 0xbe, 0x15, 0xbd, 0x46, 0xd1, 0xd7, 0xfe, 0x60, 0xf4, 0xec, - 0xe8, 0xe8, 0xc0, 0x9d, 0xaa, 0x2c, 0x34, 0x4f, 0xdf, 0xc8, 0x42, 0x90, 0x3f, 0xad, 0x33, 0x4a, - 0x6c, 0xd8, 0x7f, 0x2f, 0xce, 0x4f, 0x11, 0xf6, 0x6b, 0xf1, 0x57, 0x25, 0xac, 0x83, 0x4b, 0x30, - 0x7d, 0x76, 0x0b, 0x50, 0x49, 0xae, 0x80, 0x77, 0xbd, 0x80, 0x8e, 0x06, 0x83, 0x43, 0xd5, 0x7b, - 0x74, 0x5c, 0x2e, 0x2d, 0xb4, 0xdb, 0x52, 0x2b, 0x2b, 0x16, 0xe2, 0xb3, 0x1b, 0xf8, 0x19, 0xeb, - 0x90, 0x35, 0x76, 0x3a, 0x79, 0x42, 0x56, 0xf4, 0xc9, 0xc7, 0x6f, 0xc5, 0xd6, 0xe0, 0x1c, 0xc8, - 0x15, 0x87, 0x82, 0x05, 0xc9, 0x48, 0x56, 0x83, 0x6e, 0x2b, 0xa0, 0xce, 0x8f, 0xab, 0xcb, 0xf9, - 0x02, 0xc9, 0x11, 0xd5, 0x0e, 0x21, 0x06, 0xe4, 0x89, 0xf6, 0x9e, 0xbc, 0xd1, 0x66, 0x7d, 0xc2, - 0x1d, 0x7f, 0xd1, 0x04, 0x5d, 0x87, 0xbc, 0xc4, 0x19, 0xc4, 0x0b, 0x19, 0xc5, 0x83, 0x81, 0x08, - 0x33, 0xf8, 0x6f, 0xdf, 0x1f, 0x7d, 0x18, 0xd4, 0xa8, 0xd3, 0x9a, 0xee, 0x63, 0xfe, 0x96, 0x17, - 0x15, 0x8a, 0x2e, 0x18, 0x74, 0x1f, 0xed, 0x21, 0x4b, 0x72, 0x91, 0xac, 0xde, 0x56, 0xeb, 0x7d, - 0x1a, 0x75, 0x7b, 0x5d, 0x41, 0x2e, 0x84, 0x2b, 0xb1, 0x0d, 0x11, 0xaa, 0x24, 0xef, 0x45, 0xef, - 0x8f, 0x86, 0xcf, 0x3e, 0x44, 0x7d, 0xe4, 0xd2, 0xfb, 0xe0, 0x15, 0xec, 0xb5, 0x25, 0x4f, 0x28, - 0x7b, 0x17, 0x3c, 0xc6, 0xef, 0x0c, 0xd4, 0x00, 0x17, 0x83, 0x79, 0x2e, 0x33, 0x87, 0xbf, 0xaf, - 0xc1, 0x15, 0x46, 0x17, 0xf8, 0x3a, 0x2e, 0x68, 0x7c, 0xc5, 0xc1, 0x00, 0x34, 0xcf, 0x4b, 0x7b, - 0xae, 0x93, 0x15, 0x1d, 0x01, 0x1d, 0x94, 0x34, 0x37, 0x6f, 0x24, 0x5d, 0xf1, 0xa5, 0xb8, 0x29, - 0x9b, 0x8f, 0x13, 0xbd, 0x51, 0x5e, 0x2e, 0x02, 0x12, 0x9c, 0xea, 0x35, 0x6d, 0x40, 0xf2, 0xea, - 0xcd, 0xb9, 0xf0, 0x0a, 0xfc, 0xb7, 0xdf, 0xed, 0xbf, 0xae, 0xe5, 0x32, 0xdf, 0x4d, 0x37, 0x67, - 0xcf, 0x10, 0x28, 0x43, 0x93, 0x27, 0xa2, 0x10, 0xa8, 0xb4, 0x0f, 0x48, 0xe2, 0xa4, 0xa8, 0x52, - 0x61, 0x7b, 0x3b, 0xef, 0xfa, 0xfd, 0xbf, 0xff, 0x6e, 0x46, 0xa5, 0xf1, 0x7f, 0x4f, 0x44, 0xc6, - 0xab, 0xc2, 0xf5, 0xfa, 0xc0, 0xa8, 0xff, 0xb5, 0x33, 0x8e, 0x1a, 0x92, 0x69, 0xc8, 0x86, 0x59, - 0x93, 0x4c, 0xf6, 0xa5, 0x1e, 0xd9, 0xf0, 0x93, 0x7d, 0x59, 0x4e, 0xfe, 0x00, 0x53, 0xed, 0x77, - 0x52, 0x96, 0x4f, 0x3b, 0xff, 0x96, 0x6b, 0x62, 0x36, 0x56, 0x99, 0x02, 0xf9, 0xea, 0x33, 0x3f, - 0xb1, 0xa0, 0x90, 0x17, 0xd8, 0xe9, 0x77, 0x8c, 0xa3, 0x9a, 0x89, 0x63, 0x9d, 0x6e, 0x99, 0x56, - 0x14, 0xe7, 0x49, 0xf0, 0x1f, 0xe1, 0xfe, 0xec, 0xf5, 0x21, 0x2e, 0x43, 0x94, 0x99, 0xc4, 0x0c, - 0x7d, 0x7c, 0xb4, 0x3b, 0xc6, 0x9c, 0x67, 0x01, 0x03, 0x55, 0xe6, 0x1a, 0x4b, 0xa5, 0xb6, 0xc4, - 0x9c, 0xa9, 0xbc, 0x65, 0xbe, 0x44, 0x26, 0xa8, 0xd8, 0x12, 0x08, 0xdc, 0x9d, 0xcb, 0x45, 0x51, - 0xbe, 0xc2, 0x54, 0x5c, 0x39, 0x87, 0x78, 0x77, 0x88, 0x17, 0x26, 0x41, 0x3d, 0x0a, 0xa0, 0x38, - 0x29, 0x64, 0xb2, 0x9a, 0x04, 0xa7, 0xa4, 0xf6, 0xe5, 0x38, 0xaa, 0x17, 0x60, 0x1d, 0x44, 0xec, - 0x0e, 0xfd, 0xe0, 0xcc, 0x2b, 0x3a, 0xd3, 0xa1, 0x7c, 0xd8, 0x9f, 0xbb, 0x73, 0xc2, 0x56, 0xf1, - 0x5a, 0xc2, 0xc6, 0x39, 0xbf, 0x15, 0xfb, 0x2d, 0xb9, 0x69, 0xc5, 0xe7, 0xa3, 0x69, 0x67, 0xde, - 0xd0, 0x2c, 0x7b, 0xc8, 0x6e, 0x3c, 0x29, 0x32, 0xc0, 0x5b, 0x95, 0x80, 0x67, 0x34, 0x6d, 0x39, - 0x9f, 0x5d, 0x9d, 0xbd, 0x7d, 0xce, 0xc6, 0x52, 0x95, 0x95, 0x6b, 0x44, 0x97, 0x70, 0x6e, 0xa3, - 0x4d, 0x1a, 0x78, 0x94, 0xb0, 0xbe, 0x83, 0xc8, 0x7f, 0x5b, 0xf9, 0x7f, 0x7c, 0x3e, 0x01, 0x58, - 0xfc, 0x73, 0x21, 0xd4, 0x12, 0x2d, 0xcb, 0x8f, 0xa4, 0x3a, 0x18, 0x69, 0x85, 0x24, 0x00, 0x29, - 0x83, 0x8a, 0x76, 0x65, 0x40, 0x75, 0xdd, 0x87, 0xac, 0x92, 0x3b, 0x24, 0x35, 0x56, 0x7c, 0xea, - 0xff, 0x0b, 0x6a, 0x48, 0xf9, 0x5a, 0xa7, 0x10, 0xab, 0xd0, 0x61, 0x8c, 0x4c, 0x02, 0xe6, 0x3b, - 0x11, 0x34, 0x82, 0xf0, 0xac, 0x60, 0x82, 0xca, 0x80, 0x71, 0xf6, 0x84, 0xa5, 0x72, 0x29, 0x1d, - 0xc3, 0xb6, 0x18, 0x75, 0x01, 0x4c, 0xcc, 0xb4, 0xf3, 0xf0, 0xc1, 0xb3, 0xa7, 0x4f, 0x9f, 0xbe, - 0x60, 0x37, 0x4a, 0xa8, 0xc4, 0x6c, 0x4b, 0x27, 0x52, 0xe6, 0x0c, 0x57, 0x76, 0x2d, 0xad, 0x45, - 0x21, 0x86, 0xec, 0x44, 0xb3, 0xb7, 0x97, 0x0b, 0x86, 0x52, 0x61, 0x5b, 0x5d, 0x19, 0x16, 0x73, - 0xb5, 0x82, 0xf3, 0x03, 0x96, 0x6a, 0x6d, 0x06, 0x4c, 0x1b, 0x36, 0x3f, 0xbb, 0x60, 0xa5, 0x54, - 0x5d, 0x2f, 0x90, 0x7e, 0xa8, 0x98, 0xd8, 0x46, 0x1a, 0xa4, 0xb8, 0xb5, 0xac, 0x77, 0xb9, 0x38, - 0xee, 0x33, 0xab, 0x33, 0xb7, 0xe1, 0x46, 0xb0, 0xba, 0xc5, 0xdc, 0x83, 0xcd, 0xfb, 0x19, 0xeb, - 0xcf, 0x41, 0xd3, 0xfc, 0xdf, 0x5e, 0x36, 0xf6, 0x5d, 0x01, 0xcf, 0x32, 0x37, 0xf0, 0xe3, 0x87, - 0x40, 0xd7, 0x27, 0x2e, 0xaf, 0xee, 0x80, 0xfa, 0x78, 0xd4, 0x08, 0x58, 0x68, 0x00, 0x40, 0x0d, - 0x9e, 0xc1, 0x8c, 0x01, 0x43, 0xde, 0xb2, 0xb6, 0x83, 0x32, 0x03, 0x7c, 0xc0, 0x9c, 0xe4, 0x17, - 0x53, 0x82, 0x3c, 0xd7, 0x8c, 0x17, 0x56, 0x37, 0x90, 0xb9, 0x5c, 0xe0, 0xee, 0x61, 0x0c, 0x1a, - 0x17, 0x6b, 0xd5, 0x75, 0xbd, 0x83, 0x0b, 0xac, 0xb4, 0x33, 0xd4, 0xac, 0xaa, 0x22, 0x65, 0xb1, - 0xa0, 0x7b, 0x82, 0x5a, 0x42, 0xcc, 0x26, 0x17, 0x8a, 0xd4, 0xa1, 0x13, 0x36, 0xca, 0xd3, 0x90, - 0x8e, 0x8d, 0xe3, 0x69, 0xe7, 0x44, 0xda, 0xd6, 0x9a, 0x7a, 0x9f, 0xd2, 0x0e, 0x41, 0x24, 0x7c, - 0x01, 0x26, 0x54, 0x9a, 0x8d, 0x04, 0xd4, 0x5c, 0x31, 0x44, 0x1a, 0x29, 0x0c, 0x3b, 0x12, 0x0c, - 0x8c, 0xc8, 0x50, 0x37, 0x39, 0xab, 0x2f, 0x38, 0x3b, 0x34, 0x61, 0x4e, 0x14, 0x7b, 0x47, 0xc7, - 0x72, 0x9f, 0x96, 0x94, 0xe8, 0xc8, 0x17, 0x98, 0xb8, 0x84, 0x24, 0x60, 0x8e, 0x3a, 0xde, 0xd6, - 0xd6, 0x79, 0xdd, 0x32, 0xf3, 0xea, 0x0b, 0x0a, 0x13, 0xb6, 0xa5, 0xb5, 0x49, 0x69, 0x77, 0x1c, - 0xc9, 0x3a, 0x80, 0x27, 0x42, 0x6d, 0x19, 0x4f, 0x12, 0x0a, 0x1f, 0x30, 0x79, 0x27, 0xdf, 0x48, - 0xd6, 0xb2, 0x0b, 0x9d, 0xa6, 0x93, 0x22, 0xfd, 0x49, 0x0c, 0x2f, 0xdf, 0x05, 0xb5, 0x34, 0xfa, - 0xf7, 0x86, 0x27, 0x4e, 0x1b, 0x82, 0x1c, 0x72, 0x7e, 0x72, 0xf0, 0x7a, 0xde, 0xc4, 0xee, 0xb8, - 0x28, 0xf6, 0x6a, 0xb9, 0x4a, 0x59, 0xe9, 0x8f, 0x5b, 0xe4, 0x16, 0x56, 0x00, 0xb8, 0xa0, 0xc4, - 0x68, 0xb1, 0x3d, 0xc8, 0xe6, 0xd3, 0xc5, 0xe2, 0x8a, 0xd2, 0x38, 0xcb, 0x64, 0x42, 0x1e, 0x56, - 0xfb, 0xec, 0x0e, 0xd9, 0xf1, 0x01, 0xb4, 0x52, 0xf9, 0x28, 0x5b, 0xe8, 0x45, 0x06, 0x38, 0xc4, - 0x73, 0xe5, 0xe1, 0x96, 0x94, 0x00, 0x89, 0x00, 0xb5, 0x7a, 0xc6, 0xa3, 0x16, 0x06, 0xa8, 0x89, - 0x21, 0xf2, 0xc7, 0xd3, 0x79, 0x9b, 0xca, 0x35, 0x31, 0x80, 0x12, 0x1e, 0xff, 0x8c, 0x92, 0x6e, - 0x3c, 0x25, 0x5d, 0x70, 0x55, 0xf1, 0xc2, 0x63, 0xdf, 0x1e, 0xdd, 0xf1, 0x93, 0x99, 0xce, 0xea, - 0x34, 0x3d, 0x36, 0x69, 0x25, 0x95, 0xc6, 0xa6, 0x1f, 0xc2, 0xd4, 0x30, 0xca, 0x31, 0x15, 0x49, - 0x63, 0x13, 0xb1, 0x5d, 0x55, 0x82, 0xac, 0xae, 0x71, 0x8f, 0xd0, 0xa6, 0x31, 0x8a, 0xb7, 0x6c, - 0x1b, 0x3b, 0xc5, 0x0a, 0xb5, 0xc2, 0xd1, 0x1c, 0x99, 0x84, 0x5e, 0xd1, 0x20, 0x89, 0x46, 0xa1, - 0xd5, 0x4b, 0xe2, 0x1a, 0xdf, 0xd0, 0x99, 0xe3, 0x66, 0x49, 0x17, 0xdd, 0x76, 0x66, 0x98, 0x19, - 0xa8, 0x0a, 0x5a, 0xf1, 0xcd, 0xa9, 0x71, 0xc4, 0x6b, 0xbc, 0x89, 0xd0, 0xa7, 0x8d, 0xc6, 0xdd, - 0xa2, 0x4f, 0xc6, 0x03, 0xbb, 0xa9, 0xef, 0xb7, 0xa1, 0xf5, 0x77, 0x01, 0x9f, 0x59, 0x25, 0xb4, - 0x78, 0xed, 0xc1, 0xb4, 0x75, 0xf3, 0x5e, 0x0f, 0x68, 0xee, 0x05, 0x37, 0xf5, 0x5d, 0x63, 0x87, - 0xe5, 0x6f, 0x07, 0xb7, 0xa9, 0x34, 0x9c, 0x67, 0x21, 0xc9, 0x1c, 0xdc, 0xf5, 0x28, 0xe8, 0xff, - 0xd6, 0xa4, 0x5e, 0xd3, 0x2f, 0xcc, 0xf7, 0xb0, 0x68, 0xa0, 0x48, 0xb2, 0xe5, 0x7d, 0x18, 0x3a, - 0x3f, 0xc1, 0x01, 0xaf, 0x8e, 0x4c, 0x2e, 0x2b, 0xe3, 0x2f, 0x8c, 0x2d, 0x1a, 0x77, 0xc0, 0xb8, - 0xb3, 0xa3, 0xf3, 0x53, 0x4c, 0x46, 0x3f, 0x04, 0xe5, 0x2e, 0x26, 0x9d, 0x5f, 0x01, 0x65, 0x34, - 0xd8, 0x3b, 0x47, 0x88, 0x1c, 0x00, 0x42, 0x8d, 0xb8, 0xe3, 0x1b, 0x3e, 0xf2, 0x4a, 0x17, 0xda, - 0x3c, 0x7f, 0x90, 0x71, 0x7a, 0x56, 0xb5, 0x15, 0x54, 0xfb, 0x81, 0xc2, 0x6b, 0xc3, 0x1a, 0xdd, - 0xf1, 0xa8, 0xae, 0xc0, 0xcb, 0x3f, 0x67, 0xd7, 0xef, 0xae, 0xcf, 0x16, 0xb3, 0xba, 0x33, 0x80, - 0x55, 0x0d, 0x98, 0xf3, 0xfb, 0x27, 0x42, 0x0f, 0x42, 0xe7, 0x4c, 0xb5, 0x8c, 0x7a, 0x57, 0xde, - 0x9a, 0x13, 0x37, 0xfc, 0x55, 0xa1, 0x69, 0xa0, 0x55, 0x65, 0x87, 0x6c, 0x41, 0x2d, 0xc6, 0x88, - 0xa1, 0xe7, 0x3f, 0x32, 0x08, 0xaf, 0x07, 0xaf, 0x6e, 0x36, 0xbf, 0x82, 0x50, 0xef, 0xcf, 0x9b, - 0xef, 0xb0, 0xfa, 0x60, 0xc7, 0xd0, 0xd6, 0x73, 0x20, 0xf1, 0x6c, 0x4c, 0x55, 0x9f, 0xa2, 0x05, - 0x85, 0x6d, 0xdd, 0x1c, 0xc7, 0xb8, 0xd8, 0xb7, 0xc5, 0xd2, 0x14, 0x47, 0xfb, 0x10, 0x43, 0xb3, - 0xcc, 0xab, 0x38, 0x4c, 0xf4, 0x3a, 0x3a, 0x96, 0x26, 0xd1, 0x5a, 0xaf, 0xa4, 0x88, 0xde, 0x9d, - 0xcf, 0x4e, 0xa2, 0x7d, 0xa5, 0x7c, 0x8c, 0xf1, 0x88, 0x5d, 0x05, 0x53, 0x9a, 0xa6, 0x4c, 0xe8, - 0xb0, 0x5b, 0x61, 0xa8, 0x73, 0xb2, 0xa3, 0xf0, 0xd1, 0xe3, 0x70, 0x34, 0x8c, 0x8b, 0xa3, 0x96, - 0x9f, 0x7e, 0x49, 0xc5, 0x46, 0xae, 0x64, 0xe4, 0xaf, 0xac, 0x12, 0xd1, 0xd7, 0xc6, 0x0e, 0xc1, - 0x80, 0xc3, 0xc4, 0x88, 0x54, 0x3a, 0x7b, 0x90, 0xa2, 0xad, 0x01, 0x87, 0x5b, 0xd1, 0x9c, 0x05, - 0x5d, 0xbe, 0xc1, 0x7a, 0x52, 0xd4, 0xd4, 0x69, 0x4b, 0x91, 0xe0, 0x31, 0x0c, 0xba, 0xc3, 0xee, - 0x7d, 0x05, 0x1f, 0xb3, 0xbc, 0x42, 0x93, 0xf0, 0xb3, 0xbe, 0x0f, 0x82, 0xee, 0x71, 0xe5, 0x34, - 0x5b, 0xbc, 0x81, 0xd0, 0x9f, 0x34, 0xa3, 0x7b, 0x1a, 0x20, 0x03, 0x3f, 0x42, 0x35, 0x5d, 0x83, - 0xc8, 0xb8, 0xee, 0x8e, 0x71, 0x7b, 0x49, 0x9f, 0x8d, 0x8e, 0x1e, 0xfd, 0x31, 0x1c, 0x1d, 0x8d, - 0x46, 0xec, 0x75, 0x6e, 0xf0, 0xc0, 0x90, 0x20, 0xd0, 0x79, 0x92, 0x6f, 0xe8, 0x79, 0xd6, 0xb4, - 0xa6, 0x73, 0x34, 0x2d, 0xdc, 0x7c, 0x01, 0x3d, 0x8c, 0xaa, 0x3b, 0xeb, 0x2f, 0x81, 0x11, 0x17, - 0x3a, 0x8e, 0xd6, 0x78, 0x99, 0x08, 0x13, 0x9d, 0x9f, 0xbd, 0x9e, 0xbd, 0x9d, 0xcf, 0xbe, 0x0d, - 0x41, 0xe7, 0xe2, 0x6c, 0xc1, 0x8a, 0x5a, 0x93, 0x77, 0x10, 0xed, 0xac, 0x35, 0x74, 0x2e, 0x0c, - 0xbc, 0x82, 0x1b, 0xd6, 0xa2, 0x29, 0x82, 0x59, 0xf1, 0x54, 0x50, 0x2d, 0x23, 0x58, 0x59, 0x06, - 0x54, 0xb9, 0xfe, 0x19, 0xc5, 0xfc, 0xcb, 0x88, 0x1a, 0x2b, 0x6d, 0xa9, 0x09, 0x96, 0xca, 0x85, - 0xee, 0x73, 0xf5, 0xd3, 0xf3, 0x17, 0x6e, 0xa1, 0xc4, 0x17, 0x9d, 0x5f, 0xba, 0x85, 0x46, 0xd4, - 0x70, 0x00, 0x99, 0x27, 0x9c, 0x96, 0xe9, 0xef, 0xd1, 0x10, 0x6b, 0x2a, 0x17, 0x8d, 0xbb, 0x2c, - 0xf8, 0xf6, 0xb9, 0x7f, 0xb0, 0x92, 0xbb, 0x7e, 0x19, 0x1f, 0x74, 0x79, 0xa7, 0x9b, 0x3c, 0xfd, - 0x4f, 0xcb, 0x3f, 0x67, 0x3a, 0xc3, 0x9d, 0x79, 0x11, 0x00, 0x00 + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x13, 0xa5, 0x58, 0x6b, 0x6f, 0xdb, 0x38, + 0x16, 0xfd, 0xee, 0x5f, 0xc1, 0xa8, 0x40, 0xc7, 0x5e, 0xc8, 0x52, 0xe2, 0x76, 0x07, 0x7d, 0xd8, + 0xee, 0x26, 0x8d, 0x3b, 0x0d, 0x90, 0x17, 0x62, 0x67, 0x3a, 0x8b, 0xa2, 0x28, 0x68, 0x89, 0xb6, + 0x58, 0xcb, 0xa4, 0x86, 0xa4, 0xe2, 0x7a, 0x3b, 0xfd, 0xef, 0x7b, 0x2e, 0x25, 0xf9, 0x91, 0xb6, + 0x13, 0x14, 0xf3, 0x21, 0x89, 0xf8, 0xba, 0x8f, 0x73, 0xef, 0x3d, 0x97, 0x4c, 0xff, 0xe0, 0xf4, + 0xea, 0xf5, 0xe4, 0xbf, 0xd7, 0x23, 0x96, 0xb9, 0x65, 0x3e, 0xec, 0xd3, 0x6f, 0x96, 0x73, 0x35, + 0x1f, 0x04, 0x42, 0x05, 0x18, 0x0b, 0x9e, 0x0e, 0xfb, 0x4b, 0xe1, 0x38, 0x53, 0x7c, 0x29, 0x06, + 0xc1, 0x9d, 0x14, 0xab, 0x42, 0x1b, 0x17, 0xb0, 0x44, 0x2b, 0x27, 0x94, 0x1b, 0x04, 0x2b, 0x99, + 0xba, 0x6c, 0xf0, 0xef, 0xc3, 0xc3, 0x60, 0xd8, 0xaa, 0xb6, 0xb6, 0xee, 0xad, 0xa5, 0xe2, 0x4e, + 0x26, 0xa2, 0xeb, 0x07, 0xa1, 0x54, 0xd2, 0x49, 0x9e, 0x77, 0x6d, 0xc2, 0x73, 0x31, 0x38, 0x0a, + 0x97, 0xfc, 0xb3, 0x5c, 0x96, 0xcb, 0xcd, 0xb8, 0xb4, 0xc2, 0xf8, 0x01, 0x9f, 0x62, 0xac, 0x74, + 0xc0, 0x5a, 0xf7, 0x54, 0xd7, 0x06, 0x25, 0x19, 0x37, 0x56, 0x40, 0x49, 0xe9, 0x66, 0xdd, 0x67, + 0x98, 0x75, 0xd2, 0xe5, 0x62, 0x78, 0x21, 0x6d, 0xc2, 0xc6, 0xc2, 0x39, 0xa9, 0xe6, 0xb6, 0x1f, + 0x57, 0x93, 0x7d, 0x9b, 0x18, 0x59, 0xb8, 0x61, 0xeb, 0x8e, 0x1b, 0xe6, 0xe4, 0x52, 0xe8, 0xd2, + 0x85, 0xe9, 0x20, 0xd5, 0x49, 0xb9, 0x84, 0xa1, 0x2f, 0x67, 0xa5, 0x4a, 0x9c, 0xd4, 0x8a, 0xbd, + 0x6d, 0x77, 0xbe, 0xac, 0xa4, 0x4a, 0xf5, 0x2a, 0xd2, 0x85, 0x50, 0xed, 0x20, 0x73, 0xae, 0xb0, + 0x2f, 0xe2, 0x78, 0xa1, 0x74, 0xb4, 0xca, 0x45, 0x1a, 0xcd, 0x45, 0x3c, 0x13, 0xdc, 0x95, 0x46, + 0xd8, 0xd8, 0xd6, 0x6a, 0xe2, 0x47, 0x56, 0x24, 0xa5, 0x91, 0x6e, 0xdd, 0x6d, 0xa6, 0x82, 0xce, + 0xd7, 0x8d, 0xd0, 0x93, 0xfb, 0x42, 0x37, 0x07, 0x83, 0x30, 0xf8, 0x68, 0x45, 0x3e, 0xdb, 0xdd, + 0x7d, 0xfb, 0xcd, 0xee, 0xb2, 0x48, 0xb9, 0x13, 0xdf, 0xdb, 0x3b, 0x3f, 0x4b, 0xdb, 0xa2, 0xf3, + 0xc5, 0x08, 0xd8, 0xa3, 0x18, 0x19, 0xe7, 0x46, 0xb9, 0x20, 0x97, 0x4e, 0xd6, 0x7e, 0x69, 0xbb, + 0x55, 0xda, 0xab, 0xe9, 0xa7, 0x9d, 0xcd, 0xe2, 0xf1, 0xe3, 0x40, 0x4f, 0x3f, 0x89, 0xc4, 0x05, + 0x83, 0x81, 0x5b, 0x17, 0x42, 0xcf, 0x68, 0xee, 0xe0, 0xd8, 0x18, 0xbe, 0x8e, 0xa4, 0xf5, 0x7f, + 0xf7, 0x24, 0xd8, 0x4c, 0xaf, 0x26, 0x9a, 0x5b, 0xd7, 0x16, 0xa1, 0x1b, 0x1c, 0x1c, 0x75, 0xbe, + 0x10, 0x9a, 0x6a, 0x40, 0x46, 0x04, 0x8e, 0x16, 0x82, 0xce, 0x4b, 0x15, 0x49, 0xa5, 0x84, 0x79, + 0x3b, 0xb9, 0x38, 0x1f, 0x88, 0x50, 0x45, 0x49, 0xce, 0xad, 0x3d, 0x97, 0xd6, 0x45, 0x3c, 0x4d, + 0xdb, 0xee, 0x55, 0x20, 0x8c, 0xd1, 0x26, 0x78, 0x11, 0x90, 0xb4, 0xa0, 0x13, 0x26, 0xb9, 0xe0, + 0x66, 0x52, 0x45, 0xa4, 0x5d, 0x47, 0xa6, 0x83, 0x73, 0xd6, 0xad, 0x73, 0x11, 0x71, 0x25, 0x97, + 0x9c, 0x94, 0x0f, 0x02, 0xa5, 0x15, 0x20, 0xa8, 0x77, 0x0c, 0x00, 0x60, 0x73, 0xa8, 0xdd, 0x18, + 0x08, 0xdc, 0x76, 0xf5, 0x19, 0xb1, 0xd4, 0x77, 0xa2, 0x5d, 0x2b, 0xfa, 0xda, 0x09, 0x7b, 0xcf, + 0x0f, 0x0f, 0x77, 0xdc, 0x29, 0x8b, 0x5c, 0xf3, 0xf4, 0x8d, 0xcc, 0x05, 0xf9, 0xd3, 0x38, 0xa3, + 0xc4, 0x8a, 0xfd, 0x71, 0x71, 0xfe, 0x16, 0x61, 0xbf, 0x11, 0x7f, 0x96, 0xc2, 0x3a, 0xb8, 0x04, + 0xd3, 0x47, 0x77, 0x00, 0x95, 0xe4, 0x0a, 0x78, 0xd7, 0x0e, 0xe8, 0x68, 0x10, 0xee, 0xaa, 0xde, + 0xa2, 0xe3, 0x32, 0x69, 0xa1, 0xdd, 0x16, 0x5a, 0x59, 0x31, 0x11, 0x9f, 0x5d, 0xe8, 0x67, 0xac, + 0x43, 0xd6, 0xd8, 0xe1, 0xe0, 0x29, 0x59, 0xd1, 0x21, 0x1f, 0xbf, 0x15, 0x5b, 0x81, 0xb3, 0x23, + 0x57, 0xec, 0x0a, 0x16, 0x24, 0x23, 0x59, 0x84, 0x07, 0x8d, 0x80, 0x2a, 0x3f, 0xae, 0xaf, 0xc6, + 0x13, 0x24, 0x47, 0x5c, 0x39, 0x84, 0x18, 0x90, 0x27, 0xda, 0x7b, 0xf2, 0x46, 0x9b, 0xe5, 0x29, + 0x77, 0xfc, 0x65, 0x1d, 0x74, 0x1d, 0xf1, 0x02, 0x67, 0x10, 0x2f, 0x64, 0x14, 0x0f, 0x42, 0x11, + 0xcd, 0xe0, 0xbf, 0x7d, 0x7f, 0xf8, 0x21, 0xac, 0x50, 0xa7, 0x35, 0xdd, 0xc1, 0xfc, 0x1d, 0xcf, + 0x4b, 0x14, 0x5d, 0x10, 0x1e, 0x1c, 0x6d, 0x21, 0x4b, 0x32, 0x91, 0x2c, 0x2e, 0xcb, 0xe5, 0x36, + 0x8d, 0x0e, 0xda, 0x07, 0x82, 0x5c, 0x88, 0x16, 0x62, 0x1d, 0x21, 0x54, 0x49, 0xd6, 0x8e, 0xdf, + 0x1f, 0x76, 0x9f, 0x7f, 0x88, 0x3b, 0xc8, 0xa5, 0xf7, 0xc1, 0x09, 0xec, 0xb5, 0x05, 0x4f, 0x28, + 0x7b, 0x27, 0x7c, 0x8a, 0xdf, 0x23, 0x50, 0x03, 0x5c, 0x0c, 0xc6, 0x99, 0x9c, 0x39, 0xfc, 0x7d, + 0x0d, 0xae, 0x30, 0x3a, 0xc7, 0xd7, 0x71, 0x4e, 0xe3, 0x6b, 0x0e, 0x06, 0xa0, 0x79, 0x5e, 0xd8, + 0x73, 0x9d, 0x2c, 0xe8, 0x08, 0xe8, 0xa0, 0xa0, 0xb9, 0x71, 0x2d, 0xe9, 0x9a, 0xcf, 0xc5, 0x6d, + 0x51, 0x7f, 0x9c, 0xea, 0x95, 0xf2, 0x72, 0x11, 0x90, 0xe0, 0xad, 0x5e, 0xd2, 0x06, 0x24, 0xaf, + 0x5e, 0x9d, 0x0b, 0xaf, 0xc0, 0x7f, 0xfb, 0xdd, 0xfe, 0xeb, 0x46, 0xce, 0xb3, 0xcd, 0x74, 0x7d, + 0xf6, 0x0c, 0x81, 0x32, 0x34, 0x79, 0x2a, 0x72, 0x81, 0x4a, 0xfb, 0x80, 0x24, 0x4e, 0xf2, 0x32, + 0x15, 0xb6, 0xbd, 0xf1, 0xae, 0xd3, 0xf9, 0xeb, 0xaf, 0x7a, 0x54, 0x18, 0xff, 0xf7, 0x54, 0xcc, + 0x78, 0x99, 0xbb, 0x76, 0x07, 0x18, 0x75, 0xbe, 0xb6, 0xfa, 0x71, 0x4d, 0x32, 0x35, 0xd9, 0x30, + 0x6b, 0x92, 0xc1, 0xb6, 0xd4, 0x63, 0x1b, 0x7d, 0xb2, 0xaf, 0x8a, 0xc1, 0xaf, 0x60, 0xaa, 0xed, + 0x4e, 0xca, 0xf2, 0x61, 0xeb, 0x3f, 0x72, 0x49, 0xcc, 0xc6, 0x4a, 0x93, 0x23, 0x5f, 0x7d, 0xe6, + 0x27, 0x16, 0x14, 0xf2, 0x12, 0x3b, 0xfd, 0x8e, 0x7e, 0x5c, 0x31, 0xf1, 0x54, 0xa7, 0x6b, 0xa6, + 0x15, 0xc5, 0x79, 0x10, 0xfc, 0x26, 0xdc, 0xef, 0xed, 0x0e, 0xc4, 0xcd, 0x10, 0x65, 0x26, 0x31, + 0x43, 0x1f, 0x1f, 0xed, 0x86, 0x31, 0xc7, 0xb3, 0x80, 0x81, 0x2a, 0x33, 0x8d, 0xa5, 0x42, 0x5b, + 0x62, 0xce, 0x54, 0xde, 0x31, 0x5f, 0x22, 0x03, 0x54, 0x6c, 0x01, 0x04, 0xf6, 0xe7, 0x32, 0x91, + 0x17, 0x27, 0x98, 0x9a, 0x96, 0xce, 0x21, 0xde, 0x2d, 0xe2, 0x85, 0x41, 0x50, 0x8d, 0x02, 0x28, + 0x4e, 0x72, 0x99, 0x2c, 0x06, 0xc1, 0x5b, 0x52, 0xfb, 0xaa, 0x1f, 0x57, 0x0b, 0xb0, 0x0e, 0x22, + 0x36, 0x87, 0x7e, 0x70, 0xe6, 0x84, 0xce, 0xb4, 0x28, 0x1f, 0xb6, 0xe7, 0xf6, 0x4e, 0xd8, 0x72, + 0xba, 0x94, 0xb0, 0x71, 0xcc, 0xef, 0xc4, 0x76, 0x4b, 0x66, 0x1a, 0xf1, 0x59, 0x6f, 0xd8, 0x1a, + 0xd7, 0x34, 0xcb, 0x1e, 0xb3, 0x5b, 0x4f, 0x8a, 0x0c, 0xf0, 0x96, 0x05, 0xe0, 0xe9, 0x0d, 0x1b, + 0xce, 0x67, 0xd7, 0x67, 0x97, 0x2f, 0x58, 0x5f, 0xaa, 0xa2, 0x74, 0xb5, 0xe8, 0x02, 0xce, 0xad, + 0xb4, 0x49, 0x03, 0x8f, 0x12, 0xd6, 0x37, 0x10, 0xf9, 0x6f, 0x2b, 0xff, 0x87, 0xcf, 0xa7, 0x00, + 0x8b, 0x7f, 0xce, 0x85, 0x9a, 0xa3, 0x65, 0xf9, 0x91, 0x54, 0x3b, 0x23, 0xad, 0x90, 0x04, 0x20, + 0x65, 0x50, 0xd1, 0xa6, 0x0c, 0xa8, 0xae, 0x3b, 0x90, 0x55, 0x70, 0x87, 0xa4, 0xc6, 0x8a, 0x4f, + 0xfd, 0x7f, 0x41, 0x0d, 0x29, 0x5f, 0xea, 0x14, 0x62, 0x15, 0x3a, 0x8c, 0x91, 0x49, 0xc0, 0x7c, + 0x27, 0x82, 0x46, 0x10, 0x9e, 0x15, 0x4c, 0x50, 0x19, 0x30, 0xce, 0x9e, 0xb2, 0x54, 0xce, 0xa5, + 0x63, 0xd8, 0x36, 0x45, 0x5d, 0x00, 0x13, 0x83, 0x36, 0x4a, 0x21, 0xf1, 0x91, 0x87, 0x32, 0x9d, + 0x6b, 0xf3, 0xe2, 0xd1, 0x8c, 0x53, 0x7f, 0x7d, 0xfc, 0xe8, 0xf9, 0xb3, 0x67, 0xcf, 0x5e, 0xb2, + 0x5b, 0x25, 0x54, 0x62, 0xd6, 0x85, 0x13, 0x29, 0x73, 0x86, 0x2b, 0xbb, 0x94, 0xd6, 0xa2, 0x42, + 0x23, 0x76, 0x22, 0x58, 0x61, 0x90, 0xb9, 0xca, 0xb1, 0x55, 0x26, 0x40, 0xda, 0xc8, 0xe8, 0x84, + 0x70, 0x21, 0x58, 0x42, 0x96, 0x6a, 0x76, 0x79, 0x35, 0x61, 0x28, 0x31, 0xb6, 0xd6, 0xa5, 0x61, + 0x53, 0xae, 0x16, 0x58, 0xa4, 0x05, 0x6d, 0x42, 0x36, 0x3e, 0xbb, 0x08, 0x99, 0x70, 0x49, 0xc4, + 0x0a, 0xa9, 0x0e, 0x5a, 0x4d, 0x60, 0x8d, 0xff, 0xa1, 0x6a, 0x64, 0x2b, 0x69, 0x20, 0xd1, 0x5a, + 0xd6, 0xbe, 0x9a, 0x1c, 0x77, 0x98, 0xd5, 0x33, 0xb7, 0xe2, 0x46, 0xb0, 0xaa, 0x47, 0xdd, 0xc3, + 0xdd, 0x03, 0x35, 0xd5, 0x9f, 0x37, 0x70, 0x5f, 0x5e, 0x55, 0x1e, 0x5e, 0x23, 0x20, 0x45, 0x66, + 0x00, 0xc4, 0x0f, 0x23, 0x55, 0x1d, 0xb8, 0xba, 0xde, 0x8b, 0xca, 0x93, 0x5e, 0x8d, 0xd0, 0x44, + 0x03, 0x41, 0xba, 0x21, 0x30, 0x98, 0x11, 0x32, 0x24, 0x3e, 0x6b, 0x5a, 0x30, 0x33, 0x00, 0x18, + 0xd4, 0x4b, 0x0e, 0x32, 0x25, 0x08, 0x21, 0xcd, 0x78, 0x6e, 0x75, 0x8d, 0xb9, 0xcb, 0x04, 0x2e, + 0x2f, 0xc6, 0x00, 0x16, 0xd6, 0xa8, 0x83, 0xab, 0x90, 0x3a, 0xc1, 0x4a, 0x33, 0x43, 0xdd, 0xae, + 0xcc, 0x53, 0x36, 0x15, 0x74, 0xd1, 0x50, 0x73, 0x88, 0xf1, 0x78, 0x42, 0x1d, 0x5a, 0x69, 0xad, + 0x3c, 0x8d, 0x2a, 0x6c, 0x86, 0xad, 0x53, 0x69, 0x1b, 0x6b, 0xaa, 0x7d, 0x4a, 0x3b, 0x64, 0x01, + 0x01, 0x1d, 0x32, 0x0d, 0x95, 0x66, 0x25, 0x81, 0x39, 0x57, 0x0c, 0xa9, 0x82, 0x1a, 0x80, 0x1d, + 0x09, 0x06, 0x46, 0xcc, 0x50, 0x78, 0x19, 0xab, 0x6e, 0x48, 0x1b, 0x34, 0x09, 0xf9, 0x69, 0x85, + 0xbb, 0xdc, 0xe6, 0x35, 0x55, 0x0a, 0x12, 0x0e, 0x26, 0xce, 0x21, 0x09, 0x98, 0x83, 0x08, 0xd6, + 0x95, 0x75, 0x5e, 0xb7, 0x9c, 0x79, 0xf5, 0x39, 0x85, 0x09, 0xdb, 0xd2, 0xca, 0xa4, 0xf4, 0xa0, + 0x1f, 0xcb, 0xa1, 0xf7, 0xef, 0x54, 0xa8, 0x35, 0xe3, 0x49, 0x42, 0xe1, 0x03, 0x26, 0xef, 0xe4, + 0x1b, 0xc9, 0x1a, 0x7a, 0xa2, 0xd3, 0x74, 0x52, 0xa4, 0x3f, 0x8c, 0x61, 0x1d, 0x91, 0x77, 0x41, + 0x25, 0x8d, 0x7e, 0xde, 0xf0, 0xc4, 0x69, 0x43, 0x90, 0x43, 0xce, 0x03, 0x07, 0x6f, 0xc6, 0x75, + 0xec, 0x8e, 0xf3, 0x7c, 0xab, 0x96, 0xab, 0x14, 0x09, 0x4b, 0xc7, 0x2d, 0x72, 0x0b, 0x2b, 0x00, + 0x5c, 0x50, 0x62, 0x34, 0xd8, 0x9a, 0xe1, 0x3f, 0xa8, 0x86, 0xe3, 0x1d, 0xbc, 0x3d, 0x7c, 0xc0, + 0x18, 0xc6, 0x20, 0x2d, 0x1c, 0x82, 0xbc, 0xf0, 0x31, 0x90, 0x94, 0x15, 0x89, 0x00, 0x61, 0x7b, + 0x1e, 0xa5, 0xc6, 0xb8, 0xc9, 0x7c, 0x62, 0x9f, 0xec, 0xc9, 0x70, 0xdc, 0x64, 0x79, 0x45, 0x3a, + 0xa0, 0x9b, 0x27, 0x0f, 0xd1, 0xdd, 0xad, 0xa7, 0xbb, 0x0b, 0xae, 0x4a, 0x9e, 0xfb, 0xb0, 0x34, + 0x47, 0x37, 0xdc, 0x67, 0x86, 0xa3, 0x2a, 0x83, 0x8f, 0x4d, 0x5a, 0x4a, 0xa5, 0xb1, 0xe9, 0xa1, + 0xf2, 0x39, 0xa6, 0xf2, 0xa9, 0x6d, 0x22, 0x26, 0x2d, 0x0b, 0x10, 0xe1, 0x0d, 0xee, 0x28, 0xda, + 0xd4, 0x46, 0xf1, 0x86, 0xc9, 0xa7, 0x4e, 0xb1, 0x5c, 0x2d, 0x70, 0x34, 0x43, 0x92, 0xa1, 0x0f, + 0xd5, 0x20, 0xa3, 0x09, 0x69, 0xf5, 0x8a, 0x78, 0xcc, 0x5f, 0x16, 0x98, 0xe3, 0x66, 0x4e, 0x97, + 0xe8, 0x66, 0xa6, 0x3b, 0x33, 0x50, 0x15, 0x34, 0xe2, 0xeb, 0x53, 0xfd, 0x98, 0x6f, 0x99, 0x69, + 0x58, 0x6b, 0xdc, 0x2c, 0xfa, 0x3c, 0xdd, 0xb1, 0x9b, 0xee, 0x14, 0x4d, 0xd4, 0xfd, 0x3d, 0xc3, + 0x27, 0x5d, 0x01, 0x2d, 0x5e, 0x7b, 0x30, 0x64, 0x0f, 0x34, 0x98, 0x5f, 0x76, 0xee, 0x66, 0x69, + 0x34, 0x9e, 0x45, 0x24, 0x25, 0xdc, 0xf7, 0x21, 0xe8, 0xfc, 0x32, 0xbc, 0xf5, 0xdb, 0x36, 0x98, + 0x56, 0x69, 0xb9, 0xe5, 0xac, 0x6f, 0xc1, 0xa8, 0xb1, 0x48, 0x66, 0xf3, 0xfb, 0x38, 0xb4, 0x1e, + 0x00, 0x02, 0x4f, 0x9a, 0x99, 0x9c, 0x97, 0xc6, 0xdf, 0x46, 0x1b, 0x38, 0xf6, 0xd0, 0xd8, 0xdb, + 0xd1, 0x7a, 0x10, 0x94, 0xde, 0x8f, 0x51, 0xd9, 0x07, 0xa5, 0xf5, 0xb7, 0xa8, 0xf4, 0xc2, 0xad, + 0x3b, 0xdf, 0x81, 0x64, 0x07, 0x11, 0xaa, 0xa2, 0xd6, 0xdf, 0x95, 0x51, 0xe5, 0x08, 0xb5, 0x8a, + 0x1a, 0xe7, 0x78, 0xcf, 0xa5, 0xaa, 0x3c, 0xaf, 0x7e, 0x1f, 0xdd, 0xbc, 0xbb, 0x39, 0x9b, 0x8c, + 0xaa, 0xfe, 0x01, 0xca, 0x35, 0xd4, 0x6b, 0xbe, 0x7b, 0x22, 0xf2, 0x28, 0xb4, 0xce, 0x54, 0x43, + 0xb7, 0xfb, 0xf2, 0x96, 0x9c, 0x88, 0xe3, 0xcf, 0x12, 0x1d, 0x05, 0x8d, 0x70, 0xb6, 0x4b, 0x25, + 0x0c, 0x7c, 0x6e, 0x44, 0xd7, 0x93, 0x23, 0x19, 0x84, 0xb7, 0x89, 0x57, 0x37, 0x1a, 0x5f, 0x47, + 0x75, 0x6d, 0xbe, 0xf9, 0x0e, 0xe5, 0x87, 0x1b, 0xfa, 0xb6, 0x9e, 0x20, 0x89, 0x84, 0xa7, 0x54, + 0xfd, 0x29, 0xfa, 0x53, 0xd4, 0x54, 0xce, 0xf1, 0x14, 0xcf, 0x86, 0xa6, 0x5c, 0xea, 0xf2, 0x68, + 0x9e, 0x79, 0x68, 0xc5, 0x59, 0x39, 0x8d, 0x12, 0xbd, 0x8c, 0x8f, 0xa5, 0x49, 0xb4, 0xd6, 0x0b, + 0x29, 0xe2, 0x77, 0xe7, 0xa3, 0xd3, 0x78, 0x5b, 0x2b, 0x1f, 0xa7, 0x78, 0x22, 0x2f, 0x82, 0x21, + 0x4d, 0x53, 0x2a, 0xb4, 0xd8, 0x9d, 0x30, 0x44, 0x38, 0xec, 0x30, 0x3a, 0x7a, 0x12, 0xf5, 0xba, + 0xd3, 0xfc, 0x70, 0x43, 0x5e, 0x3f, 0xa3, 0x62, 0x25, 0x17, 0x32, 0xf6, 0x17, 0x62, 0x89, 0xf8, + 0x69, 0x63, 0xbb, 0xa0, 0xc7, 0x6e, 0x62, 0x44, 0x2a, 0x9d, 0xdd, 0xc9, 0xd1, 0xc6, 0x80, 0xdd, + 0xad, 0x68, 0xe1, 0x82, 0xae, 0xf6, 0xa0, 0x42, 0x29, 0x2a, 0x5e, 0xb5, 0x85, 0x48, 0xf0, 0xd4, + 0x06, 0xed, 0x61, 0xf7, 0xb6, 0x86, 0x8f, 0x59, 0x56, 0xa2, 0x83, 0xf8, 0x59, 0xdf, 0x24, 0xd1, + 0x0b, 0x70, 0xa1, 0x35, 0x6b, 0xbc, 0xb0, 0xd0, 0xbc, 0x34, 0xa3, 0x5b, 0x20, 0x20, 0x03, 0x4f, + 0x42, 0x35, 0x5d, 0xb2, 0xc8, 0xb8, 0x83, 0xc6, 0xa3, 0x56, 0x3b, 0xe9, 0xb0, 0xde, 0xe1, 0xd1, + 0xaf, 0xdd, 0xde, 0x61, 0xaf, 0xc7, 0x5e, 0x67, 0x06, 0xcf, 0x17, 0x09, 0x22, 0x1d, 0x27, 0xd9, + 0x8a, 0x1e, 0x7f, 0x75, 0xdf, 0x3a, 0x47, 0x47, 0xc3, 0xbd, 0x1a, 0xd0, 0xc3, 0xa8, 0xaa, 0xed, + 0xfe, 0x14, 0x18, 0xd3, 0x5c, 0x4f, 0xe3, 0x25, 0xde, 0x3d, 0xc2, 0xc4, 0xe7, 0x67, 0xaf, 0x47, + 0x97, 0xe3, 0xd1, 0xb7, 0x21, 0x68, 0x5d, 0x9c, 0x4d, 0x58, 0x5e, 0x69, 0xf2, 0x0e, 0xa2, 0xd7, + 0x35, 0x86, 0x8e, 0x85, 0x81, 0x57, 0x70, 0xc3, 0x5a, 0x74, 0x4c, 0x70, 0x2b, 0x1e, 0x22, 0xaa, + 0xa1, 0x04, 0x2b, 0x8b, 0x80, 0x4a, 0xd7, 0x3f, 0xd2, 0x98, 0x7f, 0x77, 0x11, 0xeb, 0xd3, 0x96, + 0x8a, 0x62, 0xa9, 0x5c, 0xe8, 0xb6, 0x58, 0x3d, 0x6c, 0x7f, 0xe2, 0x8e, 0x4b, 0x84, 0xd1, 0xfa, + 0xa9, 0x3b, 0x6e, 0x4c, 0x8d, 0x07, 0x90, 0x79, 0xc6, 0x69, 0xb8, 0xfe, 0x1e, 0x0f, 0x35, 0x0d, + 0x10, 0x5d, 0xbd, 0xc8, 0xf9, 0xfa, 0x85, 0x7f, 0x0e, 0x93, 0xbb, 0x7e, 0x19, 0x1f, 0xf4, 0x34, + 0xa0, 0x77, 0x02, 0xfd, 0x1f, 0xe7, 0xff, 0xcc, 0x96, 0x5c, 0x68, 0xd7, 0x11, 0x00, 0x00 }; diff --git a/wled00/wled.cpp b/wled00/wled.cpp index 189a192b..2ccb0e77 100644 --- a/wled00/wled.cpp +++ b/wled00/wled.cpp @@ -83,7 +83,7 @@ void WLED::loop() { if (apActive) dnsServer.processNextRequest(); #ifndef WLED_DISABLE_OTA - if (WLED_CONNECTED && aOtaEnabled) ArduinoOTA.handle(); + if (WLED_CONNECTED && aOtaEnabled && !otaLock && correctPIN) ArduinoOTA.handle(); #endif handleNightlight(); handlePlaylist(); diff --git a/wled00/wled_server.cpp b/wled00/wled_server.cpp index c6718d00..bd4ba9af 100644 --- a/wled00/wled_server.cpp +++ b/wled00/wled_server.cpp @@ -11,6 +11,7 @@ void setStaticContentCacheHeaders(AsyncWebServerResponse *response); static const char s_redirecting[] PROGMEM = "Redirecting..."; static const char s_content_enc[] PROGMEM = "Content-Encoding"; static const char s_unlock_ota [] PROGMEM = "Please unlock OTA in security settings!"; +static const char s_unlock_cfg [] PROGMEM = "Please unlock settings using PIN code!"; //Is this an IP? bool isIp(String str) { @@ -24,8 +25,8 @@ bool isIp(String str) { } void handleUpload(AsyncWebServerRequest *request, const String& filename, size_t index, uint8_t *data, size_t len, bool final) { - if (otaLock || !correctPIN) { - if (final) request->send(500, "text/plain", FPSTR(s_unlock_ota)); + if (!correctPIN) { + if (final) request->send(500, "text/plain", FPSTR(s_unlock_cfg)); return; } if (!index) { @@ -64,8 +65,7 @@ void createEditHandler(bool enable) { #endif } else { editHandler = &server.on("/edit", HTTP_ANY, [](AsyncWebServerRequest *request){ - serveMessage(request, 500, "Access Denied", /*otaLock ? FPSTR(s_unlock_ota) :*/ F("Please enter PIN in settings!"), 254); - //serveSettings(request,request->method() == HTTP_POST); // request PIN + serveMessage(request, 500, "Access Denied", FPSTR(s_unlock_cfg), 254); }); } } @@ -255,7 +255,7 @@ void initServer() request->send(response); }); - createEditHandler(correctPIN /*&& !otaLock*/); + createEditHandler(correctPIN); #ifndef WLED_DISABLE_OTA //init ota page @@ -546,7 +546,7 @@ void serveSettings(AsyncWebServerRequest* request, bool post) } if (subPage == 252) { - createEditHandler(correctPIN /*&& !otaLock*/); + createEditHandler(correctPIN); } else strcat_P(s, PSTR(" settings saved.")); @@ -574,7 +574,7 @@ void serveSettings(AsyncWebServerRequest* request, bool post) case 9: response = request->beginResponse_P(200, "text/html", PAGE_update, PAGE_update_length); break; case 251: { correctPIN = !strlen(settingsPIN); // lock if a pin is set - createEditHandler(correctPIN /*&& !otaLock*/); + createEditHandler(correctPIN); serveMessage(request, 200, strlen(settingsPIN) > 0 ? PSTR("Settings locked") : PSTR("No PIN set"), FPSTR(s_redirecting), 1); return; }