diff --git a/certs/bigfoot-inc.pem b/certs/bigfoot-inc.pem deleted file mode 100755 index d79f018..0000000 --- a/certs/bigfoot-inc.pem +++ /dev/null @@ -1,31 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw -TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh -cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjAwOTA0MDAwMDAw -WhcNMjUwOTE1MTYwMDAwWjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg -RW5jcnlwdDELMAkGA1UEAxMCUjMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK -AoIBAQC7AhUozPaglNMPEuyNVZLD+ILxmaZ6QoinXSaqtSu5xUyxr45r+XXIo9cP -R5QUVTVXjJ6oojkZ9YI8QqlObvU7wy7bjcCwXPNZOOftz2nwWgsbvsCUJCWH+jdx -sxPnHKzhm+/b5DtFUkWWqcFTzjTIUu61ru2P3mBw4qVUq7ZtDpelQDRrK9O8Zutm -NHz6a4uPVymZ+DAXXbpyb/uBxa3Shlg9F8fnCbvxK/eG3MHacV3URuPMrSXBiLxg -Z3Vms/EY96Jc5lP/Ooi2R6X/ExjqmAl3P51T+c8B5fWmcBcUr2Ok/5mzk53cU6cG -/kiFHaFpriV1uxPMUgP17VGhi9sVAgMBAAGjggEIMIIBBDAOBgNVHQ8BAf8EBAMC -AYYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMBIGA1UdEwEB/wQIMAYB -Af8CAQAwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYfr52LFMLGMB8GA1UdIwQYMBaA -FHm0WeZ7tuXkAXOACIjIGlj26ZtuMDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcw -AoYWaHR0cDovL3gxLmkubGVuY3Iub3JnLzAnBgNVHR8EIDAeMBygGqAYhhZodHRw -Oi8veDEuYy5sZW5jci5vcmcvMCIGA1UdIAQbMBkwCAYGZ4EMAQIBMA0GCysGAQQB -gt8TAQEBMA0GCSqGSIb3DQEBCwUAA4ICAQCFyk5HPqP3hUSFvNVneLKYY611TR6W -PTNlclQtgaDqw+34IL9fzLdwALduO/ZelN7kIJ+m74uyA+eitRY8kc607TkC53wl -ikfmZW4/RvTZ8M6UK+5UzhK8jCdLuMGYL6KvzXGRSgi3yLgjewQtCPkIVz6D2QQz -CkcheAmCJ8MqyJu5zlzyZMjAvnnAT45tRAxekrsu94sQ4egdRCnbWSDtY7kh+BIm -lJNXoB1lBMEKIq4QDUOXoRgffuDghje1WrG9ML+Hbisq/yFOGwXD9RiX8F6sw6W4 -avAuvDszue5L3sz85K+EC4Y/wFVDNvZo4TYXao6Z0f+lQKc0t8DQYzk1OXVu8rp2 -yJMC6alLbBfODALZvYH7n7do1AZls4I9d1P4jnkDrQoxB3UqQ9hVl3LEKQ73xF1O -yK5GhDDX8oVfGKF5u+decIsH4YaTw7mP3GFxJSqv3+0lUFJoi5Lc5da149p90Ids -hCExroL1+7mryIkXPeFM5TgO9r0rvZaBFOvV2z0gp35Z0+L4WPlbuEjN/lxPFin+ -HlUjr8gRsI3qfJOQFy/9rKIJR0Y/8Omwt/8oTWgy1mdeHmmjk7j1nYsvC9JSQ6Zv -MldlTTKB3zhThV1+XWYp6rjd5JW1zbVWEkLNxE7GJThEUG3szgBVGP7pSWTUTsqX -nLRbwHOoq7hHwg== ------END CERTIFICATE----- - diff --git a/certs/client1-authn-ID.key b/certs/client1-authn-ID.key deleted file mode 100755 index eed0aed..0000000 --- a/certs/client1-authn-ID.key +++ /dev/null @@ -1,5 +0,0 @@ ------BEGIN EC PRIVATE KEY----- -MHcCAQEEIHfQeOcidLM6BkYrM6T3psiYhdvf3Xi47RdCO9UUTJS0oAoGCCqGSM49 -AwEHoUQDQgAE8/zOkgtPi53H+J4TEt7WLam+HpzBpwPPIGnXe1j0aw8AW0IXf3C5 -9dNjXblYkMnfJetfGC+F1RGit8wltxa/1A== ------END EC PRIVATE KEY----- diff --git a/certs/client1-authn-ID.pem b/certs/client1-authn-ID.pem deleted file mode 100755 index eabfa17..0000000 --- a/certs/client1-authn-ID.pem +++ /dev/null @@ -1,12 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIBxjCCAWugAwIBAgIRAOkYhrcCE+j1PLQ9BDCRPEcwCgYIKoZIzj0EAwIwGzEZ -MBcGA1UEAxMQY2xpZW50MS1hdXRobi1JRDAeFw0yNDA4MTAyMjQ3MzNaFw00NDA4 -MDUyMjQ3MzNaMBsxGTAXBgNVBAMTEGNsaWVudDEtYXV0aG4tSUQwWTATBgcqhkjO -PQIBBggqhkjOPQMBBwNCAATz/M6SC0+Lncf4nhMS3tYtqb4enMGnA88gadd7WPRr -DwBbQhd/cLn102NduViQyd8l618YL4XVEaK3zCW3Fr/Uo4GPMIGMMA4GA1UdDwEB -/wQEAwIHgDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYE -FBnOGR7LYRUyGpeS9Lx/RKG9t9TpMB8GA1UdIwQYMBaAFM/o/ucJy0XT7kwdAW10 -c5L72KvXMBsGA1UdEQQUMBKCEGNsaWVudDEtYXV0aG4tSUQwCgYIKoZIzj0EAwID -SQAwRgIhAOay3IFSxWtbsByHePYSEc/t6zP4f08Xi5/hU6JURfMtAiEAr+AL+zZS -cxY4lsDnl4GhAejnyjB7ptK8DFYLtmOvzjs= ------END CERTIFICATE----- \ No newline at end of file diff --git a/certs/eventgrid.azure.pem b/certs/eventgrid.azure.pem deleted file mode 100755 index ece6eb1..0000000 --- a/certs/eventgrid.azure.pem +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDXDCCAuOgAwIBAgIQAjk9SNcCQlp8tBwACw7XyjAKBggqhkjOPQQDAzBhMQsw -CQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cu -ZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMzAe -Fw0yMzA2MDgwMDAwMDBaFw0yNjA4MjUyMzU5NTlaMF0xCzAJBgNVBAYTAlVTMR4w -HAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29m -dCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDQwdjAQBgcqhkjOPQIBBgUrgQQA -IgNiAARPTjQp1si15xHY4NHuaYml1SVS2WNRqzy5Pe5cjp4gxINQbtjyKSJL2Kkn -PFcl+Q657jLtO7gW5Oo2U4SrPf0KryBIzmpxdIWFv7OIRW/DsNpBY27x1kkcLfMa -VlD41KejggFiMIIBXjASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBQ18ecR -MmjmssjaceZw8+g8uA4HGzAfBgNVHSMEGDAWgBSz20ik+aHF2K42QcwRY2liKbxL -xjAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC -MHYGCCsGAQUFBwEBBGowaDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNl -cnQuY29tMEAGCCsGAQUFBzAChjRodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20v -RGlnaUNlcnRHbG9iYWxSb290RzMuY3J0MEIGA1UdHwQ7MDkwN6A1oDOGMWh0dHA6 -Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEdsb2JhbFJvb3RHMy5jcmwwHQYD -VR0gBBYwFDAIBgZngQwBAgEwCAYGZ4EMAQICMAoGCCqGSM49BAMDA2cAMGQCMFrb -S3clttzDrBUuwHuTyZPgSxVR4ShEvcjfJFFzv8n4TRORvsHt730s9ki6IB37+AIw -IT4LyBa6AKnYLFZZG7vGPF+exAK0qvyQ1Vw60KLBatMs+QpGXXWErmWRerrVGsYi ------END CERTIFICATE----- - diff --git a/certs/newca.crt b/certs/newca.crt new file mode 100755 index 0000000..da6a1b9 --- /dev/null +++ b/certs/newca.crt @@ -0,0 +1,24 @@ +-----BEGIN CERTIFICATE----- +MIID8zCCAtugAwIBAgIUCpTomBd4w0aRhwdQVfnrdUn9iQ4wDQYJKoZIhvcNAQEL +BQAwgYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQH +DAhTYXJhdG9nYTEUMBIGA1UECgwLV2VsbG51byBMTEMxGDAWBgNVBAMMD1dlbGxO +dWEgTVFUVCBDQTEhMB8GCSqGSIb3DQEJARYScm9iZXJ0QHdlbGxudW8uY29tMB4X +DTI1MDMwOTA3MTYwMloXDTM1MDMwNzA3MTYwMlowgYgxCzAJBgNVBAYTAlVTMRMw +EQYDVQQIDApDYWxpZm9ybmlhMREwDwYDVQQHDAhTYXJhdG9nYTEUMBIGA1UECgwL +V2VsbG51byBMTEMxGDAWBgNVBAMMD1dlbGxOdWEgTVFUVCBDQTEhMB8GCSqGSIb3 +DQEJARYScm9iZXJ0QHdlbGxudW8uY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEA0ZnbdUe6Bv3syydl7OZfjYe0MgvqxW3fwSVH2XIzd8NhQ9aqtr2T +Nq2Gkdh3YYgBnnM208NA1T11Be0v1a1bZr3hwPLTuoZrRuyg1Z6fBeWnjBDn+6ga +bEmo4lPbJBjY7AQTgM2U6QsLD9mhw6Od/gGDaxlwlD5wVD+zCIi+iMeKqthAodoF +rnrNQUlUR1pb1if0LuCaZXoCuyok/nOKZcZ62D6TGCaWda8nFB5CWaT4+nqejDSj +w3n2/wZNDyGOne5kB7Yw10ZoyDihZ6E8Vt9kqJenvRnm+sSRr3k5UGPnD5GK508W +Ta+DJlKDWUKe+gwDE8cv6pEU5DnfQzL+OQIDAQABo1MwUTAdBgNVHQ4EFgQUGyfP +aqXbMVml5YL+xnO4PoFepSAwHwYDVR0jBBgwFoAUGyfPaqXbMVml5YL+xnO4PoFe +pSAwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEASRLZrSwfTrWm +OylkF4kmMkP88CbYTRUk3ZYaG7TZARjR5U+HmH103iUts8i6hMVG/T1dL916ujsG +IQgmwH71ImxGJ/P/JGZLqwC6jRZraC2J6SCWshPDjO4Kmc5K+kb+4lkTy9qf1Wbd +JpcCjLCRtxUUjML4r31vE0Xim4t7Crkd8ZFD00irWzxsV2Q0PlJPWjh3Y/OpIEQJ +Lf+S0BMMxskP1/PXQCZUQrrZrKU8yEz8kefrJ5x+zDgvzrD3dD/wI0we9xgeUQSm +PQer1RkyDUbeU6j9hXjDRoAanvsgzdj7NyAReeEd7ksCEFigk3C6nczuiJWv0jW3 +KKc75wm2Aw== +-----END CERTIFICATE----- diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 511dffc..a0a1b9c 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -4,7 +4,7 @@ idf_component_register(SRCS main.cpp App.cpp Settings.cpp Led.cpp TaskMgr.cpp Wi CommandProcessor.cpp INCLUDE_DIRS "." EMBED_TXTFILES ../html/logo.png ../html/provision.html - EMBED_TXTFILES ../certs/eventgrid.azure.pem ../certs/client1-authn-ID.key ../certs/client1-authn-ID.pem ../certs/bigfoot-inc.pem + EMBED_TXTFILES ../certs/newca.crt ) #message(FATAL_ERROR "error ${ROLE}") diff --git a/main/MqttService.cpp b/main/MqttService.cpp index 4f3b4c1..7f199f5 100644 --- a/main/MqttService.cpp +++ b/main/MqttService.cpp @@ -9,7 +9,7 @@ #include "Settings.h" #include "CommandProcessor.h" -static const char * mqtt_broker = "mqtt-dev-server.westus2-1.ts.eventgrid.azure.net"; +static const char * mqtt_broker = "wellnua.com";//"mqtt-dev-server.westus2-1.ts.eventgrid.azure.net"; static const char * topic = "wellnuotopics/topic1"; static const int mqtt_port = 8883; @@ -57,7 +57,8 @@ void MqttService::task() sprintf(top, "wh_%02X%02X%02X%02X%02X%02X", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); ESP_LOGI(TAG, "connecting to mqtt broker, dev id '%s'...", SETTINGS.mqtt.device_id); - if (m_mqtt_client->connect(top, SETTINGS.mqtt.device_id, NULL)) + //if (m_mqtt_client->connect(top, SETTINGS.mqtt.device_id, NULL)) + if (m_mqtt_client->connect(top, "well_user", "We3l1_best!")) { try_connect_count = 0; ESP_LOGI(TAG, "connected"); @@ -122,8 +123,9 @@ void MqttService::start() m_mqtt_client = new PubSubClient(*m_esp_client); m_esp_client->setCACert((const char*)server_cert); - m_esp_client->setCertificate((const char *)client_cert); // for client verification - m_esp_client->setPrivateKey((const char *)client_key); // for client verification + ESP_LOGI(TAG, "%s", server_cert); + // m_esp_client->setCertificate((const char *)client_cert); // for client verification + // m_esp_client->setPrivateKey((const char *)client_key); // for client verification m_mqtt_client->setServer(mqtt_broker, mqtt_port); m_mqtt_client->setCallback(std::bind(&MqttService::callback, this, _1, _2, _3)); diff --git a/main/MqttService.h b/main/MqttService.h index 16c556d..5a757de 100644 --- a/main/MqttService.h +++ b/main/MqttService.h @@ -11,9 +11,9 @@ #include "mqtt_client.h" -extern const uint8_t server_cert[] asm("_binary_eventgrid_azure_pem_start"); -extern const uint8_t client_cert[] asm("_binary_client1_authn_ID_pem_start"); -extern const uint8_t client_key[] asm("_binary_client1_authn_ID_key_start"); +extern const uint8_t server_cert[] asm("_binary_newca_crt_start"); +// extern const uint8_t client_cert[] asm("_binary_client1_authn_ID_pem_start"); +// extern const uint8_t client_key[] asm("_binary_client1_authn_ID_key_start"); using namespace std::placeholders; diff --git a/main/Ota.cpp b/main/Ota.cpp index 5c29d98..325d789 100644 --- a/main/Ota.cpp +++ b/main/Ota.cpp @@ -22,7 +22,7 @@ #include -#define OTA_URL "http://bigfoot-inc.com/fw/wellhub.enc.bin" +#define OTA_URL "http://wellnua.com/FW/wellhub.enc.bin" extern const uint8_t server_cert[] asm("_binary_bigfoot_inc_pem_start"); static const char *TAG = "OTA"; @@ -52,7 +52,7 @@ void Ota::start() esp_ota_handle_t update_handle = 0; const esp_partition_t *update_partition = NULL; - ESP_LOGW(TAG, "Starting OTA check..."); + ESP_LOGW(TAG, "Starting OTA check '%s'...", OTA_URL); HTTPClient client; diff --git a/mqtt_server_cert.txt b/mqtt_server_cert.txt deleted file mode 100644 index 9c5628f..0000000 --- a/mqtt_server_cert.txt +++ /dev/null @@ -1,157 +0,0 @@ -CONNECTED(00000003) ---- -Certificate chain - 0 s:C = US, ST = WA, L = Redmond, O = Microsoft Corporation, CN = *.eventgrid.azure.net - i:C = US, O = Microsoft Corporation, CN = Microsoft Azure ECC TLS Issuing CA 07 - a:PKEY: id-ecPublicKey, 384 (bit); sigalg: ecdsa-with-SHA384 - v:NotBefore: Sep 1 08:03:38 2024 GMT; NotAfter: Aug 27 08:03:38 2025 GMT ------BEGIN CERTIFICATE----- -MIIGaDCCBe2gAwIBAgITMwAAKSve38jdYx+3LQAAAAApKzAKBggqhkjOPQQDAzBd -MQswCQYDVQQGEwJVUzEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMS4w -LAYDVQQDEyVNaWNyb3NvZnQgQXp1cmUgRUNDIFRMUyBJc3N1aW5nIENBIDA3MB4X -DTI0MDkwMTA4MDMzOFoXDTI1MDgyNzA4MDMzOFowbDELMAkGA1UEBhMCVVMxCzAJ -BgNVBAgTAldBMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQg -Q29ycG9yYXRpb24xHjAcBgNVBAMMFSouZXZlbnRncmlkLmF6dXJlLm5ldDB2MBAG -ByqGSM49AgEGBSuBBAAiA2IABAtjjj3L6Ix/L8BsGh8X/rW6GyMzbiC2aJ2VYQeJ -OwgDgNU2QEboFRaU7+y8zagsQtd58hUskfHSKYoahBHBDYorB3szDZ9b2MGKQnv1 -miKbwK+r6Ghp9y3UwEnY8FZ7YKOCBF4wggRaMIIBgAYKKwYBBAHWeQIEAgSCAXAE -ggFsAWoAdgAS8U40vVNyTIQGGcOPP3oT+Oe1YoeInG0wBYTr5YYmOgAAAZGspa03 -AAAEAwBHMEUCIC74tC1dPt5tWe17blIXKvg1NBs3BssOn1FrJkzHt7siAiEA2sVm -/XXfvcadfZ7SsZczB9hw7mNDZGgXuqfel8iYQPAAdwB9WR4S4XgqexxhZ3xe/fjQ -h1wUoE6VnrkDL9kOjC55uAAAAZGspa3oAAAEAwBIMEYCIQDgf3KisPuKsNcajLsh -kdo54k50gNCIKr+xJUdcfW+hygIhAKJLeDV6QKE7tuDoEAzjhZIR7roFnXkjcxRL -FJ0UEefRAHcAGgT/SdBUHUCv9qDDv/HYxGcvTuzuI0BomGsXQC7ciX0AAAGRrKWt -5wAABAMASDBGAiEAspZjPZODLM/NwqfdF41JMsqxPe4OEbt46l/HvipsjxcCIQDf -GG7GYpnk9C7c6ojdA3KU2jljg+gEofeGrQ0AYvppGTAnBgkrBgEEAYI3FQoEGjAY -MAoGCCsGAQUFBwMCMAoGCCsGAQUFBwMBMDwGCSsGAQQBgjcVBwQvMC0GJSsGAQQB -gjcVCIe91xuB5+tGgoGdLo7QDIfw2h1dgoTlaYLzpz4CAWQCASYwgbQGCCsGAQUF -BwEBBIGnMIGkMHMGCCsGAQUFBzAChmdodHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20v -cGtpb3BzL2NlcnRzL01pY3Jvc29mdCUyMEF6dXJlJTIwRUNDJTIwVExTJTIwSXNz -dWluZyUyMENBJTIwMDclMjAtJTIweHNpZ24uY3J0MC0GCCsGAQUFBzABhiFodHRw -Oi8vb25lb2NzcC5taWNyb3NvZnQuY29tL29jc3AwHQYDVR0OBBYEFDVRQindQ++e -b5/8bZhbjmzVprOvMA4GA1UdDwEB/wQEAwIHgDBlBgNVHREEXjBcghUqLmV2ZW50 -Z3JpZC5henVyZS5uZXSCIioud2VzdHVzMi0xLnRzLmV2ZW50Z3JpZC5henVyZS5u -ZXSCHyoud2VzdHVzMi0xLmV2ZW50Z3JpZC5henVyZS5uZXQwDAYDVR0TAQH/BAIw -ADBqBgNVHR8EYzBhMF+gXaBbhllodHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vcGtp -b3BzL2NybC9NaWNyb3NvZnQlMjBBenVyZSUyMEVDQyUyMFRMUyUyMElzc3Vpbmcl -MjBDQSUyMDA3LmNybDBmBgNVHSAEXzBdMFEGDCsGAQQBgjdMg30BATBBMD8GCCsG -AQUFBwIBFjNodHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vcGtpb3BzL0RvY3MvUmVw -b3NpdG9yeS5odG0wCAYGZ4EMAQICMB8GA1UdIwQYMBaAFMNerEB2wAZN4yuUmTBg -czSYKcZRMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAKBggqhkjOPQQD -AwNpADBmAjEAtoqcknAk4n8l2juxLT0LFIwJvdVnlWIQwYjbuNbBHGCn8TRqNuce -Vn8UQxxpmF2dAjEAyBOPGnNrGzL4EBqdlGuW2VUJxMma8FuzWPRdd4MGXo+74j1t -1iYWsNaO2ogqGSTd ------END CERTIFICATE----- - 1 s:C = US, O = Microsoft Corporation, CN = Microsoft Azure ECC TLS Issuing CA 07 - i:C = US, O = DigiCert Inc, OU = www.digicert.com, CN = DigiCert Global Root G3 - a:PKEY: id-ecPublicKey, 384 (bit); sigalg: ecdsa-with-SHA384 - v:NotBefore: Jun 8 00:00:00 2023 GMT; NotAfter: Aug 25 23:59:59 2026 GMT ------BEGIN CERTIFICATE----- -MIIDXTCCAuOgAwIBAgIQDx8VdYLNzTNzS9xfzZQaMzAKBggqhkjOPQQDAzBhMQsw -CQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cu -ZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBHMzAe -Fw0yMzA2MDgwMDAwMDBaFw0yNjA4MjUyMzU5NTlaMF0xCzAJBgNVBAYTAlVTMR4w -HAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLjAsBgNVBAMTJU1pY3Jvc29m -dCBBenVyZSBFQ0MgVExTIElzc3VpbmcgQ0EgMDcwdjAQBgcqhkjOPQIBBgUrgQQA -IgNiAATokm9hNnECQj2lbZM9is6plTI2rgjbWOkOLqclsWYe7hly1d9YsaivU9rw -QAhByBfxuBIAOuvgcUoYhihMsGuzwe8REVxJzkNIvQMi6cyUZL4bSMkZa/9R8qt9 -eAlQ2XKjggFiMIIBXjASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBTDXqxA -dsAGTeMrlJkwYHM0mCnGUTAfBgNVHSMEGDAWgBSz20ik+aHF2K42QcwRY2liKbxL -xjAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC -MHYGCCsGAQUFBwEBBGowaDAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNl -cnQuY29tMEAGCCsGAQUFBzAChjRodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20v -RGlnaUNlcnRHbG9iYWxSb290RzMuY3J0MEIGA1UdHwQ7MDkwN6A1oDOGMWh0dHA6 -Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEdsb2JhbFJvb3RHMy5jcmwwHQYD -VR0gBBYwFDAIBgZngQwBAgEwCAYGZ4EMAQICMAoGCCqGSM49BAMDA2gAMGUCMQD4 -NlZZatULuw0uN/yBMq9WikJwL8IHljJyU1EyPmv3XOKab+TbGSFWK/x6QeCH4lkC -MGnBJi1rXgd9ieBW4PSmq1v0Jd5YrBptoNMGk5J+dDOj7L3ItN16Lyjk9coSKgZS -zw== ------END CERTIFICATE----- ---- -Server certificate -subject=C = US, ST = WA, L = Redmond, O = Microsoft Corporation, CN = *.eventgrid.azure.net -issuer=C = US, O = Microsoft Corporation, CN = Microsoft Azure ECC TLS Issuing CA 07 ---- -No client certificate CA names sent -Requested Signature Algorithms: ECDSA+SHA256:ECDSA+SHA384:ECDSA+SHA512:RSA-PSS+SHA256:RSA-PSS+SHA384:RSA-PSS+SHA512:RSA-PSS+SHA256:RSA-PSS+SHA384:RSA-PSS+SHA512:RSA+SHA256:RSA+SHA384:RSA+SHA512:ECDSA+SHA224:RSA+SHA224 -Shared Requested Signature Algorithms: ECDSA+SHA256:ECDSA+SHA384:ECDSA+SHA512:RSA-PSS+SHA256:RSA-PSS+SHA384:RSA-PSS+SHA512:RSA-PSS+SHA256:RSA-PSS+SHA384:RSA-PSS+SHA512:RSA+SHA256:RSA+SHA384:RSA+SHA512 -Peer signing digest: SHA384 -Peer signature type: ECDSA -Server Temp Key: ECDH, prime256v1, 256 bits ---- -SSL handshake has read 3089 bytes and written 827 bytes -Verification: OK ---- -New, TLSv1.3, Cipher is TLS_AES_128_GCM_SHA256 -Server public key is 384 bit -Secure Renegotiation IS NOT supported -Compression: NONE -Expansion: NONE -No ALPN negotiated -Early data was not sent -Verify return code: 0 (ok) ---- ---- -Post-Handshake New Session Ticket arrived: -SSL-Session: - Protocol : TLSv1.3 - Cipher : TLS_AES_128_GCM_SHA256 - Session-ID: D692059799E41DB1B4A639E0F8936699866149B55805D9DE54148B23CE01135B - Session-ID-ctx: - Resumption PSK: B49A236A08B6CBA810AA934DD7C3896B496EBC0447C17D54332FCB729291D55A - PSK identity: None - PSK identity hint: None - SRP username: None - TLS session ticket lifetime hint: 7200 (seconds) - TLS session ticket: - 0000 - 8a a7 82 f9 bf be 50 26-2f ad 73 0d bb f7 91 4b ......P&/.s....K - 0010 - 66 cf 20 4a 5e 0e 96 cb-0d 11 ca b7 75 3b cb 17 f. J^.......u;.. - 0020 - ae 55 1d 7f 2c 2f 24 d5-aa 0c 00 36 be bd 8e ad .U..,/$....6.... - 0030 - 3e b2 58 7c 0d 5a 91 69-ff 22 dd d2 ea ed 03 1b >.X|.Z.i."...... - 0040 - 4e 22 70 6b de 55 28 f4-07 3e 17 b8 8f 7e c8 81 N"pk.U(..>...~.. - 0050 - 8c 4f 42 9b 04 01 4a 9b-4f 8b 12 db aa 97 de f4 .OB...J.O....... - 0060 - cf c3 b7 5d 63 64 76 aa-b1 43 d6 88 f1 7a 88 6c ...]cdv..C...z.l - 0070 - e7 bd 5d 45 9a ba ec cf-9b 05 51 56 29 e9 1b 91 ..]E......QV)... - 0080 - b9 73 f3 12 8d 67 6e 94-45 7c 63 38 49 20 aa d3 .s...gn.E|c8I .. - 0090 - a1 a4 56 36 81 2a e6 7d-b3 dc 8f 4d 0b 4a f4 e3 ..V6.*.}...M.J.. - 00a0 - 67 37 90 20 59 d0 13 31-61 5a 5d bb 69 88 d7 43 g7. Y..1aZ].i..C - - Start Time: 1725304955 - Timeout : 7200 (sec) - Verify return code: 0 (ok) - Extended master secret: no - Max Early Data: 0 ---- -read R BLOCK ---- -Post-Handshake New Session Ticket arrived: -SSL-Session: - Protocol : TLSv1.3 - Cipher : TLS_AES_128_GCM_SHA256 - Session-ID: E027A4A771A890E80633F18F776CFAD5B13FDE28FB04E1BDAFBCA7C9152D704A - Session-ID-ctx: - Resumption PSK: 4A978B112FD3223E2164668B84BC1CEA34F2977E42B7C967666B8E35A554AC46 - PSK identity: None - PSK identity hint: None - SRP username: None - TLS session ticket lifetime hint: 7200 (seconds) - TLS session ticket: - 0000 - 8a a7 82 f9 bf be 50 26-2f ad 73 0d bb f7 91 4b ......P&/.s....K - 0010 - 95 08 d8 ce c8 4b 41 fc-03 48 5e 49 72 a1 7a 2c .....KA..H^Ir.z, - 0020 - 97 3d ea c8 3d be 56 f5-64 41 45 6c 7c 2e bf c2 .=..=.V.dAEl|... - 0030 - cf 70 75 49 42 f1 86 4a-e8 c3 a0 00 16 3d 7b 62 .puIB..J.....={b - 0040 - fb 08 cf e1 53 f2 d3 55-68 26 95 61 29 29 d9 3c ....S..Uh&.a)).< - 0050 - a3 65 50 4a 74 83 ca 15-34 49 01 c8 df c7 c2 00 .ePJt...4I...... - 0060 - ff c8 3a 5f 3e 93 ae 6f-61 d9 bc 38 34 5f b4 8b ..:_>..oa..84_.. - 0070 - 57 ac 36 56 fe a2 a6 53-84 55 7e 8c 18 28 ca 60 W.6V...S.U~..(.` - 0080 - 24 87 ec 7f cf 95 6c f0-20 c3 49 76 65 99 fb e5 $.....l. .Ive... - 0090 - 84 26 7e cd 3c 82 9a 2d-2d 75 d0 f6 3f a9 38 c7 .&~.<..--u..?.8. - 00a0 - ab d0 9a 27 d6 18 95 de-62 28 57 97 4d 03 14 02 ...'....b(W.M... - - Start Time: 1725304955 - Timeout : 7200 (sec) - Verify return code: 0 (ok) - Extended master secret: no - Max Early Data: 0 ---- -read R BLOCK diff --git a/old/ota.sh b/old/ota.sh new file mode 100755 index 0000000..8dd480d --- /dev/null +++ b/old/ota.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +# first device connected + +idf.py clean +idf.py -DROLE=SENDER build + +ret_val=$? + +if (($ret_val != 0)); then + exit +fi + +rm build/wellhub.enc.bin 2> /dev/null +echo "Encrypting image..." +image_enc/encrypt.py build/wellhub.bin build/wellhub.enc.bin +echo "Uploading..." +lftp -c "open -u mirozmrzli@bigfoot-inc.com,3445trGGDSa9 ftp.bigfoot-inc.com; put build/wellhub.enc.bin" + diff --git a/upload.sh b/old/upload.sh similarity index 100% rename from upload.sh rename to old/upload.sh diff --git a/ota.sh b/ota.sh index 8dd480d..dbcccd8 100755 --- a/ota.sh +++ b/ota.sh @@ -15,5 +15,5 @@ rm build/wellhub.enc.bin 2> /dev/null echo "Encrypting image..." image_enc/encrypt.py build/wellhub.bin build/wellhub.enc.bin echo "Uploading..." -lftp -c "open -u mirozmrzli@bigfoot-inc.com,3445trGGDSa9 ftp.bigfoot-inc.com; put build/wellhub.enc.bin" +lftp -c "open -u well_ftpuser,%%2025!#_ThisIsaLL wellnua.com; put -O FW build/wellhub.enc.bin" diff --git a/test.sh b/test.sh deleted file mode 100755 index 341e13c..0000000 --- a/test.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -# first device connected - -idf.py -DROLE=SENDER build - -ret_val=$? - -if (($ret_val != 0)); then - exit -fi - -if [$1 == '']; then - idf.py -p /dev/ttyUSB0 flash && idf.py -p /dev/ttyUSB0 monitor -B 450000 -else - idf.py -p $1 flash && idf.py -p $1 monitor -B 450000 -fi