From bf7d7043254228457c2b2fecc95d7808eb39952e Mon Sep 17 00:00:00 2001 From: mathcoll Date: Sun, 27 Oct 2024 13:12:22 +0100 Subject: [PATCH] new version with updated SSL --- .gitignore | 1 + .vscode/arduino.json | 5 +++++ library.json | 2 +- library.properties | 2 +- src/t6iot.cpp | 44 +++++++++++++++++++++----------------------- 5 files changed, 29 insertions(+), 25 deletions(-) create mode 100644 .vscode/arduino.json diff --git a/.gitignore b/.gitignore index 8ee730a..9f2ab60 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ **/settings.lua /src\keywords.txt +.vscode/c_cpp_properties.json diff --git a/.vscode/arduino.json b/.vscode/arduino.json new file mode 100644 index 0000000..5877fba --- /dev/null +++ b/.vscode/arduino.json @@ -0,0 +1,5 @@ +{ + "configuration": "xtal=80,vt=flash,exception=disabled,stacksmash=disabled,ssl=all,mmu=3232,non32xfer=fast,eesz=4M2M,led=2,ip=lm2f,dbg=Disabled,lvl=None____,wipe=none,baud=115200", + "board": "esp8266:esp8266:nodemcuv2", + "sketch": "examples/t6iot2/t6iot2_basic/t6iot2_basic.ino" +} \ No newline at end of file diff --git a/library.json b/library.json index 9c27749..c82d429 100644 --- a/library.json +++ b/library.json @@ -2,7 +2,7 @@ "name": "t6iot", "keywords": "iot, things, api, rest, object, connect", "description": "Library to connect t6 iot platform https://api.internetcollaboratif.info", - "version": "2.0.10", + "version": "2.0.11", "frameworks": "arduino", "examples": "examples/t6iot2/*.ino", "platforms": "*", diff --git a/library.properties b/library.properties index 44eef79..0c32983 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=t6iot -version=2.0.10 +version=2.0.11 author=Mathieu Lory maintainer=Mathieu Lory sentence=Library to connect Arduino Sensors to t6iot framework SaaS or On-Premise. diff --git a/src/t6iot.cpp b/src/t6iot.cpp index a693481..e3a55bb 100644 --- a/src/t6iot.cpp +++ b/src/t6iot.cpp @@ -9,32 +9,30 @@ // nmap --script ssl-cert.nse -p 443 api.internetcollaboratif.info | grep SHA-1 // openssl s_client -connect api.internetcollaboratif.info:443 -prexit -showcerts -state -status -tlsextdebug -verify 10 -String VERSION = "2.0.10"; +String VERSION = "2.0.11"; -const char *fingerprint = "3855 b1d0 24c4 92a5 d987 3af8 b826 0962 fc19 d6fd"; +const char *fingerprint = "84c9 4e18 3389 fd70 1359 cf40 f1ea 5e9c 6b0c c7ad"; const char* root_ca PROGMEM = R"EOF( -----BEGIN CERTIFICATE----- -MIIDzTCCA3SgAwIBAgIRALk0TQuaK+NgDVKAzcdovIUwCgYIKoZIzj0EAwIwOzEL -MAkGA1UEBhMCVVMxHjAcBgNVBAoTFUdvb2dsZSBUcnVzdCBTZXJ2aWNlczEMMAoG -A1UEAxMDV0UxMB4XDTI0MDYyOTE3NTAzOFoXDTI0MDkyNzE3NTAzN1owJDEiMCAG -A1UEAxMZaW50ZXJuZXRjb2xsYWJvcmF0aWYuaW5mbzBZMBMGByqGSM49AgEGCCqG -SM49AwEHA0IABNkTHaE7b3Gbi2qag+99n8bVQaqSpDjc9bYQqyUOns1FA7daqHU9 -brpBi7KUrqTF5GEy2aFRJ4DsAV551Amcs8yjggJuMIICajAOBgNVHQ8BAf8EBAMC -B4AwEwYDVR0lBAwwCgYIKwYBBQUHAwEwDAYDVR0TAQH/BAIwADAdBgNVHQ4EFgQU -+VigOkrwWoAOcZpbBYvVSibhD54wHwYDVR0jBBgwFoAUkHeSNWfE/6jMqeZ72YB5 -e8yT+TgwXgYIKwYBBQUHAQEEUjBQMCcGCCsGAQUFBzABhhtodHRwOi8vby5wa2ku -Z29vZy9zL3dlMS91VFEwJQYIKwYBBQUHMAKGGWh0dHA6Ly9pLnBraS5nb29nL3dl -MS5jcnQwQQYDVR0RBDowOIIZaW50ZXJuZXRjb2xsYWJvcmF0aWYuaW5mb4IbKi5p -bnRlcm5ldGNvbGxhYm9yYXRpZi5pbmZvMBMGA1UdIAQMMAowCAYGZ4EMAQIBMDYG -A1UdHwQvMC0wK6ApoCeGJWh0dHA6Ly9jLnBraS5nb29nL3dlMS9xWFJ3UTVMVldj -by5jcmwwggEDBgorBgEEAdZ5AgQCBIH0BIHxAO8AdQB2/4g/Crb7lVHCYcz1h7o0 -tKTNuyncaEIKn+ZnTFo6dAAAAZBlVcqyAAAEAwBGMEQCIFV5tDIgSCQqbKMomcbN -RQwFaUrCmLiJcBM13Pl5rcCOAiBtZQjlIZE+84W/7Y/2FYVqpJuTom6DDT+pK78w -iSJe2wB2AD8XS0/XIkdYlB1lHIS+DRLtkDd/H4Vq68G/KIXs+GRuAAABkGVVypUA -AAQDAEcwRQIgL6jaiJzgQHKUCt+4sZWkxXHWzT1dlTnn+FrVXBH27/ECIQDT8Yoi -fTIAlp4gQx9JvC8nwIbtUhRgEwo2rBK7R2l2STAKBggqhkjOPQQDAgNHADBEAiAg -kawFMKcp11pd85npfZDIT1jqeJJ5X6kwbpwnT5MHZwIgCe+Cn1XqHb6t8wJU7aC9 -bw3VEr9VUQaELn6Uq25r2rM= +MIIDejCCAmKgAwIBAgIQf+UwvzMTQ77dghYQST2KGzANBgkqhkiG9w0BAQsFADBX +MQswCQYDVQQGEwJCRTEZMBcGA1UEChMQR2xvYmFsU2lnbiBudi1zYTEQMA4GA1UE +CxMHUm9vdCBDQTEbMBkGA1UEAxMSR2xvYmFsU2lnbiBSb290IENBMB4XDTIzMTEx +NTAzNDMyMVoXDTI4MDEyODAwMDA0MlowRzELMAkGA1UEBhMCVVMxIjAgBgNVBAoT +GUdvb2dsZSBUcnVzdCBTZXJ2aWNlcyBMTEMxFDASBgNVBAMTC0dUUyBSb290IFI0 +MHYwEAYHKoZIzj0CAQYFK4EEACIDYgAE83Rzp2iLYK5DuDXFgTB7S0md+8Fhzube +Rr1r1WEYNa5A3XP3iZEwWus87oV8okB2O6nGuEfYKueSkWpz6bFyOZ8pn6KY019e +WIZlD6GEZQbR3IvJx3PIjGov5cSr0R2Ko4H/MIH8MA4GA1UdDwEB/wQEAwIBhjAd +BgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDwYDVR0TAQH/BAUwAwEB/zAd +BgNVHQ4EFgQUgEzW63T/STaj1dj8tT7FavCUHYwwHwYDVR0jBBgwFoAUYHtmGkUN +l8qJUC99BM00qP/8/UswNgYIKwYBBQUHAQEEKjAoMCYGCCsGAQUFBzAChhpodHRw +Oi8vaS5wa2kuZ29vZy9nc3IxLmNydDAtBgNVHR8EJjAkMCKgIKAehhxodHRwOi8v +Yy5wa2kuZ29vZy9yL2dzcjEuY3JsMBMGA1UdIAQMMAowCAYGZ4EMAQIBMA0GCSqG +SIb3DQEBCwUAA4IBAQAYQrsPBtYDh5bjP2OBDwmkoWhIDDkic574y04tfzHpn+cJ +odI2D4SseesQ6bDrarZ7C30ddLibZatoKiws3UL9xnELz4ct92vID24FfVbiI1hY ++SW6FoVHkNeWIP0GCbaM4C6uVdF5dTUsMVs/ZbzNnIdCp5Gxmx5ejvEau8otR/Cs +kGN+hr/W5GvT1tMBjgWKZ1i4//emhA1JG1BbPzoLJQvyEotc03lXjTaCzv8mEbep +8RqZ7a2CPsgRbuvTPBwcOMBBmuFeU88+FSBX6+7iP0il8b4Z0QFqIwwMHfs/L6K1 +vepuoxtGzi4CZ68zJpiq1UvSqTbFJjtbD4seiMHl -----END CERTIFICATE----- )EOF"; IPAddress dns(8, 8, 8, 8); //Google dns