From fbaed11a654e165ef66436792cc38619cf693056 Mon Sep 17 00:00:00 2001 From: ok-home Date: Tue, 10 Oct 2023 19:08:55 +0700 Subject: [PATCH] tested --- Kconfig.projbuild | 2 +- example_ota_ws/main/example_echo_ws_server.c | 3 -- example_ota_ws/main/example_ota_ws_update.c | 3 -- example_ota_ws/rsa_key/private_rsa_3072.pem | 40 ++++++++++++++++++++ private_include/ota_ws_update_private.h | 1 - source/ota_ws_update_http.c | 9 +---- 6 files changed, 42 insertions(+), 16 deletions(-) create mode 100644 example_ota_ws/rsa_key/private_rsa_3072.pem diff --git a/Kconfig.projbuild b/Kconfig.projbuild index 95a1a14..854ba47 100644 --- a/Kconfig.projbuild +++ b/Kconfig.projbuild @@ -27,7 +27,7 @@ menu "OTA websocket update" choice OTA_PRE_ENCRYPTED_RSA_KEY_LOCATION depends on OTA_PRE_ENCRYPTED_MODE prompt "RSA key directory" - default OTA_PRE_ENCRYPTED_RSA_KEY_ON_PROJECT_LOCATION + default OTA_PRE_ENCRYPTED_RSA_KEY_ON_COMPONENT_LOCATION config OTA_PRE_ENCRYPTED_RSA_KEY_ON_PROJECT_LOCATION bool "PROJECT_DIR" config OTA_PRE_ENCRYPTED_RSA_KEY_ON_COMPONENT_LOCATION diff --git a/example_ota_ws/main/example_echo_ws_server.c b/example_ota_ws/main/example_echo_ws_server.c index acda9ee..37414cb 100644 --- a/example_ota_ws/main/example_echo_ws_server.c +++ b/example_ota_ws/main/example_echo_ws_server.c @@ -10,9 +10,6 @@ #include #include #include -#include -#include -#include "esp_netif.h" #include diff --git a/example_ota_ws/main/example_ota_ws_update.c b/example_ota_ws/main/example_ota_ws_update.c index e65a945..b9ba58f 100644 --- a/example_ota_ws/main/example_ota_ws_update.c +++ b/example_ota_ws/main/example_ota_ws_update.c @@ -6,9 +6,6 @@ software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */ -#include "freertos/FreeRTOS.h" -#include "freertos/task.h" -#include "esp_system.h" #include "esp_log.h" #include "esp_http_server.h" diff --git a/example_ota_ws/rsa_key/private_rsa_3072.pem b/example_ota_ws/rsa_key/private_rsa_3072.pem new file mode 100644 index 0000000..2eadbed --- /dev/null +++ b/example_ota_ws/rsa_key/private_rsa_3072.pem @@ -0,0 +1,40 @@ +-----BEGIN PRIVATE KEY----- +MIIG/gIBADANBgkqhkiG9w0BAQEFAASCBugwggbkAgEAAoIBgQDFmskeWxaJtPCV +Xydauqm6Q/wW9D0ewNUo+L9sopGz/Lrw5JdynLQDcxcioqpow5Nr9A8y8+YJc9zH +sMs4qJYDLcxROeimGlPqtrj4OxFXDyok12fxDquYTXaJzTAM+rp/i/VJJVKonYU0 +DOuG8tX1lsrlfkwYixaoPUGL/WuG1srHay5NKCcXjYVUKsjHkfEgfKAhF/6cPTj6 +yeKH6nNQQofOYUN5hkGgT19ek3or0dYph9r3VozyjV12/D1K+o0Vl+LQc7IX3xxN +DB9s3aGVIMglir8AY2ZjkqRyJRzbIrjufXYxw/e6uP2YQyBagEBWlsEhxKVsVOvi +O5fHfw+Svd9vgO3PRIA9bDh2isO6SHis6akgWBsXNh/FS1Kyl1IrBt+CnIsgQRzz +po7hh/TfU6VCKXL5fZR+fK6Ze12MP+B30HEXrW+VhzvhCMWjbyFIYJ1jGfd5N/zD +3E26cQPn711M+13cbKJeSWU0aX9dwQxPSXJdytORijxlFfUIAmsCAwEAAQKCAYA4 +3/9JJHCNPC4O4C9klttpSE4TkULSSjBQNaBrNTN4uaJY2YKZs27Am2yqRGWF99zD +sqB5SugICngeZc1oRmW/DnyDWIaU4HkM0oDUubOY+j1oEzPQlydek9Utfoh5A+WP +9omn/v0WmRgQzjMwSU65/Cfz+/ENE2N3EwJ9t3gufD4rPbc67/aoecxJWHMnteLQ +Ne6k99IJyDlRPbBc7Gc6T5vlE+um27Sh3paVkx8T47afh4HHtPqmiXfAWoONxCU7 +YXXWfIo4qB80it77QHtHdAgXxEZGug2WsDakf1bC/veZ0Qm4OkfkYzFF3DhRXTia +sffXdP6z+/nB+WG0k/qIqo5BweW3aOb+pyXATGTNVsRp98cxS6GpyZb3yUDnfiLL +vKzzMwPPJyA2X1cDVUrwTETg9jRB/UDTsYLjedar2FRkVI46lPZtvdqHLx5+UpDs +CEAooRaOi10LB52zhqhyKpy2VtsHXuhOLrGlj8R5DPGqzB9ZjlOLqsIxzXgT1+kC +gcEAzDxdkbY7xj1Q7HKOVQiRr45xijkL6kleglmBFt0DqFMETYzb4Y7xDEdU82H0 +XBlOnQIc6GD4PBGQDGGURSkQya7aSEWfIIRG3PCTCzSJhghPK+olFz5+39x/QUSm +zTY9rjIzAXu/VBSnFK+bL2A+etJOQFOrhfGESbWHsbuqPbigU5q9eCAcQs/GBI1F +x1ckjRCkUxpNS1jP92GWpIPVQQYd8IFwLfcA6nJq8UoXpIZazYfqeOOyN47ns7ho +TRhfAoHBAPewKcmEfikaTExIQKckN7rpfMJRmp3oWsq18AF6nywVYylhJPFo74Tw +6P/lsFJqjgCbN2bbMuw7vCq2a36tBy1rRFaNtRNjl8XjO3XP5RZG5Z9lUFA7Gvf+ +pY8qUIWzBWXVi/KugpAwNvy7rgYoqKZyUFOrm/4ehCz7uGD5OmpucEVPvOQIDYPe +cqF27iLXYiTJv20ASVnpmoF5XJaztQa2O9VSupTgxNGXi+iUz+azrIeUviTbOgZP +H5flbfyBdQKBwQCV4WsNhv3g4pijnQIlFy/K9S8PsAO1gPhxknuwqquHeLz8qHWo +1zzAtQx7vBQXDp9pi+ZpBtjFRGJBI88q3hMq3z3jsewwccKLW6WdoIWYLjrj0GY9 +46g6Ytekr1v112t2jfJukUD81Fc1UBYDs47GldXFUWHb3z0k1qppXX524yoNkM6g +/Heg9FeueXqO6r2xJFhjgDbfJ6MfOafSvcjfejy4hlUr9kvewe8HekdVfx/eG3OQ +GhFswlv5wUgR4+MCgcBaOJEAFoLd9fZU0vy55TdnniUToyXu3vQzYpJJ96CDLkcw +i3IpfU/B3P8CN2hCnQ2cqu1DShUCd7/Szx/YxK4YnToHTRboOR7PtjWydEe+FZUO +upjGoMDyFI+51m/+Q3dz4JVZkLd+ThG5faOmGqlT98/Kqnfn2LXMrOQ8bowYuKGs +nZ7wcP57Skv3BJs5lbrqK5LO4YvWdIETKGHRgyQtjbO9wKS2FimbLtiHn60bG9d8 +i3G3eyNnqOqZKbkmgQECgcEAgX9k4kDqK7IoNdk5Keypxvk5xUi+8rM2A52aRjer +m1a32/0EmV2+gggtg5h9K4xUdoaRfvnggx5XqMNoshp4Qm5nKu4bJavdO+us2HVA +urstNyvWaoQQJm26LAoG6u57DqmX6j0RnOUjL9OBgGiNDwqaek+QbqHSc0mrSH36 +Nfo9+XOssR7sZbNzKRGLlWGP1ham7QTjf6wkMFMYozBZZ96NgNbPW+gWd/kZlFCe +3YUVwrqlblfFYykcpa1p1llz +-----END PRIVATE KEY----- diff --git a/private_include/ota_ws_update_private.h b/private_include/ota_ws_update_private.h index fc764a8..d303bf1 100644 --- a/private_include/ota_ws_update_private.h +++ b/private_include/ota_ws_update_private.h @@ -1,7 +1,6 @@ #pragma once #include -#include #include "esp_http_server.h" #define OTA_RESTART_ESP "otaRestartEsp" diff --git a/source/ota_ws_update_http.c b/source/ota_ws_update_http.c index 4aa00f5..3fdbfe1 100644 --- a/source/ota_ws_update_http.c +++ b/source/ota_ws_update_http.c @@ -8,15 +8,8 @@ #include "ota_ws_update_private.h" #include "ota_ws_update.h" -#include "freertos/task.h" -#include "freertos/queue.h" - #include "jsmn.h" -/* -#define OTA_DEFAULT_WS_URI "/ws" -#define OTA_DEFAULT_URI "/" -#define OTA_CHUNK_SIZE 4096*2 -*/ + #define OTA_DEFAULT_WS_URI CONFIG_OTA_DEFAULT_WS_URI #define OTA_DEFAULT_URI CONFIG_OTA_DEFAULT_URI #define OTA_CHUNK_SIZE (CONFIG_OTA_CHUNK_SIZE & ~0xf)