mirror of
https://github.com/espressif/esp-idf.git
synced 2024-10-05 20:47:46 -04:00
other: Move cbor, jsmn and libsodium to idf-component-manager
Marginal components are being carved out from esp-idf and moved to https://github.com/espressif/idf-extra-components. They are distributed via idf-component-manager, see https://components.espressif.com.
This commit is contained in:
Tomas Rezucha
parent
6a11f6fb20
commit
ebaca79557
1
.flake8
1
.flake8
@ -146,7 +146,6 @@ exclude =
|
||||
components/esptool_py/esptool,
|
||||
components/expat/expat,
|
||||
components/json/cJSON,
|
||||
components/libsodium/libsodium,
|
||||
components/mbedtls/mbedtls,
|
||||
components/nghttp/nghttp2,
|
||||
components/openthread/openthread,
|
||||
|
||||
@ -66,7 +66,6 @@
|
||||
/components/asio/ @esp-idf-codeowners/network
|
||||
/components/bootloader*/ @esp-idf-codeowners/system @esp-idf-codeowners/security
|
||||
/components/bt/ @esp-idf-codeowners/bluetooth
|
||||
/components/cbor/ @esp-idf-codeowners/app-utilities
|
||||
/components/cmock/ @esp-idf-codeowners/system
|
||||
/components/coap/ @esp-idf-codeowners/app-utilities
|
||||
/components/console/ @esp-idf-codeowners/system @esp-idf-codeowners/app-utilities
|
||||
@ -109,9 +108,7 @@
|
||||
/components/heap/ @esp-idf-codeowners/system
|
||||
/components/idf_test/ @esp-idf-codeowners/ci
|
||||
/components/ieee802154/ @esp-idf-codeowners/ieee802154
|
||||
/components/jsmn/ @esp-idf-codeowners/app-utilities
|
||||
/components/json/ @esp-idf-codeowners/app-utilities
|
||||
/components/libsodium/ @esp-idf-codeowners/security
|
||||
/components/log/ @esp-idf-codeowners/system
|
||||
/components/lwip/ @esp-idf-codeowners/lwip
|
||||
/components/mbedtls/ @esp-idf-codeowners/app-utilities @esp-idf-codeowners/security
|
||||
|
||||
@ -146,7 +146,6 @@
|
||||
- "components/bt/controller/lib_esp32"
|
||||
- "components/bt/controller/lib_esp32c3_family"
|
||||
- "components/bt/host/nimble/nimble"
|
||||
- "components/cbor/tinycbor"
|
||||
- "components/cmock/CMock"
|
||||
- "components/cmock/CMock/vendor/c_exception"
|
||||
- "components/cmock/CMock/vendor/unity"
|
||||
@ -157,7 +156,6 @@
|
||||
- "components/esptool_py/esptool"
|
||||
- "components/expat/expat"
|
||||
- "components/json/cJSON"
|
||||
- "components/libsodium/libsodium"
|
||||
- "components/lwip/lwip"
|
||||
- "components/mbedtls/mbedtls"
|
||||
- "components/mqtt/esp-mqtt"
|
||||
|
||||
8
.gitmodules
vendored
8
.gitmodules
vendored
@ -23,10 +23,6 @@
|
||||
path = components/nghttp/nghttp2
|
||||
url = ../../nghttp2/nghttp2.git
|
||||
|
||||
[submodule "components/libsodium/libsodium"]
|
||||
path = components/libsodium/libsodium
|
||||
url = ../../jedisct1/libsodium.git
|
||||
|
||||
[submodule "components/spiffs/spiffs"]
|
||||
path = components/spiffs/spiffs
|
||||
url = ../../pellepl/spiffs.git
|
||||
@ -71,10 +67,6 @@
|
||||
path = components/bt/host/nimble/nimble
|
||||
url = ../../espressif/esp-nimble.git
|
||||
|
||||
[submodule "components/cbor/tinycbor"]
|
||||
path = components/cbor/tinycbor
|
||||
url = ../../intel/tinycbor.git
|
||||
|
||||
[submodule "components/esp_wifi/lib"]
|
||||
path = components/esp_wifi/lib
|
||||
url = ../../espressif/esp32-wifi-lib.git
|
||||
|
||||
@ -1,20 +0,0 @@
|
||||
idf_component_register(SRCS "tinycbor/src/cborencoder_close_container_checked.c"
|
||||
"tinycbor/src/cborencoder.c"
|
||||
"tinycbor/src/cborerrorstrings.c"
|
||||
"tinycbor/src/cborparser_dup_string.c"
|
||||
"tinycbor/src/cborparser.c"
|
||||
"tinycbor/src/cborpretty_stdio.c"
|
||||
"tinycbor/src/cborpretty.c"
|
||||
"tinycbor/src/cbortojson.c"
|
||||
"tinycbor/src/cborvalidation.c"
|
||||
"tinycbor/src/open_memstream.c"
|
||||
INCLUDE_DIRS "port/include"
|
||||
PRIV_INCLUDE_DIRS "tinycbor/src")
|
||||
|
||||
# for open_memstream.c
|
||||
set_source_files_properties(tinycbor/src/open_memstream.c PROPERTIES COMPILE_DEFINITIONS "__linux__")
|
||||
|
||||
# workaround for the fact that we are passing -ffreestanding to Clang
|
||||
if(CMAKE_C_COMPILER_ID MATCHES "Clang")
|
||||
target_compile_options(${COMPONENT_LIB} PRIVATE "-U __STDC_HOSTED__")
|
||||
endif()
|
||||
@ -1,2 +0,0 @@
|
||||
#include "../../tinycbor/src/cbor.h"
|
||||
#include "../../tinycbor/src/cborjson.h"
|
||||
@ -1 +0,0 @@
|
||||
Subproject commit 7c349dbb6b8d76db39383b226d3ebdf59b8ab37d
|
||||
@ -1,10 +0,0 @@
|
||||
idf_component_register(SRCS "src/jsmn.c"
|
||||
INCLUDE_DIRS "include")
|
||||
|
||||
if(CONFIG_JSMN_PARENT_LINKS)
|
||||
target_compile_definitions(${COMPONENT_LIB} PUBLIC "-DJSMN_PARENT_LINKS")
|
||||
endif()
|
||||
|
||||
if(CONFIG_JSMN_STRICT)
|
||||
target_compile_definitions(${COMPONENT_LIB} PUBLIC "-DJSMN_STRICT")
|
||||
endif()
|
||||
@ -1,16 +0,0 @@
|
||||
menu "jsmn"
|
||||
|
||||
|
||||
config JSMN_PARENT_LINKS
|
||||
bool "Enable parent links"
|
||||
default n
|
||||
help
|
||||
You can access to parent node of parsed json
|
||||
|
||||
config JSMN_STRICT
|
||||
bool "Enable strict mode"
|
||||
default n
|
||||
help
|
||||
In strict mode primitives are: numbers and booleans
|
||||
|
||||
endmenu
|
||||
@ -1,106 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2010 Serge A. Zaitsev
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file jsmn.h
|
||||
* @brief Definition of the JSMN (Jasmine) JSON parser.
|
||||
*
|
||||
* For more information on JSMN:
|
||||
* @see http://zserge.com/jsmn.html
|
||||
*/
|
||||
|
||||
#ifndef __JSMN_H_
|
||||
#define __JSMN_H_
|
||||
|
||||
#include <stddef.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/**
|
||||
* JSON type identifier. Basic types are:
|
||||
* o Object
|
||||
* o Array
|
||||
* o String
|
||||
* o Other primitive: number, boolean (true/false) or null
|
||||
*/
|
||||
typedef enum {
|
||||
JSMN_UNDEFINED = 0,
|
||||
JSMN_OBJECT = 1,
|
||||
JSMN_ARRAY = 2,
|
||||
JSMN_STRING = 3,
|
||||
JSMN_PRIMITIVE = 4
|
||||
} jsmntype_t;
|
||||
|
||||
enum jsmnerr {
|
||||
/* Not enough tokens were provided */
|
||||
JSMN_ERROR_NOMEM = -1,
|
||||
/* Invalid character inside JSON string */
|
||||
JSMN_ERROR_INVAL = -2,
|
||||
/* The string is not a full JSON packet, more bytes expected */
|
||||
JSMN_ERROR_PART = -3
|
||||
};
|
||||
|
||||
/**
|
||||
* JSON token description.
|
||||
* @param type type (object, array, string etc.)
|
||||
* @param start start position in JSON data string
|
||||
* @param end end position in JSON data string
|
||||
*/
|
||||
typedef struct {
|
||||
jsmntype_t type;
|
||||
int start;
|
||||
int end;
|
||||
int size;
|
||||
#ifdef JSMN_PARENT_LINKS
|
||||
int parent;
|
||||
#endif
|
||||
} jsmntok_t;
|
||||
|
||||
/**
|
||||
* JSON parser. Contains an array of token blocks available. Also stores
|
||||
* the string being parsed now and current position in that string
|
||||
*/
|
||||
typedef struct {
|
||||
unsigned int pos; /* offset in the JSON string */
|
||||
unsigned int toknext; /* next token to allocate */
|
||||
int toksuper; /* superior token node, e.g parent object or array */
|
||||
} jsmn_parser;
|
||||
|
||||
/**
|
||||
* Create JSON parser over an array of tokens
|
||||
*/
|
||||
void jsmn_init(jsmn_parser *parser);
|
||||
|
||||
/**
|
||||
* Run JSON parser. It parses a JSON data string into and array of tokens, each describing
|
||||
* a single JSON object.
|
||||
*/
|
||||
int jsmn_parse(jsmn_parser *parser, const char *js, size_t len,
|
||||
jsmntok_t *tokens, unsigned int num_tokens);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* __JSMN_H_ */
|
||||
@ -1,340 +0,0 @@
|
||||
/*
|
||||
* Copyright (c) 2010 Serge A. Zaitsev
|
||||
*
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
* of this software and associated documentation files (the "Software"), to deal
|
||||
* in the Software without restriction, including without limitation the rights
|
||||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||
* copies of the Software, and to permit persons to whom the Software is
|
||||
* furnished to do so, subject to the following conditions:
|
||||
*
|
||||
* The above copyright notice and this permission notice shall be included in
|
||||
* all copies or substantial portions of the Software.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file jsmn.c
|
||||
* @brief Implementation of the JSMN (Jasmine) JSON parser.
|
||||
*
|
||||
* For more information on JSMN:
|
||||
* @see http://zserge.com/jsmn.html
|
||||
*/
|
||||
|
||||
#include "jsmn.h"
|
||||
|
||||
/**
|
||||
* Allocates a fresh unused token from the token pull.
|
||||
*/
|
||||
static jsmntok_t *jsmn_alloc_token(jsmn_parser *parser,
|
||||
jsmntok_t *tokens, size_t num_tokens) {
|
||||
jsmntok_t *tok;
|
||||
if (parser->toknext >= num_tokens) {
|
||||
return NULL;
|
||||
}
|
||||
tok = &tokens[parser->toknext++];
|
||||
tok->start = tok->end = -1;
|
||||
tok->size = 0;
|
||||
#ifdef JSMN_PARENT_LINKS
|
||||
tok->parent = -1;
|
||||
#endif
|
||||
return tok;
|
||||
}
|
||||
|
||||
/**
|
||||
* Fills token type and boundaries.
|
||||
*/
|
||||
static void jsmn_fill_token(jsmntok_t *token, jsmntype_t type,
|
||||
int start, int end) {
|
||||
token->type = type;
|
||||
token->start = start;
|
||||
token->end = end;
|
||||
token->size = 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Fills next available token with JSON primitive.
|
||||
*/
|
||||
static int jsmn_parse_primitive(jsmn_parser *parser, const char *js,
|
||||
size_t len, jsmntok_t *tokens, size_t num_tokens) {
|
||||
jsmntok_t *token;
|
||||
int start;
|
||||
|
||||
start = parser->pos;
|
||||
|
||||
for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) {
|
||||
switch (js[parser->pos]) {
|
||||
#ifndef JSMN_STRICT
|
||||
/* In strict mode primitive must be followed by "," or "}" or "]" */
|
||||
case ':':
|
||||
#endif
|
||||
case '\t' : case '\r' : case '\n' : case ' ' :
|
||||
case ',' : case ']' : case '}' :
|
||||
goto found;
|
||||
}
|
||||
if (js[parser->pos] < 32 || js[parser->pos] >= 127) {
|
||||
parser->pos = start;
|
||||
return JSMN_ERROR_INVAL;
|
||||
}
|
||||
}
|
||||
#ifdef JSMN_STRICT
|
||||
/* In strict mode primitive must be followed by a comma/object/array */
|
||||
parser->pos = start;
|
||||
return JSMN_ERROR_PART;
|
||||
#endif
|
||||
|
||||
found:
|
||||
if (tokens == NULL) {
|
||||
parser->pos--;
|
||||
return 0;
|
||||
}
|
||||
token = jsmn_alloc_token(parser, tokens, num_tokens);
|
||||
if (token == NULL) {
|
||||
parser->pos = start;
|
||||
return JSMN_ERROR_NOMEM;
|
||||
}
|
||||
jsmn_fill_token(token, JSMN_PRIMITIVE, start, parser->pos);
|
||||
#ifdef JSMN_PARENT_LINKS
|
||||
token->parent = parser->toksuper;
|
||||
#endif
|
||||
parser->pos--;
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Fills next token with JSON string.
|
||||
*/
|
||||
static int jsmn_parse_string(jsmn_parser *parser, const char *js,
|
||||
size_t len, jsmntok_t *tokens, size_t num_tokens) {
|
||||
jsmntok_t *token;
|
||||
|
||||
int start = parser->pos;
|
||||
|
||||
parser->pos++;
|
||||
|
||||
/* Skip starting quote */
|
||||
for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) {
|
||||
char c = js[parser->pos];
|
||||
|
||||
/* Quote: end of string */
|
||||
if (c == '\"') {
|
||||
if (tokens == NULL) {
|
||||
return 0;
|
||||
}
|
||||
token = jsmn_alloc_token(parser, tokens, num_tokens);
|
||||
if (token == NULL) {
|
||||
parser->pos = start;
|
||||
return JSMN_ERROR_NOMEM;
|
||||
}
|
||||
jsmn_fill_token(token, JSMN_STRING, start+1, parser->pos);
|
||||
#ifdef JSMN_PARENT_LINKS
|
||||
token->parent = parser->toksuper;
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Backslash: Quoted symbol expected */
|
||||
if (c == '\\' && parser->pos + 1 < len) {
|
||||
int i;
|
||||
parser->pos++;
|
||||
switch (js[parser->pos]) {
|
||||
/* Allowed escaped symbols */
|
||||
case '\"': case '/' : case '\\' : case 'b' :
|
||||
case 'f' : case 'r' : case 'n' : case 't' :
|
||||
break;
|
||||
/* Allows escaped symbol \uXXXX */
|
||||
case 'u':
|
||||
parser->pos++;
|
||||
for(i = 0; i < 4 && parser->pos < len && js[parser->pos] != '\0'; i++) {
|
||||
/* If it isn't a hex character we have an error */
|
||||
if(!((js[parser->pos] >= 48 && js[parser->pos] <= 57) || /* 0-9 */
|
||||
(js[parser->pos] >= 65 && js[parser->pos] <= 70) || /* A-F */
|
||||
(js[parser->pos] >= 97 && js[parser->pos] <= 102))) { /* a-f */
|
||||
parser->pos = start;
|
||||
return JSMN_ERROR_INVAL;
|
||||
}
|
||||
parser->pos++;
|
||||
}
|
||||
parser->pos--;
|
||||
break;
|
||||
/* Unexpected symbol */
|
||||
default:
|
||||
parser->pos = start;
|
||||
return JSMN_ERROR_INVAL;
|
||||
}
|
||||
}
|
||||
}
|
||||
parser->pos = start;
|
||||
return JSMN_ERROR_PART;
|
||||
}
|
||||
|
||||
/**
|
||||
* Parse JSON string and fill tokens.
|
||||
*/
|
||||
int jsmn_parse(jsmn_parser *parser, const char *js, size_t len,
|
||||
jsmntok_t *tokens, unsigned int num_tokens) {
|
||||
int r;
|
||||
int i;
|
||||
jsmntok_t *token;
|
||||
int count = parser->toknext;
|
||||
|
||||
for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) {
|
||||
char c;
|
||||
jsmntype_t type;
|
||||
|
||||
c = js[parser->pos];
|
||||
switch (c) {
|
||||
case '{': case '[':
|
||||
count++;
|
||||
if (tokens == NULL) {
|
||||
break;
|
||||
}
|
||||
token = jsmn_alloc_token(parser, tokens, num_tokens);
|
||||
if (token == NULL)
|
||||
return JSMN_ERROR_NOMEM;
|
||||
if (parser->toksuper != -1) {
|
||||
tokens[parser->toksuper].size++;
|
||||
#ifdef JSMN_PARENT_LINKS
|
||||
token->parent = parser->toksuper;
|
||||
#endif
|
||||
}
|
||||
token->type = (c == '{' ? JSMN_OBJECT : JSMN_ARRAY);
|
||||
token->start = parser->pos;
|
||||
parser->toksuper = parser->toknext - 1;
|
||||
break;
|
||||
case '}': case ']':
|
||||
if (tokens == NULL)
|
||||
break;
|
||||
type = (c == '}' ? JSMN_OBJECT : JSMN_ARRAY);
|
||||
#ifdef JSMN_PARENT_LINKS
|
||||
if (parser->toknext < 1) {
|
||||
return JSMN_ERROR_INVAL;
|
||||
}
|
||||
token = &tokens[parser->toknext - 1];
|
||||
for (;;) {
|
||||
if (token->start != -1 && token->end == -1) {
|
||||
if (token->type != type) {
|
||||
return JSMN_ERROR_INVAL;
|
||||
}
|
||||
token->end = parser->pos + 1;
|
||||
parser->toksuper = token->parent;
|
||||
break;
|
||||
}
|
||||
if (token->parent == -1) {
|
||||
break;
|
||||
}
|
||||
token = &tokens[token->parent];
|
||||
}
|
||||
#else
|
||||
for (i = parser->toknext - 1; i >= 0; i--) {
|
||||
token = &tokens[i];
|
||||
if (token->start != -1 && token->end == -1) {
|
||||
if (token->type != type) {
|
||||
return JSMN_ERROR_INVAL;
|
||||
}
|
||||
parser->toksuper = -1;
|
||||
token->end = parser->pos + 1;
|
||||
break;
|
||||
}
|
||||
}
|
||||
/* Error if unmatched closing bracket */
|
||||
if (i == -1) return JSMN_ERROR_INVAL;
|
||||
for (; i >= 0; i--) {
|
||||
token = &tokens[i];
|
||||
if (token->start != -1 && token->end == -1) {
|
||||
parser->toksuper = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
break;
|
||||
case '\"':
|
||||
r = jsmn_parse_string(parser, js, len, tokens, num_tokens);
|
||||
if (r < 0) return r;
|
||||
count++;
|
||||
if (parser->toksuper != -1 && tokens != NULL)
|
||||
tokens[parser->toksuper].size++;
|
||||
break;
|
||||
case '\t' : case '\r' : case '\n' : case ' ':
|
||||
break;
|
||||
case ':':
|
||||
parser->toksuper = parser->toknext - 1;
|
||||
break;
|
||||
case ',':
|
||||
if (tokens != NULL && parser->toksuper != -1 &&
|
||||
tokens[parser->toksuper].type != JSMN_ARRAY &&
|
||||
tokens[parser->toksuper].type != JSMN_OBJECT) {
|
||||
#ifdef JSMN_PARENT_LINKS
|
||||
parser->toksuper = tokens[parser->toksuper].parent;
|
||||
#else
|
||||
for (i = parser->toknext - 1; i >= 0; i--) {
|
||||
if (tokens[i].type == JSMN_ARRAY || tokens[i].type == JSMN_OBJECT) {
|
||||
if (tokens[i].start != -1 && tokens[i].end == -1) {
|
||||
parser->toksuper = i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
}
|
||||
break;
|
||||
#ifdef JSMN_STRICT
|
||||
/* In strict mode primitives are: numbers and booleans */
|
||||
case '-': case '0': case '1' : case '2': case '3' : case '4':
|
||||
case '5': case '6': case '7' : case '8': case '9':
|
||||
case 't': case 'f': case 'n' :
|
||||
/* And they must not be keys of the object */
|
||||
if (tokens != NULL && parser->toksuper != -1) {
|
||||
jsmntok_t *t = &tokens[parser->toksuper];
|
||||
if (t->type == JSMN_OBJECT ||
|
||||
(t->type == JSMN_STRING && t->size != 0)) {
|
||||
return JSMN_ERROR_INVAL;
|
||||
}
|
||||
}
|
||||
#else
|
||||
/* In non-strict mode every unquoted value is a primitive */
|
||||
default:
|
||||
#endif
|
||||
r = jsmn_parse_primitive(parser, js, len, tokens, num_tokens);
|
||||
if (r < 0) return r;
|
||||
count++;
|
||||
if (parser->toksuper != -1 && tokens != NULL)
|
||||
tokens[parser->toksuper].size++;
|
||||
break;
|
||||
|
||||
#ifdef JSMN_STRICT
|
||||
/* Unexpected char in strict mode */
|
||||
default:
|
||||
return JSMN_ERROR_INVAL;
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
if (tokens != NULL) {
|
||||
for (i = parser->toknext - 1; i >= 0; i--) {
|
||||
/* Unmatched opened object or array */
|
||||
if (tokens[i].start != -1 && tokens[i].end == -1) {
|
||||
return JSMN_ERROR_PART;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return count;
|
||||
}
|
||||
|
||||
/**
|
||||
* Creates a new parser based over a given buffer with an array of tokens
|
||||
* available.
|
||||
*/
|
||||
void jsmn_init(jsmn_parser *parser) {
|
||||
parser->pos = 0;
|
||||
parser->toknext = 0;
|
||||
parser->toksuper = -1;
|
||||
}
|
||||
@ -1,178 +0,0 @@
|
||||
set(SRC libsodium/src/libsodium)
|
||||
# Derived from libsodium/src/libsodium/Makefile.am
|
||||
# (ignoring the !MINIMAL set)
|
||||
set(srcs
|
||||
"${SRC}/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c"
|
||||
"${SRC}/crypto_aead/xchacha20poly1305/sodium/aead_xchacha20poly1305.c"
|
||||
"${SRC}/crypto_auth/crypto_auth.c"
|
||||
"${SRC}/crypto_auth/hmacsha256/auth_hmacsha256.c"
|
||||
"${SRC}/crypto_auth/hmacsha512/auth_hmacsha512.c"
|
||||
"${SRC}/crypto_auth/hmacsha512256/auth_hmacsha512256.c"
|
||||
"${SRC}/crypto_box/crypto_box.c"
|
||||
"${SRC}/crypto_box/crypto_box_easy.c"
|
||||
"${SRC}/crypto_box/crypto_box_seal.c"
|
||||
"${SRC}/crypto_box/curve25519xchacha20poly1305/box_curve25519xchacha20poly1305.c"
|
||||
"${SRC}/crypto_box/curve25519xchacha20poly1305/box_seal_curve25519xchacha20poly1305.c"
|
||||
"${SRC}/crypto_box/curve25519xsalsa20poly1305/box_curve25519xsalsa20poly1305.c"
|
||||
"${SRC}/crypto_core/ed25519/core_ed25519.c"
|
||||
"${SRC}/crypto_core/ed25519/core_ristretto255.c"
|
||||
"${SRC}/crypto_core/ed25519/ref10/ed25519_ref10.c"
|
||||
"${SRC}/crypto_core/hchacha20/core_hchacha20.c"
|
||||
"${SRC}/crypto_core/hsalsa20/core_hsalsa20.c"
|
||||
"${SRC}/crypto_core/hsalsa20/ref2/core_hsalsa20_ref2.c"
|
||||
"${SRC}/crypto_core/salsa/ref/core_salsa_ref.c"
|
||||
"${SRC}/crypto_generichash/blake2b/generichash_blake2.c"
|
||||
"${SRC}/crypto_generichash/blake2b/ref/blake2b-compress-avx2.c"
|
||||
"${SRC}/crypto_generichash/blake2b/ref/blake2b-compress-ref.c"
|
||||
"${SRC}/crypto_generichash/blake2b/ref/blake2b-compress-ssse3.c"
|
||||
"${SRC}/crypto_generichash/blake2b/ref/blake2b-ref.c"
|
||||
"${SRC}/crypto_generichash/blake2b/ref/generichash_blake2b.c"
|
||||
"${SRC}/crypto_generichash/crypto_generichash.c"
|
||||
"${SRC}/crypto_hash/crypto_hash.c"
|
||||
"${SRC}/crypto_hash/sha256/cp/hash_sha256_cp.c"
|
||||
"${SRC}/crypto_hash/sha256/hash_sha256.c"
|
||||
"${SRC}/crypto_hash/sha512/cp/hash_sha512_cp.c"
|
||||
"${SRC}/crypto_hash/sha512/hash_sha512.c"
|
||||
"${SRC}/crypto_kdf/blake2b/kdf_blake2b.c"
|
||||
"${SRC}/crypto_kdf/crypto_kdf.c"
|
||||
"${SRC}/crypto_kx/crypto_kx.c"
|
||||
"${SRC}/crypto_onetimeauth/crypto_onetimeauth.c"
|
||||
"${SRC}/crypto_onetimeauth/poly1305/donna/poly1305_donna.c"
|
||||
"${SRC}/crypto_onetimeauth/poly1305/onetimeauth_poly1305.c"
|
||||
"${SRC}/crypto_pwhash/argon2/argon2-core.c"
|
||||
"${SRC}/crypto_pwhash/argon2/argon2-encoding.c"
|
||||
"${SRC}/crypto_pwhash/argon2/argon2-fill-block-avx2.c"
|
||||
"${SRC}/crypto_pwhash/argon2/argon2-fill-block-avx512f.c"
|
||||
"${SRC}/crypto_pwhash/argon2/argon2-fill-block-ref.c"
|
||||
"${SRC}/crypto_pwhash/argon2/argon2-fill-block-ssse3.c"
|
||||
"${SRC}/crypto_pwhash/argon2/argon2.c"
|
||||
"${SRC}/crypto_pwhash/argon2/blake2b-long.c"
|
||||
"${SRC}/crypto_pwhash/argon2/pwhash_argon2i.c"
|
||||
"${SRC}/crypto_pwhash/argon2/pwhash_argon2id.c"
|
||||
"${SRC}/crypto_pwhash/crypto_pwhash.c"
|
||||
"${SRC}/crypto_pwhash/scryptsalsa208sha256/crypto_scrypt-common.c"
|
||||
"${SRC}/crypto_pwhash/scryptsalsa208sha256/nosse/pwhash_scryptsalsa208sha256_nosse.c"
|
||||
"${SRC}/crypto_pwhash/scryptsalsa208sha256/pbkdf2-sha256.c"
|
||||
"${SRC}/crypto_pwhash/scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c"
|
||||
"${SRC}/crypto_pwhash/scryptsalsa208sha256/scrypt_platform.c"
|
||||
"${SRC}/crypto_scalarmult/crypto_scalarmult.c"
|
||||
"${SRC}/crypto_scalarmult/curve25519/ref10/x25519_ref10.c"
|
||||
"${SRC}/crypto_scalarmult/curve25519/sandy2x/consts.S"
|
||||
"${SRC}/crypto_scalarmult/curve25519/sandy2x/curve25519_sandy2x.c"
|
||||
"${SRC}/crypto_scalarmult/curve25519/sandy2x/fe51_invert.c"
|
||||
"${SRC}/crypto_scalarmult/curve25519/sandy2x/fe51_mul.S"
|
||||
"${SRC}/crypto_scalarmult/curve25519/sandy2x/fe51_nsquare.S"
|
||||
"${SRC}/crypto_scalarmult/curve25519/sandy2x/fe51_pack.S"
|
||||
"${SRC}/crypto_scalarmult/curve25519/sandy2x/fe_frombytes_sandy2x.c"
|
||||
"${SRC}/crypto_scalarmult/curve25519/sandy2x/ladder.S"
|
||||
"${SRC}/crypto_scalarmult/curve25519/sandy2x/sandy2x.S"
|
||||
"${SRC}/crypto_scalarmult/curve25519/scalarmult_curve25519.c"
|
||||
"${SRC}/crypto_scalarmult/ed25519/ref10/scalarmult_ed25519_ref10.c"
|
||||
"${SRC}/crypto_scalarmult/ristretto255/ref10/scalarmult_ristretto255_ref10.c"
|
||||
"${SRC}/crypto_secretbox/crypto_secretbox.c"
|
||||
"${SRC}/crypto_secretbox/crypto_secretbox_easy.c"
|
||||
"${SRC}/crypto_secretbox/xchacha20poly1305/secretbox_xchacha20poly1305.c"
|
||||
"${SRC}/crypto_secretbox/xsalsa20poly1305/secretbox_xsalsa20poly1305.c"
|
||||
"${SRC}/crypto_secretstream/xchacha20poly1305/secretstream_xchacha20poly1305.c"
|
||||
"${SRC}/crypto_shorthash/crypto_shorthash.c"
|
||||
"${SRC}/crypto_shorthash/siphash24/ref/shorthash_siphash24_ref.c"
|
||||
"${SRC}/crypto_shorthash/siphash24/ref/shorthash_siphashx24_ref.c"
|
||||
"${SRC}/crypto_shorthash/siphash24/shorthash_siphash24.c"
|
||||
"${SRC}/crypto_shorthash/siphash24/shorthash_siphashx24.c"
|
||||
"${SRC}/crypto_sign/crypto_sign.c"
|
||||
"${SRC}/crypto_sign/ed25519/ref10/keypair.c"
|
||||
"${SRC}/crypto_sign/ed25519/ref10/obsolete.c"
|
||||
"${SRC}/crypto_sign/ed25519/ref10/open.c"
|
||||
"${SRC}/crypto_sign/ed25519/ref10/sign.c"
|
||||
"${SRC}/crypto_sign/ed25519/sign_ed25519.c"
|
||||
"${SRC}/crypto_stream/chacha20/dolbeau/chacha20_dolbeau-avx2.c"
|
||||
"${SRC}/crypto_stream/chacha20/dolbeau/chacha20_dolbeau-ssse3.c"
|
||||
"${SRC}/crypto_stream/chacha20/ref/chacha20_ref.c"
|
||||
"${SRC}/crypto_stream/chacha20/stream_chacha20.c"
|
||||
"${SRC}/crypto_stream/crypto_stream.c"
|
||||
"${SRC}/crypto_stream/salsa20/ref/salsa20_ref.c"
|
||||
"${SRC}/crypto_stream/salsa20/stream_salsa20.c"
|
||||
"${SRC}/crypto_stream/salsa20/xmm6/salsa20_xmm6-asm.S"
|
||||
"${SRC}/crypto_stream/salsa20/xmm6/salsa20_xmm6.c"
|
||||
"${SRC}/crypto_stream/salsa20/xmm6int/salsa20_xmm6int-avx2.c"
|
||||
"${SRC}/crypto_stream/salsa20/xmm6int/salsa20_xmm6int-sse2.c"
|
||||
"${SRC}/crypto_stream/salsa2012/ref/stream_salsa2012_ref.c"
|
||||
"${SRC}/crypto_stream/salsa2012/stream_salsa2012.c"
|
||||
"${SRC}/crypto_stream/salsa208/ref/stream_salsa208_ref.c"
|
||||
"${SRC}/crypto_stream/salsa208/stream_salsa208.c"
|
||||
"${SRC}/crypto_stream/xchacha20/stream_xchacha20.c"
|
||||
"${SRC}/crypto_stream/xsalsa20/stream_xsalsa20.c"
|
||||
"${SRC}/crypto_verify/sodium/verify.c"
|
||||
"${SRC}/randombytes/randombytes.c"
|
||||
"${SRC}/sodium/codecs.c"
|
||||
"${SRC}/sodium/core.c"
|
||||
"${SRC}/sodium/runtime.c"
|
||||
"${SRC}/sodium/utils.c"
|
||||
"${SRC}/sodium/version.c"
|
||||
"port/randombytes_esp32.c")
|
||||
|
||||
if(CONFIG_LIBSODIUM_USE_MBEDTLS_SHA)
|
||||
list(APPEND srcs
|
||||
"port/crypto_hash_mbedtls/crypto_hash_sha256_mbedtls.c"
|
||||
"port/crypto_hash_mbedtls/crypto_hash_sha512_mbedtls.c")
|
||||
else()
|
||||
list(APPEND srcs
|
||||
"${SRC}/crypto_hash/sha256/cp/hash_sha256_cp.c"
|
||||
"${SRC}/crypto_hash/sha512/cp/hash_sha512_cp.c")
|
||||
endif()
|
||||
|
||||
set(include_dirs ${SRC}/include port_include)
|
||||
set(priv_include_dirs ${SRC}/include/sodium port_include/sodium port)
|
||||
idf_component_register(SRCS "${srcs}"
|
||||
INCLUDE_DIRS "${include_dirs}"
|
||||
PRIV_INCLUDE_DIRS "${priv_include_dirs}"
|
||||
REQUIRES mbedtls)
|
||||
|
||||
target_compile_definitions(${COMPONENT_LIB} PRIVATE
|
||||
CONFIGURED
|
||||
NATIVE_LITTLE_ENDIAN
|
||||
HAVE_WEAK_SYMBOLS
|
||||
__STDC_LIMIT_MACROS
|
||||
__STDC_CONSTANT_MACROS
|
||||
)
|
||||
|
||||
# patch around warnings in third-party files
|
||||
set_source_files_properties(
|
||||
${SRC}/crypto_pwhash/argon2/pwhash_argon2i.c
|
||||
${SRC}/crypto_pwhash/argon2/pwhash_argon2id.c
|
||||
${SRC}/crypto_pwhash/argon2/argon2-core.c
|
||||
${SRC}/crypto_pwhash/scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c
|
||||
PROPERTIES COMPILE_FLAGS
|
||||
-Wno-type-limits
|
||||
)
|
||||
set_source_files_properties(
|
||||
${SRC}/sodium/utils.c
|
||||
PROPERTIES COMPILE_FLAGS
|
||||
-Wno-unused-variable
|
||||
)
|
||||
set_source_files_properties(
|
||||
${SRC}/crypto_pwhash/argon2/argon2-fill-block-ref.c
|
||||
PROPERTIES COMPILE_FLAGS
|
||||
-Wno-unknown-pragmas
|
||||
)
|
||||
|
||||
# Temporary suppress "fallthrough" warnings until they are fixed in libsodium repo
|
||||
set_source_files_properties(
|
||||
${SRC}/crypto_shorthash/siphash24/ref/shorthash_siphashx24_ref.c
|
||||
${SRC}/crypto_shorthash/siphash24/ref/shorthash_siphash24_ref.c
|
||||
PROPERTIES COMPILE_FLAGS
|
||||
-Wno-implicit-fallthrough
|
||||
)
|
||||
|
||||
set_source_files_properties(
|
||||
${SRC}/randombytes/randombytes.c
|
||||
PROPERTIES COMPILE_FLAGS
|
||||
-DRANDOMBYTES_DEFAULT_IMPLEMENTATION
|
||||
)
|
||||
|
||||
target_compile_options(${COMPONENT_LIB} PRIVATE -Wno-unused-function)
|
||||
|
||||
if(CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_DISABLE)
|
||||
# some libsodium variables are only used for asserts
|
||||
target_compile_options(${COMPONENT_LIB} PRIVATE -Wno-unused-but-set-variable)
|
||||
endif()
|
||||
@ -1,15 +0,0 @@
|
||||
menu "libsodium"
|
||||
|
||||
config LIBSODIUM_USE_MBEDTLS_SHA
|
||||
bool "Use mbedTLS SHA256 & SHA512 implementations"
|
||||
default y
|
||||
depends on !MBEDTLS_HARDWARE_SHA
|
||||
help
|
||||
If this option is enabled, libsodium will use thin wrappers
|
||||
around mbedTLS for SHA256 & SHA512 operations.
|
||||
|
||||
This saves some code size if mbedTLS is also used. However it
|
||||
is incompatible with hardware SHA acceleration (due to the
|
||||
way libsodium's API manages SHA state).
|
||||
|
||||
endmenu # libsodium
|
||||
@ -1 +0,0 @@
|
||||
Subproject commit 4f5e89fa84ce1d178a6765b8b46f2b6f91216677
|
||||
@ -1,93 +0,0 @@
|
||||
/*
|
||||
* SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
#include "crypto_hash_sha256.h"
|
||||
#include "mbedtls/sha256.h"
|
||||
#include <string.h>
|
||||
|
||||
#ifdef MBEDTLS_SHA256_ALT
|
||||
/* Wrapper only works if the libsodium context structure can be mapped
|
||||
directly to the mbedTLS context structure.
|
||||
|
||||
See extended comments in crypto_hash_sha512_mbedtls.c
|
||||
*/
|
||||
#error "This wrapper only support standard software mbedTLS SHA"
|
||||
#endif
|
||||
|
||||
/* Sanity check that all the context fields have identical sizes
|
||||
(this should be more or less given from the SHA256 algorithm)
|
||||
|
||||
Note that the meaning of the fields is *not* all the same. In libsodium, SHA256 'count' is a 64-bit *bit* count. In
|
||||
mbedTLS, 'total' is a 2x32-bit *byte* count (count[0] == MSB).
|
||||
|
||||
For this implementation, we don't convert so the libsodium state structure actually holds a binary copy of the
|
||||
mbedTLS totals. This doesn't matter inside libsodium's documented API, but would matter if any callers try to use
|
||||
the state's bit count.
|
||||
*/
|
||||
_Static_assert(sizeof(((crypto_hash_sha256_state *)0)->state) == sizeof(((mbedtls_sha256_context *)0)->state), "state mismatch");
|
||||
_Static_assert(sizeof(((crypto_hash_sha256_state *)0)->count) == sizeof(((mbedtls_sha256_context *)0)->total), "count mismatch");
|
||||
_Static_assert(sizeof(((crypto_hash_sha256_state *)0)->buf) == sizeof(((mbedtls_sha256_context *)0)->buffer), "buf mismatch");
|
||||
|
||||
/* Inline functions to convert between mbedTLS & libsodium
|
||||
context structures
|
||||
*/
|
||||
|
||||
static void sha256_mbedtls_to_libsodium(crypto_hash_sha256_state *ls_state, const mbedtls_sha256_context *mb_ctx)
|
||||
{
|
||||
memcpy(&ls_state->count, mb_ctx->total, sizeof(ls_state->count));
|
||||
memcpy(ls_state->state, mb_ctx->state, sizeof(ls_state->state));
|
||||
memcpy(ls_state->buf, mb_ctx->buffer, sizeof(ls_state->buf));
|
||||
}
|
||||
|
||||
static void sha256_libsodium_to_mbedtls(mbedtls_sha256_context *mb_ctx, crypto_hash_sha256_state *ls_state)
|
||||
{
|
||||
memcpy(mb_ctx->total, &ls_state->count, sizeof(mb_ctx->total));
|
||||
memcpy(mb_ctx->state, ls_state->state, sizeof(mb_ctx->state));
|
||||
memcpy(mb_ctx->buffer, ls_state->buf, sizeof(mb_ctx->buffer));
|
||||
mb_ctx->is224 = 0;
|
||||
}
|
||||
|
||||
int
|
||||
crypto_hash_sha256_init(crypto_hash_sha256_state *state)
|
||||
{
|
||||
mbedtls_sha256_context ctx;
|
||||
mbedtls_sha256_init(&ctx);
|
||||
int ret = mbedtls_sha256_starts_ret(&ctx, 0);
|
||||
if (ret != 0) {
|
||||
return ret;
|
||||
}
|
||||
sha256_mbedtls_to_libsodium(state, &ctx);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
crypto_hash_sha256_update(crypto_hash_sha256_state *state,
|
||||
const unsigned char *in, unsigned long long inlen)
|
||||
{
|
||||
mbedtls_sha256_context ctx;
|
||||
sha256_libsodium_to_mbedtls(&ctx, state);
|
||||
int ret = mbedtls_sha256_update_ret(&ctx, in, inlen);
|
||||
if (ret != 0) {
|
||||
return ret;
|
||||
}
|
||||
sha256_mbedtls_to_libsodium(state, &ctx);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
crypto_hash_sha256_final(crypto_hash_sha256_state *state, unsigned char *out)
|
||||
{
|
||||
mbedtls_sha256_context ctx;
|
||||
sha256_libsodium_to_mbedtls(&ctx, state);
|
||||
return mbedtls_sha256_finish_ret(&ctx, out);
|
||||
}
|
||||
|
||||
int
|
||||
crypto_hash_sha256(unsigned char *out, const unsigned char *in,
|
||||
unsigned long long inlen)
|
||||
{
|
||||
return mbedtls_sha256_ret(in, inlen, out, 0);
|
||||
}
|
||||
@ -1,97 +0,0 @@
|
||||
/*
|
||||
* SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
#include "crypto_hash_sha512.h"
|
||||
#include "mbedtls/sha512.h"
|
||||
#include <string.h>
|
||||
|
||||
#ifdef MBEDTLS_SHA512_ALT
|
||||
/* Wrapper only works if the libsodium context structure can be mapped
|
||||
directly to the mbedTLS context structure.
|
||||
|
||||
For ESP32 hardware SHA, the problems are fitting all the data in
|
||||
the libsodium state structure, and also that libsodium doesn't
|
||||
have mbedtls_sha512_free() or mbedtls_sha512_clone() so we can't
|
||||
manage the hardware state in a clean way.
|
||||
*/
|
||||
#error "This wrapper only support standard software mbedTLS SHA"
|
||||
#endif
|
||||
|
||||
/* Sanity check that all the context fields have identical sizes
|
||||
(this should be more or less given from the SHA512 algorithm)
|
||||
|
||||
Note that the meaning of the fields is *not* all the same. In libsodium,
|
||||
SHA512 'count' is a 2xuin64_t *bit* count where count[0] == MSB. In mbedTLS,
|
||||
SHA512 'total' is a 2xuint64_t *byte* count where count[0] == LSB.
|
||||
|
||||
For this implementation, we don't convert so the libsodium state structure actually holds a binary copy of the
|
||||
mbedTLS totals. This doesn't matter inside libsodium's documented API, but would matter if any callers try to use
|
||||
the state's bit count.
|
||||
*/
|
||||
_Static_assert(sizeof(((crypto_hash_sha512_state *)0)->state) == sizeof(((mbedtls_sha512_context *)0)->state), "state mismatch");
|
||||
_Static_assert(sizeof(((crypto_hash_sha512_state *)0)->count) == sizeof(((mbedtls_sha512_context *)0)->total), "count mismatch");
|
||||
_Static_assert(sizeof(((crypto_hash_sha512_state *)0)->buf) == sizeof(((mbedtls_sha512_context *)0)->buffer), "buf mismatch");
|
||||
|
||||
/* Inline functions to convert between mbedTLS & libsodium
|
||||
context structures
|
||||
*/
|
||||
|
||||
static void sha512_mbedtls_to_libsodium(crypto_hash_sha512_state *ls_state, const mbedtls_sha512_context *mb_ctx)
|
||||
{
|
||||
memcpy(ls_state->count, mb_ctx->total, sizeof(ls_state->count));
|
||||
memcpy(ls_state->state, mb_ctx->state, sizeof(ls_state->state));
|
||||
memcpy(ls_state->buf, mb_ctx->buffer, sizeof(ls_state->buf));
|
||||
}
|
||||
|
||||
static void sha512_libsodium_to_mbedtls(mbedtls_sha512_context *mb_ctx, crypto_hash_sha512_state *ls_state)
|
||||
{
|
||||
memcpy(mb_ctx->total, ls_state->count, sizeof(mb_ctx->total));
|
||||
memcpy(mb_ctx->state, ls_state->state, sizeof(mb_ctx->state));
|
||||
memcpy(mb_ctx->buffer, ls_state->buf, sizeof(mb_ctx->buffer));
|
||||
mb_ctx->is384 = 0;
|
||||
}
|
||||
|
||||
int
|
||||
crypto_hash_sha512_init(crypto_hash_sha512_state *state)
|
||||
{
|
||||
mbedtls_sha512_context ctx;
|
||||
mbedtls_sha512_init(&ctx);
|
||||
int ret = mbedtls_sha512_starts_ret(&ctx, 0);
|
||||
if (ret != 0) {
|
||||
return ret;
|
||||
}
|
||||
sha512_mbedtls_to_libsodium(state, &ctx);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
crypto_hash_sha512_update(crypto_hash_sha512_state *state,
|
||||
const unsigned char *in, unsigned long long inlen)
|
||||
{
|
||||
mbedtls_sha512_context ctx;
|
||||
sha512_libsodium_to_mbedtls(&ctx, state);
|
||||
int ret = mbedtls_sha512_update_ret(&ctx, in, inlen);
|
||||
if (ret != 0) {
|
||||
return ret;
|
||||
}
|
||||
sha512_mbedtls_to_libsodium(state, &ctx);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
crypto_hash_sha512_final(crypto_hash_sha512_state *state, unsigned char *out)
|
||||
{
|
||||
mbedtls_sha512_context ctx;
|
||||
sha512_libsodium_to_mbedtls(&ctx, state);
|
||||
return mbedtls_sha512_finish_ret(&ctx, out);
|
||||
}
|
||||
|
||||
int
|
||||
crypto_hash_sha512(unsigned char *out, const unsigned char *in,
|
||||
unsigned long long inlen)
|
||||
{
|
||||
return mbedtls_sha512_ret(in, inlen, out, 0);
|
||||
}
|
||||
@ -1,28 +0,0 @@
|
||||
/*
|
||||
* SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
#include "randombytes_internal.h"
|
||||
#include "esp_system.h"
|
||||
|
||||
static const char *randombytes_esp32xx_implementation_name(void)
|
||||
{
|
||||
return CONFIG_IDF_TARGET;
|
||||
}
|
||||
|
||||
/*
|
||||
Plug the ESP32 hardware RNG into libsodium's custom RNG support, as per
|
||||
https://download.libsodium.org/doc/advanced/custom_rng.html
|
||||
|
||||
Note that this RNG is selected by default (see randombytes_default.h), so there
|
||||
is no need to call randombytes_set_implementation().
|
||||
*/
|
||||
const struct randombytes_implementation randombytes_esp32_implementation = {
|
||||
.implementation_name = randombytes_esp32xx_implementation_name,
|
||||
.random = esp_random,
|
||||
.stir = NULL,
|
||||
.uniform = NULL,
|
||||
.buf = esp_fill_random,
|
||||
.close = NULL,
|
||||
};
|
||||
@ -1,20 +0,0 @@
|
||||
/*
|
||||
* SPDX-FileCopyrightText: 2017-2021 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
# include "export.h"
|
||||
# include "randombytes.h"
|
||||
|
||||
SODIUM_EXPORT
|
||||
extern const struct randombytes_implementation randombytes_esp32_implementation;
|
||||
|
||||
/* Defining RANDOMBYTES_DEFAULT_IMPLEMENTATION here allows us to compile with the ESP32 hardware
|
||||
implementation as the default. No need to call randombytes_set_implementation().
|
||||
|
||||
Doing it in the header like this is easier than passing it via a -D argument to gcc.
|
||||
*/
|
||||
#undef RANDOMBYTES_DEFAULT_IMPLEMENTATION
|
||||
#define RANDOMBYTES_DEFAULT_IMPLEMENTATION &randombytes_esp32_implementation
|
||||
@ -1,40 +0,0 @@
|
||||
/*
|
||||
* SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
#ifndef sodium_version_H
|
||||
#define sodium_version_H
|
||||
|
||||
#include <sodium/export.h>
|
||||
|
||||
/* IMPORTANT: As we don't use autotools, these version are not automatically
|
||||
updated if we change submodules. They need to be changed manually.
|
||||
*/
|
||||
|
||||
#define SODIUM_VERSION_STRING "1.0.12-idf"
|
||||
|
||||
/* Note: these are not the same as the overall version, see
|
||||
configure.ac for the relevant macros */
|
||||
#define SODIUM_LIBRARY_VERSION_MAJOR 9
|
||||
#define SODIUM_LIBRARY_VERSION_MINOR 4
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
SODIUM_EXPORT
|
||||
const char *sodium_version_string(void);
|
||||
|
||||
SODIUM_EXPORT
|
||||
int sodium_library_version_major(void);
|
||||
|
||||
SODIUM_EXPORT
|
||||
int sodium_library_version_minor(void);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif
|
||||
@ -1,36 +0,0 @@
|
||||
if(TESTS_ALL EQUAL 1)
|
||||
message("not linking libsodium tests, use '-T libsodium' to test it")
|
||||
else()
|
||||
get_filename_component(LS_TESTDIR "${CMAKE_CURRENT_LIST_DIR}/../libsodium/test/default" ABSOLUTE)
|
||||
|
||||
set(TEST_CASES "chacha20;aead_chacha20poly1305;box;box2;ed25519_convert;sign;hash")
|
||||
|
||||
foreach(test_case ${TEST_CASES})
|
||||
file(GLOB test_case_file "${LS_TESTDIR}/${test_case}.c")
|
||||
list(APPEND TEST_CASES_FILES ${test_case_file})
|
||||
endforeach()
|
||||
|
||||
idf_component_register(SRCS "${TEST_CASES_FILES}" "test_sodium.c"
|
||||
PRIV_INCLUDE_DIRS "." "${LS_TESTDIR}/../quirks"
|
||||
PRIV_REQUIRES cmock libsodium)
|
||||
|
||||
# The libsodium test suite is designed to be run each test case as an executable on a desktop computer and uses
|
||||
# filesytem to write & then compare contents of each file.
|
||||
#
|
||||
# For now, use their "BROWSER_TEST" mode with these hacks so that
|
||||
# multiple test cases can be combined into one ELF file.
|
||||
#
|
||||
# Run each test case from test_sodium.c as CASENAME_xmain().
|
||||
foreach(test_case_file ${TEST_CASES_FILES})
|
||||
get_filename_component(test_case ${test_case_file} NAME_WE)
|
||||
set_source_files_properties(${test_case_file}
|
||||
PROPERTIES COMPILE_FLAGS
|
||||
# This would generate 'warning "main" redefined' warnings at runtime, which are
|
||||
# silenced here. Only other solution involves patching libsodium's cmptest.h.
|
||||
"-Dxmain=${test_case}_xmain -Dmain=${test_case}_main -Wp,-w")
|
||||
endforeach()
|
||||
|
||||
# this seems odd, but it prevents the libsodium test harness from
|
||||
# trying to write to a file!
|
||||
add_definitions(-DBROWSER_TESTS)
|
||||
endif()
|
||||
@ -1,124 +0,0 @@
|
||||
/*
|
||||
* SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
#include "unity.h"
|
||||
#include "sodium/crypto_hash_sha256.h"
|
||||
#include "sodium/crypto_hash_sha512.h"
|
||||
|
||||
/* Note: a lot of these libsodium test programs assert() things, but they're not complete unit tests - most expect
|
||||
output to be compared to the matching .exp file.
|
||||
|
||||
We don't do this automatically yet, maybe once we have more options for
|
||||
internal filesystem storage.
|
||||
*/
|
||||
|
||||
extern int aead_chacha20poly1305_xmain(void);
|
||||
|
||||
TEST_CASE("aead_chacha20poly1305 test vectors", "[libsodium]")
|
||||
{
|
||||
printf("Running aead_chacha20poly1305\n");
|
||||
TEST_ASSERT_EQUAL(0, aead_chacha20poly1305_xmain());
|
||||
}
|
||||
|
||||
extern int chacha20_xmain(void);
|
||||
|
||||
TEST_CASE("chacha20 test vectors", "[libsodium]")
|
||||
{
|
||||
printf("Running chacha20\n");
|
||||
TEST_ASSERT_EQUAL(0, chacha20_xmain());
|
||||
}
|
||||
|
||||
extern int box_xmain(void);
|
||||
extern int box2_xmain(void);
|
||||
|
||||
TEST_CASE("box tests", "[libsodium]")
|
||||
{
|
||||
printf("Running box\n");
|
||||
TEST_ASSERT_EQUAL(0, box_xmain());
|
||||
|
||||
printf("Running box2\n");
|
||||
TEST_ASSERT_EQUAL(0, box2_xmain());
|
||||
}
|
||||
|
||||
extern int ed25519_convert_xmain(void);
|
||||
|
||||
TEST_CASE("ed25519_convert tests", "[libsodium][timeout=60]")
|
||||
{
|
||||
printf("Running ed25519_convert\n");
|
||||
TEST_ASSERT_EQUAL(0, ed25519_convert_xmain() );
|
||||
}
|
||||
|
||||
extern int sign_xmain(void);
|
||||
|
||||
TEST_CASE("sign tests", "[libsodium]")
|
||||
{
|
||||
printf("Running sign\n");
|
||||
TEST_ASSERT_EQUAL(0, sign_xmain() );
|
||||
}
|
||||
|
||||
extern int hash_xmain(void);
|
||||
|
||||
TEST_CASE("hash tests", "[libsodium]")
|
||||
{
|
||||
printf("Running hash\n");
|
||||
TEST_ASSERT_EQUAL(0, hash_xmain() );
|
||||
}
|
||||
|
||||
TEST_CASE("sha256 sanity check", "[libsodium]")
|
||||
{
|
||||
const uint8_t expected[] = { 0xba, 0x78, 0x16, 0xbf, 0x8f, 0x01, 0xcf, 0xea, 0x41,
|
||||
0x41, 0x40, 0xde, 0x5d, 0xae, 0x22, 0x23, 0xb0, 0x03,
|
||||
0x61, 0xa3, 0x96, 0x17, 0x7a, 0x9c, 0xb4, 0x10, 0xff,
|
||||
0x61, 0xf2, 0x00, 0x15, 0xad, };
|
||||
uint8_t calculated[32];
|
||||
crypto_hash_sha256_state state;
|
||||
|
||||
const uint8_t *in = (const uint8_t *)"abc";
|
||||
const size_t inlen = 3;
|
||||
|
||||
// One-liner version
|
||||
crypto_hash_sha256(calculated, in, inlen);
|
||||
TEST_ASSERT_EQUAL(sizeof(calculated), sizeof(expected));
|
||||
TEST_ASSERT_EQUAL(sizeof(calculated), crypto_hash_sha256_bytes());
|
||||
TEST_ASSERT_EQUAL_MEMORY(expected, calculated, crypto_hash_sha256_bytes());
|
||||
|
||||
// Multi-line version
|
||||
crypto_hash_sha256_init(&state);
|
||||
crypto_hash_sha256_update(&state, in, inlen - 1); // split into two updates
|
||||
crypto_hash_sha256_update(&state, in + (inlen -1), 1);
|
||||
crypto_hash_sha256_final(&state, calculated);
|
||||
TEST_ASSERT_EQUAL_MEMORY(expected, calculated, crypto_hash_sha256_bytes());
|
||||
}
|
||||
|
||||
TEST_CASE("sha512 sanity check", "[libsodium]")
|
||||
{
|
||||
const uint8_t expected[] = { 0xdd, 0xaf, 0x35, 0xa1, 0x93, 0x61, 0x7a, 0xba, 0xcc,
|
||||
0x41, 0x73, 0x49, 0xae, 0x20, 0x41, 0x31, 0x12, 0xe6,
|
||||
0xfa, 0x4e, 0x89, 0xa9, 0x7e, 0xa2, 0x0a, 0x9e, 0xee,
|
||||
0xe6, 0x4b, 0x55, 0xd3, 0x9a, 0x21, 0x92, 0x99, 0x2a,
|
||||
0x27, 0x4f, 0xc1, 0xa8, 0x36, 0xba, 0x3c, 0x23, 0xa3,
|
||||
0xfe, 0xeb, 0xbd, 0x45, 0x4d, 0x44, 0x23, 0x64, 0x3c,
|
||||
0xe8, 0x0e, 0x2a, 0x9a, 0xc9, 0x4f, 0xa5, 0x4c, 0xa4,
|
||||
0x9f };
|
||||
|
||||
uint8_t calculated[64];
|
||||
crypto_hash_sha512_state state;
|
||||
|
||||
const uint8_t *in = (const uint8_t *)"abc";
|
||||
const size_t inlen = 3;
|
||||
|
||||
// One-liner version
|
||||
crypto_hash_sha512(calculated, in, inlen);
|
||||
TEST_ASSERT_EQUAL(sizeof(calculated), sizeof(expected));
|
||||
TEST_ASSERT_EQUAL(sizeof(calculated), crypto_hash_sha512_bytes());
|
||||
TEST_ASSERT_EQUAL_MEMORY(expected, calculated, crypto_hash_sha512_bytes());
|
||||
|
||||
// Multi-line version
|
||||
crypto_hash_sha512_init(&state);
|
||||
crypto_hash_sha512_update(&state, in, inlen - 1); // split into two updates
|
||||
crypto_hash_sha512_update(&state, in + (inlen -1), 1);
|
||||
crypto_hash_sha512_final(&state, calculated);
|
||||
TEST_ASSERT_EQUAL_MEMORY(expected, calculated, crypto_hash_sha512_bytes());
|
||||
}
|
||||
@ -7,7 +7,7 @@ set(TEST_CRTS "crts/server_cert_chain.pem"
|
||||
|
||||
idf_component_register(SRC_DIRS "."
|
||||
PRIV_INCLUDE_DIRS "."
|
||||
PRIV_REQUIRES cmock test_utils mbedtls libsodium
|
||||
PRIV_REQUIRES cmock test_utils mbedtls
|
||||
EMBED_TXTFILES ${TEST_CRTS})
|
||||
|
||||
|
||||
|
||||
@ -1,4 +1,11 @@
|
||||
/* mbedTLS SHA unit tests
|
||||
/*
|
||||
* SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
/*
|
||||
* mbedTLS SHA unit tests
|
||||
*/
|
||||
|
||||
#include <string.h>
|
||||
@ -14,7 +21,6 @@
|
||||
#include "unity.h"
|
||||
#include "sdkconfig.h"
|
||||
#include "test_apb_dport_access.h"
|
||||
#include "sodium/utils.h"
|
||||
#include "soc/soc_caps.h"
|
||||
|
||||
TEST_CASE("mbedtls SHA self-tests", "[mbedtls]")
|
||||
@ -478,6 +484,7 @@ TEST_CASE("mbedtls SHA512/t", "[mbedtls]")
|
||||
#endif //CONFIG_MBEDTLS_HARDWARE_SHA
|
||||
|
||||
#ifdef CONFIG_SPIRAM_USE_MALLOC
|
||||
#include "test_mbedtls_utils.h"
|
||||
TEST_CASE("mbedtls SHA256 PSRAM DMA", "[mbedtls]")
|
||||
{
|
||||
const unsigned CALLS = 256;
|
||||
@ -505,7 +512,7 @@ TEST_CASE("mbedtls SHA256 PSRAM DMA", "[mbedtls]")
|
||||
*/
|
||||
const char *expected_hash = "8d031167bd706ac337e07aa9129c34ae4ae792d0a79a2c70e7f012102e8adc3d";
|
||||
char hash_str[sizeof(sha256) * 2 + 1];
|
||||
sodium_bin2hex(hash_str, sizeof(hash_str), sha256, sizeof(sha256));
|
||||
utils_bin2hex(hash_str, sizeof(hash_str), sha256, sizeof(sha256));
|
||||
|
||||
TEST_ASSERT_EQUAL_STRING(expected_hash, hash_str);
|
||||
|
||||
|
||||
30
components/mbedtls/test/test_mbedtls_utils.c
Normal file
30
components/mbedtls/test/test_mbedtls_utils.c
Normal file
@ -0,0 +1,30 @@
|
||||
/*
|
||||
* SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdint.h>
|
||||
#include "test_mbedtls_utils.h"
|
||||
|
||||
static inline char to_hex_digit(unsigned val)
|
||||
{
|
||||
return (val < 10) ? ('0' + val) : ('a' + val - 10);
|
||||
}
|
||||
|
||||
|
||||
void utils_bin2hex(char *const hex, const size_t hex_maxlen, const unsigned char *const bin, const size_t bin_len)
|
||||
{
|
||||
assert(bin_len < SIZE_MAX / 2);
|
||||
assert(hex_maxlen > bin_len * 2U);
|
||||
assert(hex);
|
||||
assert(bin);
|
||||
|
||||
int i;
|
||||
for (i = 0; i < bin_len; i++) {
|
||||
hex[2*i] = to_hex_digit(bin[i] >> 4);
|
||||
hex[2*i + 1] = to_hex_digit(bin[i] & 0xf);
|
||||
}
|
||||
hex[i * 2U] = 0U;
|
||||
}
|
||||
9
components/mbedtls/test/test_mbedtls_utils.h
Normal file
9
components/mbedtls/test/test_mbedtls_utils.h
Normal file
@ -0,0 +1,9 @@
|
||||
/*
|
||||
* SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
#include <stddef.h>
|
||||
|
||||
void utils_bin2hex(char *const hex, const size_t hex_maxlen, const unsigned char *const bin, const size_t bin_len);
|
||||
@ -1,5 +1,12 @@
|
||||
/* mbedTLS SHA performance test
|
||||
*/
|
||||
/*
|
||||
* SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
/*
|
||||
* mbedTLS SHA performance test
|
||||
*/
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include <stdbool.h>
|
||||
@ -8,8 +15,8 @@
|
||||
#include "sdkconfig.h"
|
||||
#include "esp_heap_caps.h"
|
||||
#include "test_utils.h"
|
||||
#include "sodium/utils.h"
|
||||
#include "ccomp_timer.h"
|
||||
#include "test_mbedtls_utils.h"
|
||||
|
||||
TEST_CASE("mbedtls SHA performance", "[aes]")
|
||||
{
|
||||
@ -41,7 +48,7 @@ TEST_CASE("mbedtls SHA performance", "[aes]")
|
||||
*/
|
||||
const char *expected_hash = "c88df2638fb9699abaad05780fa5e0fdb6058f477069040eac8bed3231286275";
|
||||
char hash_str[sizeof(sha256) * 2 + 1];
|
||||
sodium_bin2hex(hash_str, sizeof(hash_str), sha256, sizeof(sha256));
|
||||
utils_bin2hex(hash_str, sizeof(hash_str), sha256, sizeof(sha256));
|
||||
|
||||
TEST_ASSERT_EQUAL_STRING(expected_hash, hash_str);
|
||||
|
||||
|
||||
@ -29,8 +29,6 @@ These third party libraries can be included into the application (firmware) prod
|
||||
|
||||
* `FreeBSD net80211`_ Copyright (c) 2004-2008 Sam Leffler, Errno Consulting and licensed under the BSD license.
|
||||
|
||||
* `JSMN`_ JSON Parser (components/jsmn) Copyright (c) 2010 Serge A. Zaitsev and licensed under the MIT license.
|
||||
|
||||
* `argtable3`_ argument parsing library Copyright (C) 1998-2001,2003-2011,2013 Stewart Heitmann and licensed under 3-clause BSD license.
|
||||
|
||||
* `linenoise`_ line editing library Copyright (c) 2010-2014 Salvatore Sanfilippo, Copyright (c) 2010-2013 Pieter Noordhuis, licensed under 2-clause BSD license.
|
||||
@ -43,8 +41,6 @@ These third party libraries can be included into the application (firmware) prod
|
||||
|
||||
* `cJSON`_ library, Copyright (c) 2009-2017 Dave Gamble and cJSON contributors, is licensed under MIT license as described in :component_file:`LICENSE file <json/cJSON/LICENSE>`.
|
||||
|
||||
* `libsodium`_ library, Copyright (c) 2013-2018 Frank Denis, is licensed under ISC license as described in :component_file:`LICENSE file <libsodium/libsodium/LICENSE>`.
|
||||
|
||||
* `micro-ecc`_ library, Copyright (c) 2014 Kenneth MacKay, is licensed under 2-clause BSD license.
|
||||
|
||||
* `nghttp2`_ library, Copyright (c) 2012, 2014, 2015, 2016 Tatsuhiro Tsujikawa, Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors, is licensed under MIT license as described in :component_file:`COPYING file <nghttp/nghttp2/COPYING>`.
|
||||
@ -53,8 +49,6 @@ These third party libraries can be included into the application (firmware) prod
|
||||
|
||||
* `SPIFFS`_ library, Copyright (c) 2013-2017 Peter Andersson, is licensed under MIT license as described in :component_file:`LICENSE file <spiffs/spiffs/LICENSE>`.
|
||||
|
||||
* `TinyCBOR`_ library, Copyright (c) 2017 Intel Corporation, is licensed under MIT License as described in :component_file:`LICENSE file <cbor/tinycbor/LICENSE>`.
|
||||
|
||||
* :component_file:`SD/MMC driver <sdmmc/sdmmc_cmd.c>` is derived from `OpenBSD SD/MMC driver`_, Copyright (c) 2006 Uwe Stuehler, and is licensed under BSD license.
|
||||
|
||||
* :component:`Asio <asio>`, Copyright (c) 2003-2018 Christopher M. Kohlhoff is licensed under the Boost Software License as described in :component_file:`COPYING file<asio/asio/asio/COPYING>`.
|
||||
@ -163,13 +157,11 @@ Copyright (C) 2011, ChaN, all right reserved.
|
||||
.. _wpa_supplicant: https://w1.fi/wpa_supplicant/
|
||||
.. _FreeBSD net80211: https://github.com/freebsd/freebsd/tree/master/sys/net80211
|
||||
.. _TJpgDec: http://elm-chan.org/fsw/tjpgd/00index.html
|
||||
.. _JSMN: https://zserge.com/jsmn.html
|
||||
.. _argtable3: https://github.com/argtable/argtable3
|
||||
.. _linenoise: https://github.com/antirez/linenoise
|
||||
.. _libcoap: https://github.com/obgm/libcoap
|
||||
.. _fatfs: http://elm-chan.org/fsw/ff/00index_e.html
|
||||
.. _cJSON: https://github.com/DaveGamble/cJSON
|
||||
.. _libsodium: https://github.com/jedisct1/libsodium
|
||||
.. _libexpat: https://github.com/libexpat/libexpat
|
||||
.. _micro-ecc: https://github.com/kmackay/micro-ecc
|
||||
.. _nghttp2: https://github.com/nghttp2/nghttp2
|
||||
@ -180,7 +172,6 @@ Copyright (C) 2011, ChaN, all right reserved.
|
||||
.. _mqtt: https://github.com/espressif/esp-mqtt
|
||||
.. _zephyr: https://github.com/zephyrproject-rtos/zephyr
|
||||
.. _mynewt-nimble: https://github.com/apache/mynewt-nimble
|
||||
.. _TinyCBOR: https://github.com/intel/tinycbor
|
||||
.. _ESP-IDF Programming Guide: https://docs.espressif.com/projects/esp-idf/en/latest/
|
||||
.. _sphinx_idf_theme: https://github.com/espressif/sphinx_idf_theme
|
||||
.. _sphinx_rtd_theme: https://github.com/readthedocs/sphinx_rtd_theme
|
||||
|
||||
@ -10,3 +10,4 @@ ESP-IDF 5.0 Migration Guides
|
||||
Build System <build-system>
|
||||
System <system>
|
||||
Ethernet <ethernet>
|
||||
Removed or deprecated components <removed-components>
|
||||
|
||||
16
docs/en/migration-guides/removed-components.rst
Normal file
16
docs/en/migration-guides/removed-components.rst
Normal file
@ -0,0 +1,16 @@
|
||||
Removed or deprecated components
|
||||
================================
|
||||
|
||||
Following components are removed from ESP-IDF and moved to `IDF Component Registry <https://components.espressif.com/>`_:
|
||||
|
||||
* `libsodium <https://components.espressif.com/component/espressif/libsodium>`_
|
||||
* `cbor <https://components.espressif.com/component/espressif/cbor>`_
|
||||
* `jsmn <https://components.espressif.com/component/espressif/jsmn>`_
|
||||
|
||||
These components can be installed using ``idf.py add-dependency`` command.
|
||||
|
||||
For example, to install libsodium component with exact version X.Y, run: ``idf.py add-dependency libsodium==X.Y``.
|
||||
|
||||
To install libsodium component with the latest version compatible to X.Y according to `semver <https://semver.org/>`_ rules, run: ``idf.py add-dependency libsodium~X.Y``.
|
||||
|
||||
To find out which versions of each component are available, open https://components.espressif.com, search for the component by its name and check the versions listed on the component page.
|
||||
@ -10,3 +10,4 @@ ESP-IDF 5.0 迁移指南
|
||||
构建系统 <build-system>
|
||||
系统 <system>
|
||||
以太网 <ethernet>
|
||||
Removed or deprecated components <removed-components>
|
||||
|
||||
1
docs/zh_CN/migration-guides/removed-components.rst
Normal file
1
docs/zh_CN/migration-guides/removed-components.rst
Normal file
@ -0,0 +1 @@
|
||||
.. include:: ../../en/migration-guides/removed-components.rst
|
||||
3
examples/protocols/cbor/main/idf_component.yml
Normal file
3
examples/protocols/cbor/main/idf_component.yml
Normal file
@ -0,0 +1,3 @@
|
||||
## IDF Component Manager Manifest File
|
||||
dependencies:
|
||||
espressif/cbor: "==0.5.4"
|
||||
@ -535,7 +535,6 @@ components/bt/host/nimble/port/include/esp_nimble_mem.h
|
||||
components/bt/host/nimble/port/src/esp_nimble_mem.c
|
||||
components/bt/test/test_bt_common.c
|
||||
components/bt/test/test_smp.c
|
||||
components/cbor/port/include/cbor.h
|
||||
components/coap/port/include/coap3/coap.h
|
||||
components/coap/port/include/coap_config.h
|
||||
components/coap/port/include/coap_config_posix.h
|
||||
@ -1391,8 +1390,6 @@ components/idf_test/include/esp32h2/idf_performance_target.h
|
||||
components/idf_test/include/esp32s2/idf_performance_target.h
|
||||
components/idf_test/include/esp32s3/idf_performance_target.h
|
||||
components/idf_test/include/idf_performance.h
|
||||
components/jsmn/include/jsmn.h
|
||||
components/jsmn/src/jsmn.c
|
||||
components/linux/include/sys/queue.h
|
||||
components/log/esp_log_private.h
|
||||
components/log/host_test/log_test/main/log_test.cpp
|
||||
@ -1518,9 +1515,7 @@ components/mbedtls/test/test_ecp.c
|
||||
components/mbedtls/test/test_esp_crt_bundle.c
|
||||
components/mbedtls/test/test_mbedtls.c
|
||||
components/mbedtls/test/test_mbedtls_mpi.c
|
||||
components/mbedtls/test/test_mbedtls_sha.c
|
||||
components/mbedtls/test/test_rsa.c
|
||||
components/mbedtls/test/test_sha_perf.c
|
||||
components/mdns/host_test/components/esp_event_mock/esp_event_mock.c
|
||||
components/mdns/host_test/components/esp_event_mock/include/esp_event.h
|
||||
components/mdns/host_test/components/esp_event_mock/include/esp_event_base.h
|
||||
@ -3137,8 +3132,6 @@ examples/protocols/asio/tcp_echo_server/asio_tcp_server_test.py
|
||||
examples/protocols/asio/tcp_echo_server/main/echo_server.cpp
|
||||
examples/protocols/asio/udp_echo_server/asio_udp_server_test.py
|
||||
examples/protocols/asio/udp_echo_server/main/udp_echo_server.cpp
|
||||
examples/protocols/cbor/example_test.py
|
||||
examples/protocols/cbor/main/cbor_example_main.c
|
||||
examples/protocols/coap_client/main/coap_client_example_main.c
|
||||
examples/protocols/coap_server/main/coap_server_example_main.c
|
||||
examples/protocols/esp_http_client/esp_http_client_test.py
|
||||
|
||||
@ -49,7 +49,6 @@ components/mbedtls/mbedtls/include/mbedtls/
|
||||
|
||||
components/coap/
|
||||
components/nghttp/
|
||||
components/cbor/
|
||||
|
||||
components/esp-tls/private_include/
|
||||
|
||||
@ -69,8 +68,6 @@ components/idf_test/include/idf_performance.h
|
||||
|
||||
components/json/cJSON/
|
||||
|
||||
components/libsodium/
|
||||
|
||||
components/spiffs/include/spiffs_config.h
|
||||
|
||||
components/unity/unity/src/unity_internals.h
|
||||
|
||||
@ -14,7 +14,6 @@ skip:
|
||||
- "components/bt/controller/lib_esp32c3_family"
|
||||
- "components/bt/host/nimble/nimble"
|
||||
- "components/bt/lib"
|
||||
- "components/cbor/tinycbor"
|
||||
- "components/cmock/CMock"
|
||||
- "components/coap"
|
||||
- "components/esp_phy/lib"
|
||||
@ -24,7 +23,6 @@ skip:
|
||||
- "components/expat/expat"
|
||||
- "components/ieee802154/lib"
|
||||
- "components/json/cJSON"
|
||||
- "components/libsodium/libsodium"
|
||||
- "components/lwip/lwip"
|
||||
- "components/mbedtls/mbedtls"
|
||||
- "components/mqtt/esp-mqtt"
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# This config is for all targets
|
||||
TEST_EXCLUDE_COMPONENTS=libsodium bt app_update test_utils
|
||||
TEST_EXCLUDE_COMPONENTS=bt app_update test_utils
|
||||
TEST_COMPONENTS=mbedtls
|
||||
CONFIG_MBEDTLS_HARDWARE_AES=n
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# This config is split between targets since different component needs to be excluded (esp32, esp32s2)
|
||||
CONFIG_IDF_TARGET="esp32"
|
||||
TEST_COMPONENTS=app_update
|
||||
TEST_EXCLUDE_COMPONENTS=libsodium bt
|
||||
TEST_EXCLUDE_COMPONENTS=bt
|
||||
CONFIG_UNITY_FREERTOS_STACK_SIZE=12288
|
||||
CONFIG_PARTITION_TABLE_CUSTOM=y
|
||||
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partition_table_unit_test_two_ota.csv"
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# This config is split between targets since different component needs to be excluded (esp32, esp32s2)
|
||||
CONFIG_IDF_TARGET="esp32c3"
|
||||
TEST_COMPONENTS=app_update
|
||||
TEST_EXCLUDE_COMPONENTS=libsodium bt
|
||||
TEST_EXCLUDE_COMPONENTS=bt
|
||||
CONFIG_UNITY_FREERTOS_STACK_SIZE=12288
|
||||
CONFIG_PARTITION_TABLE_CUSTOM=y
|
||||
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partition_table_unit_test_two_ota.csv"
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
# This config is split between targets since different component needs to be excluded (esp32, esp32s2)
|
||||
CONFIG_IDF_TARGET="esp32s2"
|
||||
TEST_COMPONENTS=app_update
|
||||
TEST_EXCLUDE_COMPONENTS=libsodium bt
|
||||
TEST_EXCLUDE_COMPONENTS=bt
|
||||
CONFIG_UNITY_FREERTOS_STACK_SIZE=12288
|
||||
CONFIG_PARTITION_TABLE_CUSTOM=y
|
||||
CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partition_table_unit_test_two_ota.csv"
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
# This config is split between targets since different component needs to be excluded (esp32, esp32s2)
|
||||
CONFIG_IDF_TARGET="esp32"
|
||||
TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp_hw_support esp_ipc esp_pm esp_system esp_timer driver heap pthread soc spi_flash vfs test_utils experimental_cpp_component esp-tls
|
||||
TEST_EXCLUDE_COMPONENTS=bt app_update freertos esp_hw_support esp_ipc esp_pm esp_system esp_timer driver heap pthread soc spi_flash vfs test_utils experimental_cpp_component esp-tls
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
# This config is split between targets since different component needs to be excluded (esp32, esp32s2)
|
||||
CONFIG_IDF_TARGET="esp32c3"
|
||||
TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp_hw_support esp_ipc esp_pm esp_system esp_timer driver heap pthread soc spi_flash vfs experimental_cpp_component ulp perfmon esp-tls test_utils
|
||||
TEST_EXCLUDE_COMPONENTS=bt app_update freertos esp_hw_support esp_ipc esp_pm esp_system esp_timer driver heap pthread soc spi_flash vfs experimental_cpp_component ulp perfmon esp-tls test_utils
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
# This config is split between targets since different component needs to be excluded (esp32, esp32s2)
|
||||
CONFIG_IDF_TARGET="esp32s2"
|
||||
TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp_hw_support esp_ipc esp_pm esp_system esp_timer driver heap pthread soc spi_flash vfs experimental_cpp_component esp-tls
|
||||
TEST_EXCLUDE_COMPONENTS=bt app_update freertos esp_hw_support esp_ipc esp_pm esp_system esp_timer driver heap pthread soc spi_flash vfs experimental_cpp_component esp-tls
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
# This config is split between targets since different component needs to be excluded (esp32, esp32s2)
|
||||
CONFIG_IDF_TARGET="esp32s3"
|
||||
TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp32s3 esp_ipc esp_pm esp_system esp_timer driver heap pthread soc spi_flash vfs experimental_cpp_component esp-tls test_utils
|
||||
TEST_EXCLUDE_COMPONENTS=bt app_update freertos esp32s3 esp_ipc esp_pm esp_system esp_timer driver heap pthread soc spi_flash vfs experimental_cpp_component esp-tls test_utils
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
# As this is protocol specific, only test for one target.
|
||||
CONFIG_IDF_TARGET="esp32"
|
||||
TEST_COMPONENTS=esp-tls
|
||||
TEST_EXCLUDE_COMPONENTS=libsodium bt
|
||||
TEST_EXCLUDE_COMPONENTS=bt
|
||||
CONFIG_ESP_TLS_SERVER=y
|
||||
|
||||
@ -1,4 +0,0 @@
|
||||
CONFIG_IDF_TARGET="esp32"
|
||||
TEST_COMPONENTS=libsodium
|
||||
TEST_EXCLUDE_COMPONENTS=bt app_update
|
||||
CONFIG_UNITY_FREERTOS_STACK_SIZE=12288
|
||||
@ -1,4 +0,0 @@
|
||||
CONFIG_IDF_TARGET="esp32c3"
|
||||
TEST_COMPONENTS=libsodium
|
||||
TEST_EXCLUDE_COMPONENTS=bt app_update
|
||||
CONFIG_UNITY_FREERTOS_STACK_SIZE=12288
|
||||
@ -1,6 +0,0 @@
|
||||
CONFIG_IDF_TARGET="esp32s2"
|
||||
TEST_COMPONENTS=libsodium
|
||||
TEST_EXCLUDE_COMPONENTS=bt app_update
|
||||
CONFIG_UNITY_FREERTOS_STACK_SIZE=12288
|
||||
CONFIG_COMPILER_OPTIMIZATION_SIZE=y
|
||||
CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
|
||||
@ -1,5 +1,5 @@
|
||||
CONFIG_IDF_TARGET="esp32"
|
||||
TEST_EXCLUDE_COMPONENTS=libsodium bt app_update driver esp_hw_support esp_ipc esp_pm esp_system esp_timer mbedtls spi_flash test_utils heap pthread soc experimental_cpp_component esp-tls freertos sdmmc
|
||||
TEST_EXCLUDE_COMPONENTS=bt app_update driver esp_hw_support esp_ipc esp_pm esp_system esp_timer mbedtls spi_flash test_utils heap pthread soc experimental_cpp_component esp-tls freertos sdmmc
|
||||
CONFIG_ESP32_SPIRAM_SUPPORT=y
|
||||
CONFIG_ESP_INT_WDT_TIMEOUT_MS=800
|
||||
CONFIG_SPIRAM_OCCUPY_NO_HOST=y
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# This config is split between targets since different component needs to be included (esp32, esp32s2)
|
||||
CONFIG_IDF_TARGET="esp32"
|
||||
TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp_hw_support esp_ipc esp_pm esp_system esp_timer driver heap pthread soc spi_flash vfs test_utils experimental_cpp_component esp-tls
|
||||
TEST_EXCLUDE_COMPONENTS=bt app_update freertos esp_hw_support esp_ipc esp_pm esp_system esp_timer driver heap pthread soc spi_flash vfs test_utils experimental_cpp_component esp-tls
|
||||
CONFIG_COMPILER_OPTIMIZATION_SIZE=y
|
||||
CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
|
||||
CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# This config is split between targets since different component needs to be excluded (esp32, esp32s2)
|
||||
CONFIG_IDF_TARGET="esp32s2"
|
||||
TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp_hw_support esp_ipc esp_pm esp_system esp_timer driver heap pthread soc spi_flash vfs test_utils experimental_cpp_component
|
||||
TEST_EXCLUDE_COMPONENTS=bt app_update freertos esp_hw_support esp_ipc esp_pm esp_system esp_timer driver heap pthread soc spi_flash vfs test_utils experimental_cpp_component
|
||||
CONFIG_COMPILER_OPTIMIZATION_SIZE=y
|
||||
CONFIG_BOOTLOADER_COMPILER_OPTIMIZATION_SIZE=y
|
||||
CONFIG_COMPILER_OPTIMIZATION_ASSERTIONS_SILENT=y
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# This config is split between targets since different component needs to be excluded (esp32, esp32s2)
|
||||
CONFIG_IDF_TARGET="esp32"
|
||||
TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp_hw_support esp_system esp_pm esp_ipc esp_timer driver heap pthread soc spi_flash vfs test_utils experimental_cpp_component esp-tls
|
||||
TEST_EXCLUDE_COMPONENTS=bt app_update freertos esp_hw_support esp_system esp_pm esp_ipc esp_timer driver heap pthread soc spi_flash vfs test_utils experimental_cpp_component esp-tls
|
||||
CONFIG_MEMMAP_SMP=n
|
||||
CONFIG_FREERTOS_UNICORE=y
|
||||
CONFIG_ESP32_RTCDATA_IN_FAST_MEM=y
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
# This config is split between targets since different component needs to be excluded (esp32, esp32s2)
|
||||
CONFIG_IDF_TARGET="esp32s2"
|
||||
TEST_EXCLUDE_COMPONENTS=libsodium bt app_update freertos esp_hw_support esp_ipc esp_system esp_pm esp_timer driver heap pthread soc spi_flash vfs experimental_cpp_component
|
||||
TEST_EXCLUDE_COMPONENTS=bt app_update freertos esp_hw_support esp_ipc esp_system esp_pm esp_timer driver heap pthread soc spi_flash vfs experimental_cpp_component
|
||||
CONFIG_MEMMAP_SMP=n
|
||||
CONFIG_FREERTOS_UNICORE=y
|
||||
CONFIG_ESP32S2_RTCDATA_IN_FAST_MEM=y
|
||||
|
||||
Loading…
Reference in New Issue
Block a user