From 514bca61f4c5b21ebf30856c543aff369e08766c Mon Sep 17 00:00:00 2001 From: yuanjm Date: Mon, 2 Mar 2020 14:46:45 +0800 Subject: [PATCH] feat(mbedtls): remove util algorithm and add them to esp8266 rom and mbedtls --- components/app_update/CMakeLists.txt | 3 +- components/app_update/esp_ota_ops.c | 2 +- components/bootloader/subproject/Makefile | 4 +- components/bootloader_support/CMakeLists.txt | 4 +- .../src/bootloader_common.c | 2 +- components/esp-wolfssl/CMakeLists.txt | 4 +- components/esp8266/CMakeLists.txt | 7 +- components/esp8266/component.mk | 3 +- .../{util => esp8266}/include/esp_crc.h | 0 .../{util => esp8266}/include/esp_sha.h | 0 .../{util => esp8266}/include/ibus_data.h | 0 .../{util => esp8266}/include/util_assert.h | 0 components/{util/src => esp8266/source}/crc.c | 2 +- components/esp8266/source/system_api.c | 2 +- components/mbedtls/CMakeLists.txt | 22 +- components/mbedtls/Kconfig | 71 + components/mbedtls/component.mk | 4 +- components/mbedtls/port/esp8266/aes.c | 1194 ++++++++++++++--- .../{util/src => mbedtls/port/esp8266}/arc4.c | 0 .../src => mbedtls/port/esp8266}/base64.c | 0 .../{util/src => mbedtls/port/esp8266}/md5.c | 2 +- components/mbedtls/port/esp8266/sha1.c | 203 ++- components/mbedtls/port/esp8266/sha256.c | 275 +++- components/mbedtls/port/esp8266/sha512.c | 325 ++++- components/mbedtls/port/esp_aes.c | 181 +++ components/mbedtls/port/esp_sha1.c | 68 + components/mbedtls/port/esp_sha256.c | 75 ++ components/mbedtls/port/esp_sha512.c | 75 ++ .../port/{esp8266 => }/include/aes_alt.h | 0 .../port/{esp8266 => }/include/arc4_alt.h | 0 .../port/include/esp8266}/esp_aes.h | 0 .../port/include/esp8266}/esp_arc4.h | 0 .../port/include/esp8266}/esp_base64.h | 0 .../port/include/esp8266}/esp_md5.h | 0 .../port/{esp8266 => }/include/md5_alt.h | 0 .../port/{esp8266 => }/include/sha1_alt.h | 0 .../port/{esp8266 => }/include/sha256_alt.h | 0 .../port/{esp8266 => }/include/sha512_alt.h | 0 components/{util => mbedtls}/test/test_aes.c | 0 components/{util => mbedtls}/test/test_arc4.c | 0 .../{util => mbedtls}/test/test_base64.c | 0 components/{util => mbedtls}/test/test_crc.c | 2 +- components/{util => mbedtls}/test/test_md5.c | 0 components/{util => mbedtls}/test/test_sha.c | 0 components/nvs_flash/CMakeLists.txt | 2 +- components/nvs_flash/component.mk | 2 +- components/nvs_flash/src/nvs_page.cpp | 4 - components/nvs_flash/src/nvs_types.cpp | 4 - components/util/CMakeLists.txt | 8 - components/util/Kconfig | 69 - components/util/component.mk | 11 - components/util/include/crc.h | 17 - components/util/src/aes.c | 1045 --------------- components/util/src/sha1.c | 165 --- components/util/src/sha256.c | 252 ---- components/util/src/sha512.c | 302 ----- components/util/test/component.mk | 5 - components/wpa_supplicant/CMakeLists.txt | 2 +- .../wifi/espnow/main/espnow_example_main.c | 2 +- tools/cmake/build.cmake | 2 +- 60 files changed, 2192 insertions(+), 2230 deletions(-) rename components/{util => esp8266}/include/esp_crc.h (100%) rename components/{util => esp8266}/include/esp_sha.h (100%) rename components/{util => esp8266}/include/ibus_data.h (100%) rename components/{util => esp8266}/include/util_assert.h (100%) rename components/{util/src => esp8266/source}/crc.c (99%) rename components/{util/src => mbedtls/port/esp8266}/arc4.c (100%) rename components/{util/src => mbedtls/port/esp8266}/base64.c (100%) rename components/{util/src => mbedtls/port/esp8266}/md5.c (98%) create mode 100644 components/mbedtls/port/esp_aes.c create mode 100644 components/mbedtls/port/esp_sha1.c create mode 100644 components/mbedtls/port/esp_sha256.c create mode 100644 components/mbedtls/port/esp_sha512.c rename components/mbedtls/port/{esp8266 => }/include/aes_alt.h (100%) rename components/mbedtls/port/{esp8266 => }/include/arc4_alt.h (100%) rename components/{util/include => mbedtls/port/include/esp8266}/esp_aes.h (100%) rename components/{util/include => mbedtls/port/include/esp8266}/esp_arc4.h (100%) rename components/{util/include => mbedtls/port/include/esp8266}/esp_base64.h (100%) rename components/{util/include => mbedtls/port/include/esp8266}/esp_md5.h (100%) rename components/mbedtls/port/{esp8266 => }/include/md5_alt.h (100%) rename components/mbedtls/port/{esp8266 => }/include/sha1_alt.h (100%) rename components/mbedtls/port/{esp8266 => }/include/sha256_alt.h (100%) rename components/mbedtls/port/{esp8266 => }/include/sha512_alt.h (100%) rename components/{util => mbedtls}/test/test_aes.c (100%) rename components/{util => mbedtls}/test/test_arc4.c (100%) rename components/{util => mbedtls}/test/test_base64.c (100%) rename components/{util => mbedtls}/test/test_crc.c (99%) rename components/{util => mbedtls}/test/test_md5.c (100%) rename components/{util => mbedtls}/test/test_sha.c (100%) delete mode 100644 components/util/CMakeLists.txt delete mode 100644 components/util/Kconfig delete mode 100644 components/util/component.mk delete mode 100644 components/util/include/crc.h delete mode 100644 components/util/src/aes.c delete mode 100644 components/util/src/sha1.c delete mode 100644 components/util/src/sha256.c delete mode 100644 components/util/src/sha512.c delete mode 100644 components/util/test/component.mk diff --git a/components/app_update/CMakeLists.txt b/components/app_update/CMakeLists.txt index bc40d5b9..ac1b668d 100644 --- a/components/app_update/CMakeLists.txt +++ b/components/app_update/CMakeLists.txt @@ -1,7 +1,6 @@ idf_component_register(SRCS "esp_ota_ops.c" INCLUDE_DIRS "include" - REQUIRES spi_flash partition_table bootloader_support - PRIV_REQUIRES util) + REQUIRES spi_flash partition_table bootloader_support) # esp_app_desc structure is added as an undefined symbol because otherwise the # linker will ignore this structure as it has no other files depending on it. diff --git a/components/app_update/esp_ota_ops.c b/components/app_update/esp_ota_ops.c index f0902c53..ba241b27 100644 --- a/components/app_update/esp_ota_ops.c +++ b/components/app_update/esp_ota_ops.c @@ -31,7 +31,7 @@ #include "esp_ota_ops.h" #include "sys/queue.h" -#include "crc.h" +#include "rom/crc.h" #include "esp_log.h" #ifdef CONFIG_IDF_TARGET_ESP8266 diff --git a/components/bootloader/subproject/Makefile b/components/bootloader/subproject/Makefile index c7879431..d05b8104 100644 --- a/components/bootloader/subproject/Makefile +++ b/components/bootloader/subproject/Makefile @@ -8,14 +8,14 @@ endif PROJECT_NAME := bootloader -COMPONENTS := esptool_py main bootloader_support spi_flash log esp8266 util +COMPONENTS := esptool_py main bootloader_support spi_flash log $(IDF_TARGET) # Clear C and CXX from top level project CFLAGS = CXXFLAGS = #We cannot include the esp8266 component directly but we need its includes. -CFLAGS += -I $(IDF_PATH)/components/esp8266/include -I $(IDF_PATH)/components/util/include +CFLAGS += -I $(IDF_PATH)/components/$(IDF_TARGET)/include -I $(IDF_PATH)/components/mbedtls/port/include/$(IDF_TARGET) CFLAGS += -I $(IDF_PATH)/components/esp_common/include # The bootloader pseudo-component is also included in this build, for its Kconfig.projbuild to be included. diff --git a/components/bootloader_support/CMakeLists.txt b/components/bootloader_support/CMakeLists.txt index eb10a5f3..574dfe7e 100644 --- a/components/bootloader_support/CMakeLists.txt +++ b/components/bootloader_support/CMakeLists.txt @@ -3,12 +3,12 @@ set(COMPONENT_SRCDIRS "src") if(${BOOTLOADER_BUILD}) set(COMPONENT_ADD_INCLUDEDIRS "include include_priv") set(COMPONENT_REQUIRES) - set(COMPONENT_PRIV_REQUIRES spi_flash util) + set(COMPONENT_PRIV_REQUIRES spi_flash) else() set(COMPONENT_ADD_INCLUDEDIRS "include") set(COMPONENT_PRIV_INCLUDEDIRS "include_priv") set(COMPONENT_REQUIRES) - set(COMPONENT_PRIV_REQUIRES spi_flash util mbedtls) + set(COMPONENT_PRIV_REQUIRES spi_flash mbedtls) endif() register_component() diff --git a/components/bootloader_support/src/bootloader_common.c b/components/bootloader_support/src/bootloader_common.c index 9794f617..5267a66f 100644 --- a/components/bootloader_support/src/bootloader_common.c +++ b/components/bootloader_support/src/bootloader_common.c @@ -169,7 +169,7 @@ bool bootloader_common_erase_part_type_data(const char *list_erase, bool ota_dat #include "esp_err.h" #include "esp_log.h" -#include "crc.h" +#include "rom/crc.h" #include "rom/gpio.h" diff --git a/components/esp-wolfssl/CMakeLists.txt b/components/esp-wolfssl/CMakeLists.txt index 6f9488af..ad01f57e 100644 --- a/components/esp-wolfssl/CMakeLists.txt +++ b/components/esp-wolfssl/CMakeLists.txt @@ -1,9 +1,9 @@ - +idf_build_get_property(target IDF_TARGET) if(CONFIG_ESP_WOLFSSL_INTERNAL) set(COMPONENT_ADD_INCLUDEDIRS wolfssl/include wolfssl/wolfssl wolfssl/wolfssl/wolfssl) set(COMPONENT_SRCDIRS "wolfssl/source") -set(COMPONENT_REQUIRES "lwip" "esp8266" "util") +set(COMPONENT_REQUIRES "lwip" "${target}") endif() register_component() diff --git a/components/esp8266/CMakeLists.txt b/components/esp8266/CMakeLists.txt index 09bdb5fc..9fb450d4 100644 --- a/components/esp8266/CMakeLists.txt +++ b/components/esp8266/CMakeLists.txt @@ -2,7 +2,7 @@ if(BOOTLOADER_BUILD) # For bootloader, all we need from esp8266 is headers set(COMPONENT_ADD_INCLUDEDIRS include) # set(COMPONENT_REQUIRES ${COMPONENTS}) - set(COMPONENT_SRCS source/ets_printf.c) + set(COMPONENT_SRCS source/ets_printf.c source/crc.c) register_component(esp8266) # as cmake won't attach linker args to a header-only library, attach @@ -29,6 +29,7 @@ else() "source/esp_wifi_os_adapter.c" "source/esp_wifi.c" "source/ets_printf.c" + "source/crc.c" "source/phy_init.c" "source/reset_reason.c" "source/startup.c" @@ -52,7 +53,7 @@ else() set(include_dirs "include" "include/driver") set(requires "esp_common" "esp_event") - set(priv_requires "wpa_supplicant" "log" "spi_flash" "tcpip_adapter" "esp_ringbuf" "bootloader_support" "nvs_flash" "util") + set(priv_requires "wpa_supplicant" "log" "spi_flash" "tcpip_adapter" "esp_ringbuf" "bootloader_support" "nvs_flash") set(fragments linker.lf ld/esp8266_fragments.lf ld/esp8266_bss_fragments.lf) idf_component_register(SRCS "${srcs}" @@ -63,7 +64,7 @@ else() REQUIRED_IDF_TARGETS esp8266) target_link_libraries(${COMPONENT_LIB} PUBLIC "-L ${CMAKE_CURRENT_SOURCE_DIR}/lib" "-lstdc++") - + target_compile_definitions(${COMPONENT_LIB} PUBLIC -DUSING_IBUS_FASTER_GET) if(NOT CONFIG_NO_BLOBS) set(blobs "gcc" "hal" "core" "net80211" "phy" "rtc" "clk" "pp" "smartconfig" "ssc" "wpa" "espnow" "wps" "wpa2") foreach(blob ${blobs}) diff --git a/components/esp8266/component.mk b/components/esp8266/component.mk index af8a1835..8dfad5f5 100644 --- a/components/esp8266/component.mk +++ b/components/esp8266/component.mk @@ -2,7 +2,7 @@ # Component Makefile # ifdef IS_BOOTLOADER_BUILD -COMPONENT_OBJS := source/ets_printf.o +COMPONENT_OBJS := source/ets_printf.o source/crc.o COMPONENT_SRCDIRS := source else COMPONENT_ADD_INCLUDEDIRS += include @@ -20,6 +20,7 @@ LIBS += gcc hal core_dbg net80211_dbg \ endif endif +CFLAGS += -DUSING_IBUS_FASTER_GET #Linker scripts used to link the final application. #Warning: These linker scripts are only used when the normal app is compiled; the bootloader #specifies its own scripts. diff --git a/components/util/include/esp_crc.h b/components/esp8266/include/esp_crc.h similarity index 100% rename from components/util/include/esp_crc.h rename to components/esp8266/include/esp_crc.h diff --git a/components/util/include/esp_sha.h b/components/esp8266/include/esp_sha.h similarity index 100% rename from components/util/include/esp_sha.h rename to components/esp8266/include/esp_sha.h diff --git a/components/util/include/ibus_data.h b/components/esp8266/include/ibus_data.h similarity index 100% rename from components/util/include/ibus_data.h rename to components/esp8266/include/ibus_data.h diff --git a/components/util/include/util_assert.h b/components/esp8266/include/util_assert.h similarity index 100% rename from components/util/include/util_assert.h rename to components/esp8266/include/util_assert.h diff --git a/components/util/src/crc.c b/components/esp8266/source/crc.c similarity index 99% rename from components/util/src/crc.c rename to components/esp8266/source/crc.c index 3108b643..e3ea8480 100644 --- a/components/util/src/crc.c +++ b/components/esp8266/source/crc.c @@ -14,7 +14,7 @@ #include -#include "crc.h" +#include "rom/crc.h" #include "ibus_data.h" static const uint32_t crc32_le_table[256] = { diff --git a/components/esp8266/source/system_api.c b/components/esp8266/source/system_api.c index c3c0402c..1e7ce27b 100644 --- a/components/esp8266/source/system_api.c +++ b/components/esp8266/source/system_api.c @@ -19,7 +19,7 @@ #include "esp_system.h" #include "internal/esp_system_internal.h" -#include "crc.h" +#include "rom/crc.h" #include "esp8266/eagle_soc.h" #include "esp8266/efuse_register.h" diff --git a/components/mbedtls/CMakeLists.txt b/components/mbedtls/CMakeLists.txt index 20133bea..988e3cb5 100644 --- a/components/mbedtls/CMakeLists.txt +++ b/components/mbedtls/CMakeLists.txt @@ -1,12 +1,13 @@ -idf_component_register(INCLUDE_DIRS "port/include" "port/esp8266/include" "mbedtls/include" - REQUIRES lwip util) +idf_build_get_property(target IDF_TARGET) +idf_component_register(INCLUDE_DIRS "port/include" "port/include/${target}" "mbedtls/include" + REQUIRES lwip) # Only build mbedtls libraries set(ENABLE_TESTING CACHE BOOL OFF) set(ENABLE_PROGRAMS CACHE BOOL OFF) # Needed to for include_next includes to work from within mbedtls -include_directories("${COMPONENT_DIR}/port/include" "${COMPONENT_DIR}/port/esp8266/include") +include_directories("${COMPONENT_DIR}/port/include" "${COMPONENT_DIR}/port/include/${target}") # Import mbedtls library targets add_subdirectory(mbedtls) @@ -25,10 +26,17 @@ target_sources(mbedtls PRIVATE "${COMPONENT_DIR}/port/mbedtls_debug.c" target_sources(mbedcrypto PRIVATE "${COMPONENT_DIR}/port/esp_hardware.c" "${COMPONENT_DIR}/port/esp_mem.c" "${COMPONENT_DIR}/port/esp_timing.c" - "${COMPONENT_DIR}/port/esp8266/aes.c" - "${COMPONENT_DIR}/port/esp8266/sha1.c" - "${COMPONENT_DIR}/port/esp8266/sha256.c" - "${COMPONENT_DIR}/port/esp8266/sha512.c") + "${COMPONENT_DIR}/port/esp_aes.c" + "${COMPONENT_DIR}/port/esp_sha1.c" + "${COMPONENT_DIR}/port/esp_sha256.c" + "${COMPONENT_DIR}/port/esp_sha512.c" + "${COMPONENT_DIR}/port/${target}/aes.c" + "${COMPONENT_DIR}/port/${target}/arc4.c" + "${COMPONENT_DIR}/port/${target}/base64.c" + "${COMPONENT_DIR}/port/${target}/md5.c" + "${COMPONENT_DIR}/port/${target}/sha1.c" + "${COMPONENT_DIR}/port/${target}/sha256.c" + "${COMPONENT_DIR}/port/${target}/sha512.c") foreach(target ${mbedtls_targets}) target_compile_definitions(${target} PUBLIC -DMBEDTLS_CONFIG_FILE="mbedtls/esp_config.h" -DCONFIG_SSL_USING_MBEDTLS) diff --git a/components/mbedtls/Kconfig b/components/mbedtls/Kconfig index 1ebc60fe..0d37fa96 100644 --- a/components/mbedtls/Kconfig +++ b/components/mbedtls/Kconfig @@ -552,4 +552,75 @@ menu "mbedTLS" # end of Elliptic Curve options + menu "Util" + + config util_assert + bool "Enable assert for util components" + default n + help + Enable this option, util components will use assert to check if input + parameters are correct. + + Disable this option will speed up the process of some calculation a lot. + + config ESP_SHA + bool "Enable Espressif SHA" + default n + help + Enable Espressif SHA1, SHA256, SHA384 & SHA512 for other components to + save code size for ESP8285(ESP8266 + 1MB flash) users. + + Although this option is disable, bootloader will use it if booloader + is configured to use SHA256 to check hash. + + Disabling the "assert" function at menuconfig can speed up the calculation. + + config ESP_AES + bool "Enable Espressif AES" + default y + help + Enable Espressif AES ECB, CBC, CFB128, CFB8 & CRT for other components to + speed up process speed and save code size. + + ESP8285 is like ESP8266 + 1MB flash, but its internal I/O connection from CPU + core to flash is DIO not QIO, which makes it read flash data slower. + So the function will speed up ESP8285 obviously. + + The calculation uses "ibus_data" to speed up load data from instruction bus. + + Disabling the "assert" function at menuconfig can speed up the calculation. + + config ESP_MD5 + bool "Enable Espressif MD5" + default y + help + Enable Espressif MD5 for other components to + speed up process speed and save code size. + + ESP8285 is like ESP8266 + 1MB flash, but its internal I/O connection from CPU + core to flash is DIO not QIO, which makes it read flash data slower. + So the function will speed up ESP8285 obviously. + + The calculation uses "ibus_data" to speed up load data from instruction bus. + + Disabling the "assert" function at menuconfig can speed up the calculation. + + config ESP_ARC4 + bool "Enable Espressif ARC4" + default y + help + Enable Espressif ARC4 for other components to + speed up process speed and save code size. + + ESP8285 is like ESP8266 + 1MB flash, but its internal I/O connection from CPU + core to flash is DIO not QIO, which makes it read flash data slower. + So the function will speed up ESP8285 obviously. + + The calculation uses "ibus_data" to speed up load data from instruction bus. + + Disabling the "assert" function at menuconfig can speed up the calculation. + + endmenu # Util + + endmenu # mbedTLS diff --git a/components/mbedtls/component.mk b/components/mbedtls/component.mk index e6551fb6..5b7b46e5 100644 --- a/components/mbedtls/component.mk +++ b/components/mbedtls/component.mk @@ -2,9 +2,9 @@ # Component Makefile # -COMPONENT_ADD_INCLUDEDIRS := port/include mbedtls/include port/esp8266/include +COMPONENT_ADD_INCLUDEDIRS := port/include mbedtls/include port/include/$(IDF_TARGET) -COMPONENT_SRCDIRS := mbedtls/library port port/esp8266 +COMPONENT_SRCDIRS := mbedtls/library port port/$(IDF_TARGET) COMPONENT_OBJEXCLUDE := mbedtls/library/net_sockets.o diff --git a/components/mbedtls/port/esp8266/aes.c b/components/mbedtls/port/esp8266/aes.c index 5ba2e283..d82bc141 100644 --- a/components/mbedtls/port/esp8266/aes.c +++ b/components/mbedtls/port/esp8266/aes.c @@ -1,181 +1,1045 @@ -/** - * \brief AES block cipher, ESP8266 accelerated version - * Based on mbedTLS FIPS-197 compliant version. - * - * Copyright (C) 2006-2015, ARM Limited, All Rights Reserved - * Additions Copyright (C) 2016-2017, Espressif Systems (Shanghai) PTE Ltd - * SPDX-License-Identifier: Apache-2.0 - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ +// Copyright 2018-2019 Espressif Systems (Shanghai) PTE LTD +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +#include #include -#include "mbedtls/aes.h" +#include "esp_aes.h" +#include "ibus_data.h" +#include "util_assert.h" -#if defined(MBEDTLS_AES_ALT) - -void mbedtls_aes_init(mbedtls_aes_context *ctx) -{ - memset(ctx, 0, sizeof(mbedtls_aes_context)); -} - -void mbedtls_aes_free(mbedtls_aes_context *ctx) -{ - memset(ctx, 0, sizeof(mbedtls_aes_context)); -} - -#if defined(MBEDTLS_CIPHER_MODE_XTS) -void mbedtls_aes_xts_init(mbedtls_aes_xts_context *ctx) -{ - memset(ctx, 0, sizeof(mbedtls_aes_xts_context)); -} - -void mbedtls_aes_xts_free(mbedtls_aes_xts_context *ctx) -{ - memset(ctx, 0, sizeof(mbedtls_aes_xts_context)); -} - -int mbedtls_aes_xts_setkey_enc(mbedtls_aes_xts_context *ctx, - const unsigned char *key, - unsigned int keybits) -{ - return esp_aes_xts_set_encrypt_key(ctx, key, keybits); -} - -int mbedtls_aes_xts_setkey_dec(mbedtls_aes_xts_context *ctx, - const unsigned char *key, - unsigned int keybits) -{ - return esp_aes_xts_set_decrypt_key(ctx, key, keybits); -} - -int mbedtls_aes_crypt_xts(mbedtls_aes_xts_context *ctx, - int mode, - size_t length, - const unsigned char data_unit[16], - const unsigned char *input, - unsigned char *output) -{ - return esp_aes_crypt_xts(ctx, MBEDTLS_AES_ENCRYPT == mode, length, data_unit, input, output); +/* + * 32-bit integer manipulation macros (little endian) + */ +#ifndef GET_UINT32_LE +#define GET_UINT32_LE(n, b, i) \ +{ \ + (n) = ((uint32_t)(b)[(i) + 0] << 0) \ + | ((uint32_t)(b)[(i) + 1] << 8) \ + | ((uint32_t)(b)[(i) + 2] << 16) \ + | ((uint32_t)(b)[(i) + 3] << 24); \ } #endif -int mbedtls_aes_setkey_enc(mbedtls_aes_context *ctx, const unsigned char *key, - unsigned int keybits) -{ - return esp_aes_set_encrypt_key(ctx, key, keybits); -} - -int mbedtls_aes_setkey_dec(mbedtls_aes_context *ctx, const unsigned char *key, - unsigned int keybits) -{ - return esp_aes_set_decrypt_key(ctx, key, keybits); -} - -int mbedtls_aes_crypt_ecb(mbedtls_aes_context *ctx, - int mode, - const unsigned char input[16], - unsigned char output[16]) -{ - if (MBEDTLS_AES_DECRYPT == mode) - return esp_aes_decrypt_ecb(ctx, input, output); - else - return esp_aes_encrypt_ecb(ctx, input, output); -} - -#if defined(MBEDTLS_CIPHER_MODE_CBC) -int mbedtls_aes_crypt_cbc(mbedtls_aes_context *ctx, - int mode, - size_t length, - unsigned char iv[16], - const unsigned char *input, - unsigned char *output) -{ - if (MBEDTLS_AES_DECRYPT == mode) - return esp_aes_decrypt_cbc(ctx, input, length, output, length, iv); - else - return esp_aes_encrypt_cbc(ctx, input, length, output, length, iv); +#ifndef PUT_UINT32_LE +#define PUT_UINT32_LE(n, b, i) \ +{ \ + (b)[(i) + 0] = (uint8_t)(((n) >> 0) & 0xFF); \ + (b)[(i) + 1] = (uint8_t)(((n) >> 8) & 0xFF); \ + (b)[(i) + 2] = (uint8_t)(((n) >> 16) & 0xFF); \ + (b)[(i) + 3] = (uint8_t)(((n) >> 24) & 0xFF); \ } #endif -#if defined(MBEDTLS_CIPHER_MODE_CFB) -int mbedtls_aes_crypt_cfb128(mbedtls_aes_context *ctx, - int mode, - size_t length, - size_t *iv_off, - unsigned char iv[16], - const unsigned char *input, - unsigned char *output) -{ - if (MBEDTLS_AES_DECRYPT == mode) - return esp_aes_decrypt_cfb128(ctx, input, length, output, length, iv, iv_off); - else - return esp_aes_encrypt_cfb128(ctx, input, length, output, length, iv, iv_off); +#undef AES_FROUND +#define AES_FROUND(X0,X1,X2,X3,Y0,Y1,Y2,Y3) \ +{ \ + X0 = *RK++ ^ s_aes_ft0[(Y0 >> 0) & 0xFF] \ + ^ s_aes_ft1[(Y1 >> 8) & 0xFF] \ + ^ s_aes_ft2[(Y2 >> 16) & 0xFF] \ + ^ s_aes_ft3[(Y3 >> 24) & 0xFF]; \ + \ + X1 = *RK++ ^ s_aes_ft0[(Y1 >> 0) & 0xFF] \ + ^ s_aes_ft1[(Y2 >> 8) & 0xFF] \ + ^ s_aes_ft2[(Y3 >> 16) & 0xFF] \ + ^ s_aes_ft3[(Y0 >> 24) & 0xFF]; \ + \ + X2 = *RK++ ^ s_aes_ft0[(Y2 >> 0) & 0xFF] \ + ^ s_aes_ft1[(Y3 >> 8) & 0xFF] \ + ^ s_aes_ft2[(Y0 >> 16) & 0xFF] \ + ^ s_aes_ft3[(Y1 >> 24) & 0xFF]; \ + \ + X3 = *RK++ ^ s_aes_ft0[(Y3 >> 0) & 0xFF] \ + ^ s_aes_ft1[(Y0 >> 8) & 0xFF] \ + ^ s_aes_ft2[(Y1 >> 16) & 0xFF] \ + ^ s_aes_ft3[(Y2 >> 24) & 0xFF]; \ } -int mbedtls_aes_crypt_cfb8(mbedtls_aes_context *ctx, - int mode, - size_t length, - unsigned char iv[16], - const unsigned char *input, - unsigned char *output) -{ - if (MBEDTLS_AES_DECRYPT == mode) - return esp_aes_decrypt_cfb8(ctx, input, length, output, length, iv); - else - return esp_aes_encrypt_cfb8(ctx, input, length, output, length, iv); -} -#endif - -#if defined(MBEDTLS_CIPHER_MODE_OFB) -int mbedtls_aes_crypt_ofb(mbedtls_aes_context *ctx, - size_t length, - size_t *iv_off, - unsigned char iv[16], - const unsigned char *input, - unsigned char *output) -{ - return esp_aes_crypt_ofb(ctx, length, iv_off, iv, input, output); -} -#endif - -#if defined(MBEDTLS_CIPHER_MODE_CTR) -int mbedtls_aes_crypt_ctr(mbedtls_aes_context *ctx, - size_t length, - size_t *nc_off, - unsigned char nonce_counter[16], - unsigned char stream_block[16], - const unsigned char *input, - unsigned char *output) -{ - return esp_aes_encrypt_ctr(ctx, nc_off, nonce_counter, stream_block, input, - length, output, length); -} -#endif - -int mbedtls_internal_aes_encrypt(mbedtls_aes_context *ctx, - const unsigned char input[16], - unsigned char output[16]) -{ - return esp_aes_encrypt(ctx, input, 16, output, 16); +#undef AES_RROUND +#define AES_RROUND(X0,X1,X2,X3,Y0,Y1,Y2,Y3) \ +{ \ + X0 = *RK++ ^ s_aes_rt0[(Y0 >> 0) & 0xFF] \ + ^ s_aes_rt1[(Y3 >> 8) & 0xFF] \ + ^ s_aes_rt2[(Y2 >> 16) & 0xFF] \ + ^ s_aes_rt3[(Y1 >> 24) & 0xFF]; \ + \ + X1 = *RK++ ^ s_aes_rt0[(Y1 >> 0) & 0xFF] \ + ^ s_aes_rt1[(Y0 >> 8) & 0xFF] \ + ^ s_aes_rt2[(Y3 >> 16) & 0xFF] \ + ^ s_aes_rt3[(Y2 >> 24) & 0xFF]; \ + \ + X2 = *RK++ ^ s_aes_rt0[(Y2 >> 0) & 0xFF] \ + ^ s_aes_rt1[(Y1 >> 8) & 0xFF] \ + ^ s_aes_rt2[(Y0 >> 16) & 0xFF] \ + ^ s_aes_rt3[(Y3 >> 24) & 0xFF]; \ + \ + X3 = *RK++ ^ s_aes_rt0[(Y3 >> 0) & 0xFF] \ + ^ s_aes_rt1[(Y2 >> 8) & 0xFF] \ + ^ s_aes_rt2[(Y1 >> 16) & 0xFF] \ + ^ s_aes_rt3[(Y0 >> 24) & 0xFF]; \ } -int mbedtls_internal_aes_decrypt(mbedtls_aes_context *ctx, - const unsigned char input[16], - unsigned char output[16]) +/* + * Forward S-box + */ +static const uint8_t s_aes_fsb[256] ESP_IBUS_ATTR = { - return esp_aes_decrypt(ctx, input, 16, output, 16); + 0x63, 0x7C, 0x77, 0x7B, 0xF2, 0x6B, 0x6F, 0xC5, + 0x30, 0x01, 0x67, 0x2B, 0xFE, 0xD7, 0xAB, 0x76, + 0xCA, 0x82, 0xC9, 0x7D, 0xFA, 0x59, 0x47, 0xF0, + 0xAD, 0xD4, 0xA2, 0xAF, 0x9C, 0xA4, 0x72, 0xC0, + 0xB7, 0xFD, 0x93, 0x26, 0x36, 0x3F, 0xF7, 0xCC, + 0x34, 0xA5, 0xE5, 0xF1, 0x71, 0xD8, 0x31, 0x15, + 0x04, 0xC7, 0x23, 0xC3, 0x18, 0x96, 0x05, 0x9A, + 0x07, 0x12, 0x80, 0xE2, 0xEB, 0x27, 0xB2, 0x75, + 0x09, 0x83, 0x2C, 0x1A, 0x1B, 0x6E, 0x5A, 0xA0, + 0x52, 0x3B, 0xD6, 0xB3, 0x29, 0xE3, 0x2F, 0x84, + 0x53, 0xD1, 0x00, 0xED, 0x20, 0xFC, 0xB1, 0x5B, + 0x6A, 0xCB, 0xBE, 0x39, 0x4A, 0x4C, 0x58, 0xCF, + 0xD0, 0xEF, 0xAA, 0xFB, 0x43, 0x4D, 0x33, 0x85, + 0x45, 0xF9, 0x02, 0x7F, 0x50, 0x3C, 0x9F, 0xA8, + 0x51, 0xA3, 0x40, 0x8F, 0x92, 0x9D, 0x38, 0xF5, + 0xBC, 0xB6, 0xDA, 0x21, 0x10, 0xFF, 0xF3, 0xD2, + 0xCD, 0x0C, 0x13, 0xEC, 0x5F, 0x97, 0x44, 0x17, + 0xC4, 0xA7, 0x7E, 0x3D, 0x64, 0x5D, 0x19, 0x73, + 0x60, 0x81, 0x4F, 0xDC, 0x22, 0x2A, 0x90, 0x88, + 0x46, 0xEE, 0xB8, 0x14, 0xDE, 0x5E, 0x0B, 0xDB, + 0xE0, 0x32, 0x3A, 0x0A, 0x49, 0x06, 0x24, 0x5C, + 0xC2, 0xD3, 0xAC, 0x62, 0x91, 0x95, 0xE4, 0x79, + 0xE7, 0xC8, 0x37, 0x6D, 0x8D, 0xD5, 0x4E, 0xA9, + 0x6C, 0x56, 0xF4, 0xEA, 0x65, 0x7A, 0xAE, 0x08, + 0xBA, 0x78, 0x25, 0x2E, 0x1C, 0xA6, 0xB4, 0xC6, + 0xE8, 0xDD, 0x74, 0x1F, 0x4B, 0xBD, 0x8B, 0x8A, + 0x70, 0x3E, 0xB5, 0x66, 0x48, 0x03, 0xF6, 0x0E, + 0x61, 0x35, 0x57, 0xB9, 0x86, 0xC1, 0x1D, 0x9E, + 0xE1, 0xF8, 0x98, 0x11, 0x69, 0xD9, 0x8E, 0x94, + 0x9B, 0x1E, 0x87, 0xE9, 0xCE, 0x55, 0x28, 0xDF, + 0x8C, 0xA1, 0x89, 0x0D, 0xBF, 0xE6, 0x42, 0x68, + 0x41, 0x99, 0x2D, 0x0F, 0xB0, 0x54, 0xBB, 0x16 +}; + +/* + * Forward tables + */ +#define FT \ +\ + V(A5,63,63,C6), V(84,7C,7C,F8), V(99,77,77,EE), V(8D,7B,7B,F6), \ + V(0D,F2,F2,FF), V(BD,6B,6B,D6), V(B1,6F,6F,DE), V(54,C5,C5,91), \ + V(50,30,30,60), V(03,01,01,02), V(A9,67,67,CE), V(7D,2B,2B,56), \ + V(19,FE,FE,E7), V(62,D7,D7,B5), V(E6,AB,AB,4D), V(9A,76,76,EC), \ + V(45,CA,CA,8F), V(9D,82,82,1F), V(40,C9,C9,89), V(87,7D,7D,FA), \ + V(15,FA,FA,EF), V(EB,59,59,B2), V(C9,47,47,8E), V(0B,F0,F0,FB), \ + V(EC,AD,AD,41), V(67,D4,D4,B3), V(FD,A2,A2,5F), V(EA,AF,AF,45), \ + V(BF,9C,9C,23), V(F7,A4,A4,53), V(96,72,72,E4), V(5B,C0,C0,9B), \ + V(C2,B7,B7,75), V(1C,FD,FD,E1), V(AE,93,93,3D), V(6A,26,26,4C), \ + V(5A,36,36,6C), V(41,3F,3F,7E), V(02,F7,F7,F5), V(4F,CC,CC,83), \ + V(5C,34,34,68), V(F4,A5,A5,51), V(34,E5,E5,D1), V(08,F1,F1,F9), \ + V(93,71,71,E2), V(73,D8,D8,AB), V(53,31,31,62), V(3F,15,15,2A), \ + V(0C,04,04,08), V(52,C7,C7,95), V(65,23,23,46), V(5E,C3,C3,9D), \ + V(28,18,18,30), V(A1,96,96,37), V(0F,05,05,0A), V(B5,9A,9A,2F), \ + V(09,07,07,0E), V(36,12,12,24), V(9B,80,80,1B), V(3D,E2,E2,DF), \ + V(26,EB,EB,CD), V(69,27,27,4E), V(CD,B2,B2,7F), V(9F,75,75,EA), \ + V(1B,09,09,12), V(9E,83,83,1D), V(74,2C,2C,58), V(2E,1A,1A,34), \ + V(2D,1B,1B,36), V(B2,6E,6E,DC), V(EE,5A,5A,B4), V(FB,A0,A0,5B), \ + V(F6,52,52,A4), V(4D,3B,3B,76), V(61,D6,D6,B7), V(CE,B3,B3,7D), \ + V(7B,29,29,52), V(3E,E3,E3,DD), V(71,2F,2F,5E), V(97,84,84,13), \ + V(F5,53,53,A6), V(68,D1,D1,B9), V(00,00,00,00), V(2C,ED,ED,C1), \ + V(60,20,20,40), V(1F,FC,FC,E3), V(C8,B1,B1,79), V(ED,5B,5B,B6), \ + V(BE,6A,6A,D4), V(46,CB,CB,8D), V(D9,BE,BE,67), V(4B,39,39,72), \ + V(DE,4A,4A,94), V(D4,4C,4C,98), V(E8,58,58,B0), V(4A,CF,CF,85), \ + V(6B,D0,D0,BB), V(2A,EF,EF,C5), V(E5,AA,AA,4F), V(16,FB,FB,ED), \ + V(C5,43,43,86), V(D7,4D,4D,9A), V(55,33,33,66), V(94,85,85,11), \ + V(CF,45,45,8A), V(10,F9,F9,E9), V(06,02,02,04), V(81,7F,7F,FE), \ + V(F0,50,50,A0), V(44,3C,3C,78), V(BA,9F,9F,25), V(E3,A8,A8,4B), \ + V(F3,51,51,A2), V(FE,A3,A3,5D), V(C0,40,40,80), V(8A,8F,8F,05), \ + V(AD,92,92,3F), V(BC,9D,9D,21), V(48,38,38,70), V(04,F5,F5,F1), \ + V(DF,BC,BC,63), V(C1,B6,B6,77), V(75,DA,DA,AF), V(63,21,21,42), \ + V(30,10,10,20), V(1A,FF,FF,E5), V(0E,F3,F3,FD), V(6D,D2,D2,BF), \ + V(4C,CD,CD,81), V(14,0C,0C,18), V(35,13,13,26), V(2F,EC,EC,C3), \ + V(E1,5F,5F,BE), V(A2,97,97,35), V(CC,44,44,88), V(39,17,17,2E), \ + V(57,C4,C4,93), V(F2,A7,A7,55), V(82,7E,7E,FC), V(47,3D,3D,7A), \ + V(AC,64,64,C8), V(E7,5D,5D,BA), V(2B,19,19,32), V(95,73,73,E6), \ + V(A0,60,60,C0), V(98,81,81,19), V(D1,4F,4F,9E), V(7F,DC,DC,A3), \ + V(66,22,22,44), V(7E,2A,2A,54), V(AB,90,90,3B), V(83,88,88,0B), \ + V(CA,46,46,8C), V(29,EE,EE,C7), V(D3,B8,B8,6B), V(3C,14,14,28), \ + V(79,DE,DE,A7), V(E2,5E,5E,BC), V(1D,0B,0B,16), V(76,DB,DB,AD), \ + V(3B,E0,E0,DB), V(56,32,32,64), V(4E,3A,3A,74), V(1E,0A,0A,14), \ + V(DB,49,49,92), V(0A,06,06,0C), V(6C,24,24,48), V(E4,5C,5C,B8), \ + V(5D,C2,C2,9F), V(6E,D3,D3,BD), V(EF,AC,AC,43), V(A6,62,62,C4), \ + V(A8,91,91,39), V(A4,95,95,31), V(37,E4,E4,D3), V(8B,79,79,F2), \ + V(32,E7,E7,D5), V(43,C8,C8,8B), V(59,37,37,6E), V(B7,6D,6D,DA), \ + V(8C,8D,8D,01), V(64,D5,D5,B1), V(D2,4E,4E,9C), V(E0,A9,A9,49), \ + V(B4,6C,6C,D8), V(FA,56,56,AC), V(07,F4,F4,F3), V(25,EA,EA,CF), \ + V(AF,65,65,CA), V(8E,7A,7A,F4), V(E9,AE,AE,47), V(18,08,08,10), \ + V(D5,BA,BA,6F), V(88,78,78,F0), V(6F,25,25,4A), V(72,2E,2E,5C), \ + V(24,1C,1C,38), V(F1,A6,A6,57), V(C7,B4,B4,73), V(51,C6,C6,97), \ + V(23,E8,E8,CB), V(7C,DD,DD,A1), V(9C,74,74,E8), V(21,1F,1F,3E), \ + V(DD,4B,4B,96), V(DC,BD,BD,61), V(86,8B,8B,0D), V(85,8A,8A,0F), \ + V(90,70,70,E0), V(42,3E,3E,7C), V(C4,B5,B5,71), V(AA,66,66,CC), \ + V(D8,48,48,90), V(05,03,03,06), V(01,F6,F6,F7), V(12,0E,0E,1C), \ + V(A3,61,61,C2), V(5F,35,35,6A), V(F9,57,57,AE), V(D0,B9,B9,69), \ + V(91,86,86,17), V(58,C1,C1,99), V(27,1D,1D,3A), V(B9,9E,9E,27), \ + V(38,E1,E1,D9), V(13,F8,F8,EB), V(B3,98,98,2B), V(33,11,11,22), \ + V(BB,69,69,D2), V(70,D9,D9,A9), V(89,8E,8E,07), V(A7,94,94,33), \ + V(B6,9B,9B,2D), V(22,1E,1E,3C), V(92,87,87,15), V(20,E9,E9,C9), \ + V(49,CE,CE,87), V(FF,55,55,AA), V(78,28,28,50), V(7A,DF,DF,A5), \ + V(8F,8C,8C,03), V(F8,A1,A1,59), V(80,89,89,09), V(17,0D,0D,1A), \ + V(DA,BF,BF,65), V(31,E6,E6,D7), V(C6,42,42,84), V(B8,68,68,D0), \ + V(C3,41,41,82), V(B0,99,99,29), V(77,2D,2D,5A), V(11,0F,0F,1E), \ + V(CB,B0,B0,7B), V(FC,54,54,A8), V(D6,BB,BB,6D), V(3A,16,16,2C) + +#define V(a,b,c,d) 0x##a##b##c##d +static const uint32_t s_aes_ft0[256] = { FT }; +#undef V + +#define V(a,b,c,d) 0x##b##c##d##a +static const uint32_t s_aes_ft1[256] = { FT }; +#undef V + +#define V(a,b,c,d) 0x##c##d##a##b +static const uint32_t s_aes_ft2[256] = { FT }; +#undef V + +#define V(a,b,c,d) 0x##d##a##b##c +static const uint32_t s_aes_ft3[256] = { FT }; +#undef V + +#undef FT + +/* + * Reverse S-box + */ +static const uint8_t s_aes_rsb[256] ESP_IBUS_ATTR = +{ + 0x52, 0x09, 0x6A, 0xD5, 0x30, 0x36, 0xA5, 0x38, + 0xBF, 0x40, 0xA3, 0x9E, 0x81, 0xF3, 0xD7, 0xFB, + 0x7C, 0xE3, 0x39, 0x82, 0x9B, 0x2F, 0xFF, 0x87, + 0x34, 0x8E, 0x43, 0x44, 0xC4, 0xDE, 0xE9, 0xCB, + 0x54, 0x7B, 0x94, 0x32, 0xA6, 0xC2, 0x23, 0x3D, + 0xEE, 0x4C, 0x95, 0x0B, 0x42, 0xFA, 0xC3, 0x4E, + 0x08, 0x2E, 0xA1, 0x66, 0x28, 0xD9, 0x24, 0xB2, + 0x76, 0x5B, 0xA2, 0x49, 0x6D, 0x8B, 0xD1, 0x25, + 0x72, 0xF8, 0xF6, 0x64, 0x86, 0x68, 0x98, 0x16, + 0xD4, 0xA4, 0x5C, 0xCC, 0x5D, 0x65, 0xB6, 0x92, + 0x6C, 0x70, 0x48, 0x50, 0xFD, 0xED, 0xB9, 0xDA, + 0x5E, 0x15, 0x46, 0x57, 0xA7, 0x8D, 0x9D, 0x84, + 0x90, 0xD8, 0xAB, 0x00, 0x8C, 0xBC, 0xD3, 0x0A, + 0xF7, 0xE4, 0x58, 0x05, 0xB8, 0xB3, 0x45, 0x06, + 0xD0, 0x2C, 0x1E, 0x8F, 0xCA, 0x3F, 0x0F, 0x02, + 0xC1, 0xAF, 0xBD, 0x03, 0x01, 0x13, 0x8A, 0x6B, + 0x3A, 0x91, 0x11, 0x41, 0x4F, 0x67, 0xDC, 0xEA, + 0x97, 0xF2, 0xCF, 0xCE, 0xF0, 0xB4, 0xE6, 0x73, + 0x96, 0xAC, 0x74, 0x22, 0xE7, 0xAD, 0x35, 0x85, + 0xE2, 0xF9, 0x37, 0xE8, 0x1C, 0x75, 0xDF, 0x6E, + 0x47, 0xF1, 0x1A, 0x71, 0x1D, 0x29, 0xC5, 0x89, + 0x6F, 0xB7, 0x62, 0x0E, 0xAA, 0x18, 0xBE, 0x1B, + 0xFC, 0x56, 0x3E, 0x4B, 0xC6, 0xD2, 0x79, 0x20, + 0x9A, 0xDB, 0xC0, 0xFE, 0x78, 0xCD, 0x5A, 0xF4, + 0x1F, 0xDD, 0xA8, 0x33, 0x88, 0x07, 0xC7, 0x31, + 0xB1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xEC, 0x5F, + 0x60, 0x51, 0x7F, 0xA9, 0x19, 0xB5, 0x4A, 0x0D, + 0x2D, 0xE5, 0x7A, 0x9F, 0x93, 0xC9, 0x9C, 0xEF, + 0xA0, 0xE0, 0x3B, 0x4D, 0xAE, 0x2A, 0xF5, 0xB0, + 0xC8, 0xEB, 0xBB, 0x3C, 0x83, 0x53, 0x99, 0x61, + 0x17, 0x2B, 0x04, 0x7E, 0xBA, 0x77, 0xD6, 0x26, + 0xE1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0C, 0x7D +}; + +/* + * Reverse tables + */ +#define RT \ +\ + V(50,A7,F4,51), V(53,65,41,7E), V(C3,A4,17,1A), V(96,5E,27,3A), \ + V(CB,6B,AB,3B), V(F1,45,9D,1F), V(AB,58,FA,AC), V(93,03,E3,4B), \ + V(55,FA,30,20), V(F6,6D,76,AD), V(91,76,CC,88), V(25,4C,02,F5), \ + V(FC,D7,E5,4F), V(D7,CB,2A,C5), V(80,44,35,26), V(8F,A3,62,B5), \ + V(49,5A,B1,DE), V(67,1B,BA,25), V(98,0E,EA,45), V(E1,C0,FE,5D), \ + V(02,75,2F,C3), V(12,F0,4C,81), V(A3,97,46,8D), V(C6,F9,D3,6B), \ + V(E7,5F,8F,03), V(95,9C,92,15), V(EB,7A,6D,BF), V(DA,59,52,95), \ + V(2D,83,BE,D4), V(D3,21,74,58), V(29,69,E0,49), V(44,C8,C9,8E), \ + V(6A,89,C2,75), V(78,79,8E,F4), V(6B,3E,58,99), V(DD,71,B9,27), \ + V(B6,4F,E1,BE), V(17,AD,88,F0), V(66,AC,20,C9), V(B4,3A,CE,7D), \ + V(18,4A,DF,63), V(82,31,1A,E5), V(60,33,51,97), V(45,7F,53,62), \ + V(E0,77,64,B1), V(84,AE,6B,BB), V(1C,A0,81,FE), V(94,2B,08,F9), \ + V(58,68,48,70), V(19,FD,45,8F), V(87,6C,DE,94), V(B7,F8,7B,52), \ + V(23,D3,73,AB), V(E2,02,4B,72), V(57,8F,1F,E3), V(2A,AB,55,66), \ + V(07,28,EB,B2), V(03,C2,B5,2F), V(9A,7B,C5,86), V(A5,08,37,D3), \ + V(F2,87,28,30), V(B2,A5,BF,23), V(BA,6A,03,02), V(5C,82,16,ED), \ + V(2B,1C,CF,8A), V(92,B4,79,A7), V(F0,F2,07,F3), V(A1,E2,69,4E), \ + V(CD,F4,DA,65), V(D5,BE,05,06), V(1F,62,34,D1), V(8A,FE,A6,C4), \ + V(9D,53,2E,34), V(A0,55,F3,A2), V(32,E1,8A,05), V(75,EB,F6,A4), \ + V(39,EC,83,0B), V(AA,EF,60,40), V(06,9F,71,5E), V(51,10,6E,BD), \ + V(F9,8A,21,3E), V(3D,06,DD,96), V(AE,05,3E,DD), V(46,BD,E6,4D), \ + V(B5,8D,54,91), V(05,5D,C4,71), V(6F,D4,06,04), V(FF,15,50,60), \ + V(24,FB,98,19), V(97,E9,BD,D6), V(CC,43,40,89), V(77,9E,D9,67), \ + V(BD,42,E8,B0), V(88,8B,89,07), V(38,5B,19,E7), V(DB,EE,C8,79), \ + V(47,0A,7C,A1), V(E9,0F,42,7C), V(C9,1E,84,F8), V(00,00,00,00), \ + V(83,86,80,09), V(48,ED,2B,32), V(AC,70,11,1E), V(4E,72,5A,6C), \ + V(FB,FF,0E,FD), V(56,38,85,0F), V(1E,D5,AE,3D), V(27,39,2D,36), \ + V(64,D9,0F,0A), V(21,A6,5C,68), V(D1,54,5B,9B), V(3A,2E,36,24), \ + V(B1,67,0A,0C), V(0F,E7,57,93), V(D2,96,EE,B4), V(9E,91,9B,1B), \ + V(4F,C5,C0,80), V(A2,20,DC,61), V(69,4B,77,5A), V(16,1A,12,1C), \ + V(0A,BA,93,E2), V(E5,2A,A0,C0), V(43,E0,22,3C), V(1D,17,1B,12), \ + V(0B,0D,09,0E), V(AD,C7,8B,F2), V(B9,A8,B6,2D), V(C8,A9,1E,14), \ + V(85,19,F1,57), V(4C,07,75,AF), V(BB,DD,99,EE), V(FD,60,7F,A3), \ + V(9F,26,01,F7), V(BC,F5,72,5C), V(C5,3B,66,44), V(34,7E,FB,5B), \ + V(76,29,43,8B), V(DC,C6,23,CB), V(68,FC,ED,B6), V(63,F1,E4,B8), \ + V(CA,DC,31,D7), V(10,85,63,42), V(40,22,97,13), V(20,11,C6,84), \ + V(7D,24,4A,85), V(F8,3D,BB,D2), V(11,32,F9,AE), V(6D,A1,29,C7), \ + V(4B,2F,9E,1D), V(F3,30,B2,DC), V(EC,52,86,0D), V(D0,E3,C1,77), \ + V(6C,16,B3,2B), V(99,B9,70,A9), V(FA,48,94,11), V(22,64,E9,47), \ + V(C4,8C,FC,A8), V(1A,3F,F0,A0), V(D8,2C,7D,56), V(EF,90,33,22), \ + V(C7,4E,49,87), V(C1,D1,38,D9), V(FE,A2,CA,8C), V(36,0B,D4,98), \ + V(CF,81,F5,A6), V(28,DE,7A,A5), V(26,8E,B7,DA), V(A4,BF,AD,3F), \ + V(E4,9D,3A,2C), V(0D,92,78,50), V(9B,CC,5F,6A), V(62,46,7E,54), \ + V(C2,13,8D,F6), V(E8,B8,D8,90), V(5E,F7,39,2E), V(F5,AF,C3,82), \ + V(BE,80,5D,9F), V(7C,93,D0,69), V(A9,2D,D5,6F), V(B3,12,25,CF), \ + V(3B,99,AC,C8), V(A7,7D,18,10), V(6E,63,9C,E8), V(7B,BB,3B,DB), \ + V(09,78,26,CD), V(F4,18,59,6E), V(01,B7,9A,EC), V(A8,9A,4F,83), \ + V(65,6E,95,E6), V(7E,E6,FF,AA), V(08,CF,BC,21), V(E6,E8,15,EF), \ + V(D9,9B,E7,BA), V(CE,36,6F,4A), V(D4,09,9F,EA), V(D6,7C,B0,29), \ + V(AF,B2,A4,31), V(31,23,3F,2A), V(30,94,A5,C6), V(C0,66,A2,35), \ + V(37,BC,4E,74), V(A6,CA,82,FC), V(B0,D0,90,E0), V(15,D8,A7,33), \ + V(4A,98,04,F1), V(F7,DA,EC,41), V(0E,50,CD,7F), V(2F,F6,91,17), \ + V(8D,D6,4D,76), V(4D,B0,EF,43), V(54,4D,AA,CC), V(DF,04,96,E4), \ + V(E3,B5,D1,9E), V(1B,88,6A,4C), V(B8,1F,2C,C1), V(7F,51,65,46), \ + V(04,EA,5E,9D), V(5D,35,8C,01), V(73,74,87,FA), V(2E,41,0B,FB), \ + V(5A,1D,67,B3), V(52,D2,DB,92), V(33,56,10,E9), V(13,47,D6,6D), \ + V(8C,61,D7,9A), V(7A,0C,A1,37), V(8E,14,F8,59), V(89,3C,13,EB), \ + V(EE,27,A9,CE), V(35,C9,61,B7), V(ED,E5,1C,E1), V(3C,B1,47,7A), \ + V(59,DF,D2,9C), V(3F,73,F2,55), V(79,CE,14,18), V(BF,37,C7,73), \ + V(EA,CD,F7,53), V(5B,AA,FD,5F), V(14,6F,3D,DF), V(86,DB,44,78), \ + V(81,F3,AF,CA), V(3E,C4,68,B9), V(2C,34,24,38), V(5F,40,A3,C2), \ + V(72,C3,1D,16), V(0C,25,E2,BC), V(8B,49,3C,28), V(41,95,0D,FF), \ + V(71,01,A8,39), V(DE,B3,0C,08), V(9C,E4,B4,D8), V(90,C1,56,64), \ + V(61,84,CB,7B), V(70,B6,32,D5), V(74,5C,6C,48), V(42,57,B8,D0) + +#define V(a,b,c,d) 0x##a##b##c##d +static const uint32_t s_aes_rt0[256] = { RT }; +#undef V + +#define V(a,b,c,d) 0x##b##c##d##a +static const uint32_t s_aes_rt1[256] = { RT }; +#undef V + +#define V(a,b,c,d) 0x##c##d##a##b +static const uint32_t s_aes_rt2[256] = { RT }; +#undef V + +#define V(a,b,c,d) 0x##d##a##b##c +static const uint32_t s_aes_rt3[256] = { RT }; +#undef V + +#undef RT + +/* + * Round constants + */ +static const uint32_t s_aes_rcon[10] = +{ + 0x00000001, 0x00000002, 0x00000004, 0x00000008, + 0x00000010, 0x00000020, 0x00000040, 0x00000080, + 0x0000001B, 0x00000036 +}; + +static void esp_aes_init(esp_aes_t *aes) +{ + } -#endif /* MBEDTLS_AES_ALT */ +int esp_aes_set_encrypt_key(esp_aes_t *aes, const void *p_key, size_t keybits) +{ + unsigned int i; + uint32_t *RK; + const uint8_t *key = (const uint8_t *)p_key; + + switch (keybits) { + case 128: + aes->nr = 10; + break; + case 192: + aes->nr = 12; + break; + case 256: + aes->nr = 14; + break; + default : + return -EINVAL; + } + + aes->rk = RK = aes->buf; + + for (i = 0; i < (keybits >> 5); i++) { + GET_UINT32_LE(RK[i], key, i << 2); + } + + switch (aes->nr) { + case 10: + for (i = 0; i < 10; i++, RK += 4) { + RK[4] = RK[0] ^ s_aes_rcon[i] + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((RK[3] >> 8) & 0xFF, s_aes_fsb) << 0) + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((RK[3] >> 16) & 0xFF, s_aes_fsb) << 8) + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((RK[3] >> 24) & 0xFF, s_aes_fsb) << 16) + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((RK[3] >> 0) & 0xFF, s_aes_fsb) << 24); + + RK[5] = RK[1] ^ RK[4]; + RK[6] = RK[2] ^ RK[5]; + RK[7] = RK[3] ^ RK[6]; + } + break; + case 12: + for (i = 0; i < 8; i++, RK += 6) { + RK[6] = RK[0] ^ s_aes_rcon[i] + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((RK[5] >> 8) & 0xFF, s_aes_fsb) << 0) + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((RK[5] >> 16) & 0xFF, s_aes_fsb) << 8) + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((RK[5] >> 24) & 0xFF, s_aes_fsb) << 16) + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((RK[5] >> 0) & 0xFF, s_aes_fsb) << 24); + + RK[7] = RK[1] ^ RK[6]; + RK[8] = RK[2] ^ RK[7]; + RK[9] = RK[3] ^ RK[8]; + RK[10] = RK[4] ^ RK[9]; + RK[11] = RK[5] ^ RK[10]; + } + break; + case 14: + for (i = 0; i < 7; i++, RK += 8) { + RK[8] = RK[0] ^ s_aes_rcon[i] + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((RK[7] >> 8) & 0xFF, s_aes_fsb) << 0) + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((RK[7] >> 16) & 0xFF, s_aes_fsb) << 8) + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((RK[7] >> 24) & 0xFF, s_aes_fsb) << 16) + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((RK[7] >> 0) & 0xFF, s_aes_fsb) << 24); + + RK[9] = RK[1] ^ RK[8]; + RK[10] = RK[2] ^ RK[9]; + RK[11] = RK[3] ^ RK[10]; + + RK[12] = RK[4] ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((RK[11] >> 0) & 0xFF, s_aes_fsb) << 0) + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((RK[11] >> 8) & 0xFF, s_aes_fsb) << 8) + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((RK[11] >> 16) & 0xFF, s_aes_fsb) << 16) + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((RK[11] >> 24) & 0xFF, s_aes_fsb) << 24); + + RK[13] = RK[5] ^ RK[12]; + RK[14] = RK[6] ^ RK[13]; + RK[15] = RK[7] ^ RK[14]; + } + break; + } + + return 0; +} + +int esp_aes_set_decrypt_key(esp_aes_t *aes, const void *key, size_t keybits) +{ + int i, j, ret; + esp_aes_t cty; + uint32_t *RK; + uint32_t *SK; + + esp_aes_init(&cty); + + aes->rk = RK = aes->buf; + + /* Also checks keybits */ + if ((ret = esp_aes_set_encrypt_key(&cty, key, keybits)) != 0) + return ret; + + aes->nr = cty.nr; + + SK = cty.rk + cty.nr * 4; + + *RK++ = *SK++; + *RK++ = *SK++; + *RK++ = *SK++; + *RK++ = *SK++; + + for (i = aes->nr - 1, SK -= 8; i > 0; i--, SK -= 8) { + for (j = 0; j < 4; j++, SK++) { + *RK++ = s_aes_rt0[ESP_IBUS_GET_U8_DATA((*SK >> 0) & 0xFF, s_aes_fsb)] + ^ s_aes_rt1[ESP_IBUS_GET_U8_DATA((*SK >> 8) & 0xFF, s_aes_fsb)] + ^ s_aes_rt2[ESP_IBUS_GET_U8_DATA((*SK >> 16) & 0xFF, s_aes_fsb)] + ^ s_aes_rt3[ESP_IBUS_GET_U8_DATA((*SK >> 24) & 0xFF, s_aes_fsb)]; + } + } + + *RK++ = *SK++; + *RK++ = *SK++; + *RK++ = *SK++; + *RK++ = *SK++; + + return ret; +} + +static void __esp_aes_encrypt(esp_aes_t *aes, const void *p_src, void *p_dst) +{ + int i; + uint32_t *RK, X0, X1, X2, X3, Y0, Y1, Y2, Y3; + const uint8_t *input = (const uint8_t *)p_src; + uint8_t *output = (uint8_t *)p_dst; + + RK = aes->rk; + + GET_UINT32_LE(X0, input, 0); X0 ^= *RK++; + GET_UINT32_LE(X1, input, 4); X1 ^= *RK++; + GET_UINT32_LE(X2, input, 8); X2 ^= *RK++; + GET_UINT32_LE(X3, input, 12); X3 ^= *RK++; + + for (i =(aes->nr >> 1)- 1; i > 0; i--) { + AES_FROUND(Y0, Y1, Y2, Y3, X0, X1, X2, X3); + AES_FROUND(X0, X1, X2, X3, Y0, Y1, Y2, Y3); + } + + AES_FROUND(Y0, Y1, Y2, Y3, X0, X1, X2, X3); + + X0 = *RK++ ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y0 >> 0) & 0xFF, s_aes_fsb) << 0) + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y1 >> 8) & 0xFF, s_aes_fsb) << 8) + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y2 >> 16) & 0xFF, s_aes_fsb) << 16) + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y3 >> 24) & 0xFF, s_aes_fsb) << 24); + + X1 = *RK++ ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y1 >> 0) & 0xFF, s_aes_fsb) << 0) + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y2 >> 8) & 0xFF, s_aes_fsb) << 8) + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y3 >> 16) & 0xFF, s_aes_fsb) << 16) + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y0 >> 24) & 0xFF, s_aes_fsb) << 24); + + X2 = *RK++ ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y2 >> 0) & 0xFF, s_aes_fsb) << 0) + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y3 >> 8) & 0xFF, s_aes_fsb) << 8) + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y0 >> 16) & 0xFF, s_aes_fsb) << 16) + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y1 >> 24) & 0xFF, s_aes_fsb) << 24); + + X3 = *RK++ ^ ((uint32_t) ESP_IBUS_GET_U8_DATA((Y3 >> 0) & 0xFF, s_aes_fsb) << 0) + ^ ((uint32_t) ESP_IBUS_GET_U8_DATA((Y0 >> 8) & 0xFF, s_aes_fsb) << 8) + ^ ((uint32_t) ESP_IBUS_GET_U8_DATA((Y1 >> 16) & 0xFF, s_aes_fsb) << 16) + ^ ((uint32_t) ESP_IBUS_GET_U8_DATA((Y2 >> 24) & 0xFF, s_aes_fsb) << 24); + + PUT_UINT32_LE(X0, output, 0); + PUT_UINT32_LE(X1, output, 4); + PUT_UINT32_LE(X2, output, 8); + PUT_UINT32_LE(X3, output, 12); +} + +static void __esp_aes_decrypt(esp_aes_t *aes, const void *p_src, void *p_dst) +{ + int i; + uint32_t *RK, X0, X1, X2, X3, Y0, Y1, Y2, Y3; + const uint8_t *input = (const uint8_t *)p_src; + uint8_t *output = (uint8_t *)p_dst; + + RK = aes->rk; + + GET_UINT32_LE(X0, input, 0); X0 ^= *RK++; + GET_UINT32_LE(X1, input, 4); X1 ^= *RK++; + GET_UINT32_LE(X2, input, 8); X2 ^= *RK++; + GET_UINT32_LE(X3, input, 12); X3 ^= *RK++; + + for (i =(aes->nr >> 1)- 1; i > 0; i--) { + AES_RROUND(Y0, Y1, Y2, Y3, X0, X1, X2, X3); + AES_RROUND(X0, X1, X2, X3, Y0, Y1, Y2, Y3); + } + + AES_RROUND(Y0, Y1, Y2, Y3, X0, X1, X2, X3); + + X0 = *RK++ ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y0 >> 0) & 0xFF, s_aes_rsb) << 0) + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y3 >> 8) & 0xFF, s_aes_rsb) << 8) + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y2 >> 16) & 0xFF, s_aes_rsb) << 16) + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y1 >> 24) & 0xFF, s_aes_rsb) << 24); + + X1 = *RK++ ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y1 >> 0) & 0xFF, s_aes_rsb) << 0) + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y0 >> 8) & 0xFF, s_aes_rsb) << 8) + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y3 >> 16) & 0xFF, s_aes_rsb) << 16) + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y2 >> 24) & 0xFF, s_aes_rsb) << 24); + + X2 = *RK++ ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y2 >> 0) & 0xFF, s_aes_rsb) << 0) + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y1 >> 8) & 0xFF, s_aes_rsb) << 8) + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y0 >> 16) & 0xFF, s_aes_rsb) << 16) + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y3 >> 24) & 0xFF, s_aes_rsb) << 24); + + X3 = *RK++ ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y3 >> 0) & 0xFF, s_aes_rsb) << 0) + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y2 >> 8) & 0xFF, s_aes_rsb) << 8) + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y1 >> 16) & 0xFF, s_aes_rsb) << 16) + ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y0 >> 24) & 0xFF, s_aes_rsb) << 24); + + PUT_UINT32_LE(X0, output, 0); + PUT_UINT32_LE(X1, output, 4); + PUT_UINT32_LE(X2, output, 8); + PUT_UINT32_LE(X3, output, 12); +} + +int esp_aes_encrypt(esp_aes_t *aes, + const void *p_src, + size_t slen, + void *p_dst, + size_t dlen) +{ + const uint8_t *input = (const uint8_t *)p_src; + uint8_t *output = (uint8_t *)p_dst; + + util_assert(aes); + util_assert(p_src); + util_assert(p_dst); + util_assert((slen > 0) && ((slen % 16) == 0)); + util_assert(dlen >= slen); + + for (size_t i = 0; i < slen; i += 16) + __esp_aes_encrypt(aes, input + i, output + i); + + return 0; +} + +int esp_aes_decrypt(esp_aes_t *aes, + const void *p_src, + size_t slen, + void *p_dst, + size_t dlen) +{ + const uint8_t *input = (const uint8_t *)p_src; + uint8_t *output = (uint8_t *)p_dst; + + util_assert(aes); + util_assert(p_src); + util_assert(p_dst); + util_assert((slen > 0) && ((slen % 16) == 0)); + util_assert(dlen >= slen); + + for (size_t i = 0; i < slen; i += 16) + __esp_aes_decrypt(aes, input + i, output + i); + + return 0; +} + +int esp_aes_encrypt_cbc(esp_aes_t *aes, + const void *p_src, + size_t slen, + void *p_dst, + size_t dlen, + void *p_iv) +{ + const uint8_t *input = (const uint8_t *)p_src; + uint8_t *iv = (uint8_t *)p_iv; + uint8_t *output = (uint8_t *)p_dst; + + util_assert(aes); + util_assert(p_src); + util_assert(p_dst); + util_assert(p_iv); + util_assert((slen > 0) && ((slen % 16) == 0)); + util_assert(dlen >= slen); + + for (int i = 0; i < slen; i += 16) { + for(int j = 0; j < 16; j++ ) + output[j] = input[j] ^ iv[j]; + + __esp_aes_encrypt(aes, output, output); + memcpy(iv, output, 16); + + input += 16; + output += 16; + } + + return( 0 ); +} + +int esp_aes_decrypt_cbc(esp_aes_t *aes, + const void *p_src, + size_t slen, + void *p_dst, + size_t dlen, + void *p_iv) +{ + const uint8_t *input = (const uint8_t *)p_src; + uint8_t *iv = (uint8_t *)p_iv; + uint8_t *output = (uint8_t *)p_dst; + + util_assert(aes); + util_assert(p_src); + util_assert(p_dst); + util_assert(p_iv); + util_assert((slen > 0) && ((slen % 16) == 0)); + util_assert(dlen >= slen); + + for (int i = 0; i < slen; i += 16) { + uint8_t temp[16]; + + memcpy(temp, input, 16); + __esp_aes_decrypt(aes, input, output); + + for (int j = 0; j < 16; j++) + output[j] = output[j] ^ iv[j]; + + memcpy(iv, temp, 16); + + input += 16; + output += 16; + } + + return( 0 ); +} + +int esp_aes_encrypt_cfb8(esp_aes_t *aes, + const void *p_src, + size_t slen, + void *p_dst, + size_t dlen, + void *p_iv) +{ + uint8_t c; + uint8_t ov[17]; + const uint8_t *input = (const uint8_t *)p_src; + uint8_t *iv = (uint8_t *)p_iv; + uint8_t *output = (uint8_t *)p_dst; + + for (int i = 0; i < slen; i++) { + memcpy(ov, iv, 16); + __esp_aes_encrypt(aes, iv, iv); + + c = *output++ = iv[0] ^ *input++; + ov[16] = c; + + memcpy(iv, ov + 1, 16); + } + + return 0; +} + +int esp_aes_decrypt_cfb8(esp_aes_t *aes, + const void *p_src, + size_t slen, + void *p_dst, + size_t dlen, + void *p_iv) +{ + uint8_t ov[17]; + const uint8_t *input = (const uint8_t *)p_src; + uint8_t *iv = (uint8_t *)p_iv; + uint8_t *output = (uint8_t *)p_dst; + + util_assert(aes); + util_assert(p_src); + util_assert(p_dst); + util_assert(p_iv); + util_assert((slen > 0) && ((slen % 16) == 0)); + util_assert(dlen >= slen); + + for (int i = 0; i < slen; i++) { + memcpy(ov, iv, 16); + __esp_aes_encrypt(aes, iv, iv); + + ov[16] = *input; + *output++ = iv[0] ^ *input++; + + memcpy(iv, ov + 1, 16); + } + + return 0; +} + +int esp_aes_encrypt_cfb128(esp_aes_t *aes, + const void *p_src, + size_t slen, + void *p_dst, + size_t dlen, + void *p_iv, + size_t *iv_off) +{ + size_t n; + const uint8_t *input = (const uint8_t *)p_src; + uint8_t *iv = (uint8_t *)p_iv; + uint8_t *output = (uint8_t *)p_dst; + + util_assert(aes); + util_assert(p_src); + util_assert(p_dst); + util_assert(p_iv); + util_assert(iv_off); + util_assert((slen > 0) && ((slen % 16) == 0)); + util_assert(dlen >= slen); + + n = *iv_off; + for (int i = 0; i < slen; i++) { + if (n == 0) + __esp_aes_encrypt(aes, iv, iv); + + iv[n] = *output++ = iv[n] ^ *input++; + + n = (n + 1) & 0x0F; + } + + *iv_off = n; + + return 0; +} + +int esp_aes_decrypt_cfb128(esp_aes_t *aes, + const void *p_src, + size_t slen, + void *p_dst, + size_t dlen, + void *p_iv, + size_t *iv_off) +{ + uint8_t c; + size_t n; + const uint8_t *input = (const uint8_t *)p_src; + uint8_t *iv = (uint8_t *)p_iv; + uint8_t *output = (uint8_t *)p_dst; + + util_assert(aes); + util_assert(p_src); + util_assert(p_dst); + util_assert(p_iv); + util_assert(iv_off); + util_assert((slen > 0) && ((slen % 16) == 0)); + util_assert(dlen >= slen); + + n = *iv_off; + for (int i = 0; i < slen; i++) { + if (n == 0) + __esp_aes_encrypt(aes, iv, iv); + + c = *input++; + *output++ = c ^ iv[n]; + iv[n] = c; + + n = (n + 1) & 0x0F; + } + + *iv_off = n; + + return 0; +} + +int esp_aes_encrypt_ctr(esp_aes_t *aes, + size_t *nc_off, + void *p_nonce_counter, + void *p_stream_block, + const void *p_src, + size_t slen, + void *p_dst, + size_t dlen) +{ + uint8_t c; + size_t n; + uint8_t *output = (uint8_t *)p_dst; + uint8_t *nonce_counter = (uint8_t *)p_nonce_counter; + uint8_t *stream_block = (uint8_t *)p_stream_block; + const uint8_t *input = (const uint8_t *)p_src; + + util_assert(aes); + util_assert(nc_off); + util_assert(p_nonce_counter); + util_assert(p_stream_block); + util_assert(p_src); + util_assert(p_dst); + util_assert((slen > 0) && ((slen % 16) == 0)); + util_assert(dlen >= slen); + + n = *nc_off; + for (int i = 0; i < slen; i++) { + if( n == 0 ) { + __esp_aes_encrypt(aes, nonce_counter, stream_block); + + for (int j = 16; j > 0; j--) + if (++nonce_counter[j - 1] != 0) + break; + } + c = *input++; + *output++ = c ^ stream_block[n]; + + n = (n + 1) & 0x0F; + } + + *nc_off = n; + + return 0; +} + +static void aes_xts_decode_keys(const uint8_t *key, + size_t keybits, + const uint8_t **key1, + size_t *key1bits, + const uint8_t **key2, + size_t *key2bits) +{ + const size_t half_keybits = keybits / 2; + const size_t half_keybytes = half_keybits / 8; + + *key1bits = half_keybits; + *key2bits = half_keybits; + *key1 = &key[0]; + *key2 = &key[half_keybytes]; +} + +static void aes_gf128mul_x_ble(uint8_t *r, const uint8_t *i) +{ + uint64_t x[2], y[2]; + + memcpy(x, i, 16); + + y[0] = (x[0] << 1) ^ 0x0087 >> (8 - ((x[1] >> 63 ) << 3)); + y[1] = (x[0] >> 63) | (x[1] << 1); + + memcpy(r, y, 16); +} + +int esp_aes_xts_set_encrypt_key(esp_aes_xts_t *ctx, const void *p_key, size_t keybits) +{ + int ret; + const uint8_t *key1, *key2; + size_t key1bits, key2bits; + const uint8_t *key = (const uint8_t *)p_key; + + util_assert(ctx); + util_assert(key); + + if (keybits != 256 && keybits != 512) + return -EINVAL; + + aes_xts_decode_keys(key, keybits, &key1, &key1bits, &key2, &key2bits); + + ret = esp_aes_set_encrypt_key(&ctx->tweak, key2, key2bits); + if (ret) + return ret; + + return esp_aes_set_encrypt_key(&ctx->crypt, key1, key1bits); +} + +int esp_aes_xts_set_decrypt_key(esp_aes_xts_t *ctx, const void *p_key, size_t keybits) +{ + int ret; + const uint8_t *key1, *key2; + size_t key1bits, key2bits; + const uint8_t *key = (const uint8_t *)p_key; + + util_assert(ctx); + util_assert(key); + + if (keybits != 256 && keybits != 512) + return -EINVAL; + + aes_xts_decode_keys(key, keybits, &key1, &key1bits, &key2, &key2bits); + + ret = esp_aes_set_encrypt_key(&ctx->tweak, key2, key2bits); + if (ret) + return ret; + + return esp_aes_set_decrypt_key(&ctx->crypt, key1, key1bits); +} + +int esp_aes_crypt_xts(esp_aes_xts_t *ctx, + int encrypt, + size_t length, + const void *p_data_unit, + const void *p_src, + void *p_dst) +{ + size_t blocks = length / 16; + size_t leftover = length % 16; + uint8_t tweak[16]; + uint8_t prev_tweak[16]; + uint8_t tmp[16]; + void (*crypt_func)(esp_aes_t *aes, const void *p_src, void *p_dst); + + const uint8_t *data_unit = (const uint8_t *)p_data_unit; + const uint8_t *input = (const uint8_t *)p_src; + uint8_t *output = (uint8_t *)p_dst; + + util_assert(ctx); + util_assert(data_unit); + util_assert(input); + util_assert(output); + + if (length < 16 || (length > (1 << 20) * 16)) + return -EINVAL; + + crypt_func = encrypt ? __esp_aes_encrypt : __esp_aes_decrypt; + + __esp_aes_encrypt(&ctx->tweak, data_unit, tweak); + + while (blocks--) { + if (blocks == 0 && leftover && !encrypt) { + memcpy(prev_tweak, tweak, sizeof(tweak)); + aes_gf128mul_x_ble(tweak, tweak); + } + + for (int i = 0; i < 16; i++) + tmp[i] = input[i] ^ tweak[i]; + + crypt_func(&ctx->crypt, tmp, tmp); + + for (int i = 0; i < 16; i++) + output[i] = tmp[i] ^ tweak[i]; + + aes_gf128mul_x_ble(tweak, tweak); + + output += 16; + input += 16; + } + + if (leftover) { + int i; + uint8_t *t = encrypt ? tweak : prev_tweak; + uint8_t *prev_output = output - 16; + + for (i = 0; i < leftover; i++) { + output[i] = prev_output[i]; + tmp[i] = input[i] ^ t[i]; + } + + for (; i < 16; i++ ) + tmp[i] = prev_output[i] ^ t[i]; + + crypt_func(&ctx->crypt, tmp, tmp); + + for (i = 0; i < 16; i++) + prev_output[i] = tmp[i] ^ t[i]; + } + + return 0; +} + +int esp_aes_crypt_ofb(esp_aes_t *ctx, + size_t length, + size_t *iv_off, + void *p_iv, + const void *p_src, + void *p_dst) +{ + size_t n; + uint8_t *iv = (uint8_t *)p_iv; + const uint8_t *input = (const uint8_t *)p_src; + uint8_t *output = (uint8_t *)p_dst; + + util_assert(ctx != NULL); + util_assert(iv_off != NULL); + util_assert(iv != NULL); + util_assert(input != NULL); + util_assert(output != NULL); + + n = *iv_off; + + if (n > 15) + return -EINVAL; + + while (length--) { + if (n == 0) { + esp_aes_encrypt(ctx, iv, 16, iv, 16); + } + *output++ = *input++ ^ iv[n]; + + n = (n + 1) & 0x0F; + } + + *iv_off = n; + + return 0; +} diff --git a/components/util/src/arc4.c b/components/mbedtls/port/esp8266/arc4.c similarity index 100% rename from components/util/src/arc4.c rename to components/mbedtls/port/esp8266/arc4.c diff --git a/components/util/src/base64.c b/components/mbedtls/port/esp8266/base64.c similarity index 100% rename from components/util/src/base64.c rename to components/mbedtls/port/esp8266/base64.c diff --git a/components/util/src/md5.c b/components/mbedtls/port/esp8266/md5.c similarity index 98% rename from components/util/src/md5.c rename to components/mbedtls/port/esp8266/md5.c index 24631818..c3b25ed6 100644 --- a/components/util/src/md5.c +++ b/components/mbedtls/port/esp8266/md5.c @@ -28,7 +28,7 @@ static const uint8_t esp_md5_padding[64] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; -int esp_md5_process(esp_md5_context_t *ctx, const uint8_t data[64]) +static int esp_md5_process(esp_md5_context_t *ctx, const uint8_t data[64]) { uint32_t X[64], Y[4]; util_assert(ctx); diff --git a/components/mbedtls/port/esp8266/sha1.c b/components/mbedtls/port/esp8266/sha1.c index 45a63d60..3f10ef38 100644 --- a/components/mbedtls/port/esp8266/sha1.c +++ b/components/mbedtls/port/esp8266/sha1.c @@ -1,68 +1,165 @@ -/** - * \brief AES block cipher, ESP8266 accelerated version - * Based on mbedTLS FIPS-197 compliant version. - * - * Copyright (C) 2006-2015, ARM Limited, All Rights Reserved - * Additions Copyright (C) 2016-2017, Espressif Systems (Shanghai) PTE Ltd - * SPDX-License-Identifier: Apache-2.0 - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ +// Copyright 2018 Espressif Systems (Shanghai) PTE LTD +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +#include #include -#include "mbedtls/sha1.h" +#include "util_assert.h" +#include +#include "esp_sha.h" +#include "esp_log.h" -#if defined(MBEDTLS_SHA1_ALT) +#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits)))) -void mbedtls_sha1_init(mbedtls_sha1_context *ctx) +#define blk0(i) (block->l[i] = (rol(block->l[i], 24) & 0xFF00FF00) | \ + (rol(block->l[i], 8) & 0x00FF00FF)) + +#define blk(i) (block->l[i & 15] = rol(block->l[(i + 13) & 15] ^ \ + block->l[(i + 8) & 15] ^ block->l[(i + 2) & 15] ^ block->l[i & 15], 1)) + +#define R0(v,w,x,y,z,i) \ + z += ((w & (x ^ y)) ^ y) + blk0(i) + 0x5A827999 + rol(v, 5); \ + w = rol(w, 30); +#define R1(v,w,x,y,z,i) \ + z += ((w & (x ^ y)) ^ y) + blk(i) + 0x5A827999 + rol(v, 5); \ + w = rol(w, 30); +#define R2(v,w,x,y,z,i) \ + z += (w ^ x ^ y) + blk(i) + 0x6ED9EBA1 + rol(v, 5); w = rol(w, 30); +#define R3(v,w,x,y,z,i) \ + z += (((w | x) & y) | (w & x)) + blk(i) + 0x8F1BBCDC + rol(v, 5); \ + w = rol(w, 30); +#define R4(v,w,x,y,z,i) \ + z += (w ^ x ^ y) + blk(i) + 0xCA62C1D6 + rol(v, 5); \ + w=rol(w, 30); + +typedef union { + uint8_t c[64]; + uint32_t l[16]; +} block_t; + +static void esp_sha1_transform(uint32_t state[5], const uint8_t buffer[64]) { - memset(ctx, 0, sizeof(mbedtls_sha1_context)); + uint32_t a, b, c, d, e; + block_t workspace; + block_t *block = &workspace; + + memcpy(block, buffer, 64); + + a = state[0]; + b = state[1]; + c = state[2]; + d = state[3]; + e = state[4]; + + R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3); + R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7); + R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11); + R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15); + R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19); + R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23); + R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27); + R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31); + R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35); + R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39); + R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43); + R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47); + R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51); + R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55); + R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59); + R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63); + R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67); + R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71); + R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75); + R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79); + + state[0] += a; + state[1] += b; + state[2] += c; + state[3] += d; + state[4] += e; } -void mbedtls_sha1_free(mbedtls_sha1_context *ctx) +int esp_sha1_init(esp_sha1_t *ctx) { - memset(ctx, 0, sizeof(mbedtls_sha1_context)); + util_assert(ctx); + + ctx->state[0] = 0x67452301; + ctx->state[1] = 0xEFCDAB89; + ctx->state[2] = 0x98BADCFE; + ctx->state[3] = 0x10325476; + ctx->state[4] = 0xC3D2E1F0; + + ctx->total[0] = ctx->total[1] = 0; + + return 0; } -void mbedtls_sha1_clone(mbedtls_sha1_context *dst, const mbedtls_sha1_context *src) +int esp_sha1_update(esp_sha1_t *ctx, const void *src, size_t size) { - memcpy(dst, src, sizeof(mbedtls_sha1_context)); + uint32_t i, j; + const uint8_t *data = (const uint8_t *)src; + + util_assert(ctx); + util_assert(src); + util_assert(size); + + j = (ctx->total[0] >> 3) & 63; + + if ((ctx->total[0] += size << 3) < (size << 3)) + ctx->total[1]++; + + ctx->total[1] += (size >> 29); + + if ((j + size) > 63) { + memcpy(&ctx->buffer[j], data, (i = 64-j)); + + esp_sha1_transform(ctx->state, ctx->buffer); + for ( ; i + 63 < size; i += 64) + esp_sha1_transform(ctx->state, &data[i]); + + j = 0; + } else + i = 0; + + memcpy(&ctx->buffer[j], &data[i], size - i); + + return 0; } -int mbedtls_sha1_starts_ret(mbedtls_sha1_context *ctx) +int esp_sha1_finish(esp_sha1_t *ctx, void *dest) { - return esp_sha1_init(ctx); + uint32_t i; + uint32_t index; + uint8_t finalcount[8]; + uint8_t *digest = (uint8_t *)dest; + + util_assert(ctx); + util_assert(dest); + + for (i = 0; i < 8; i++) + finalcount[i] = (uint8_t)((ctx->total[(i >= 4 ? 0 : 1)] >> ((3-(i & 3)) * 8) ) & 255); + + index = 0x80; + esp_sha1_update(ctx, (uint8_t *)&index, 1); + + while ((ctx->total[0] & 504) != 448) { + index = 0; + esp_sha1_update(ctx, (uint8_t *)&index, 1); + } + esp_sha1_update(ctx, finalcount, 8); + + for (i = 0; i < 20; i++) + digest[i] = (uint8_t)((ctx->state[i >> 2] >> ((3 - (i & 3)) * 8)) & 255); + + return 0; } - -int mbedtls_sha1_update_ret(mbedtls_sha1_context *ctx, const unsigned char *input, size_t ilen) -{ - return esp_sha1_update(ctx, input, ilen); -} - -int mbedtls_sha1_finish_ret(mbedtls_sha1_context *ctx, unsigned char output[64]) -{ - return esp_sha1_finish(ctx, output); -} - -int mbedtls_internal_sha1_process(mbedtls_sha1_context *ctx, const unsigned char data[128]) -{ - return esp_sha1_update(ctx, data, 64); -} - -// int mbedtls_sha512_ret(const unsigned char *input, size_t ilen, unsigned char output[64], int is384) -// { - -// } - -#endif /* MBEDTLS_AES_ALT */ diff --git a/components/mbedtls/port/esp8266/sha256.c b/components/mbedtls/port/esp8266/sha256.c index 2e8f8448..3b658beb 100644 --- a/components/mbedtls/port/esp8266/sha256.c +++ b/components/mbedtls/port/esp8266/sha256.c @@ -1,75 +1,252 @@ -/** - * \brief AES block cipher, ESP8266 accelerated version - * Based on mbedTLS FIPS-197 compliant version. - * - * Copyright (C) 2006-2015, ARM Limited, All Rights Reserved - * Additions Copyright (C) 2016-2017, Espressif Systems (Shanghai) PTE Ltd - * SPDX-License-Identifier: Apache-2.0 - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ +// Copyright 2018 Espressif Systems (Shanghai) PTE LTD +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +#include #include -#include "mbedtls/sha256.h" +#include "util_assert.h" +#include +#include "esp_sha.h" +#include "esp_log.h" -#if defined(MBEDTLS_SHA256_ALT) +#define ESP_GET_BE32(a) ((((uint32_t) (a)[0]) << 24) | (((uint32_t) (a)[1]) << 16) | \ + (((uint32_t) (a)[2]) << 8) | ((uint32_t) (a)[3])) -void mbedtls_sha256_init(mbedtls_sha256_context *ctx) +#define ESP_PUT_BE64(a, val) \ + do { \ + (a)[0] = (uint8_t) (((uint64_t) (val)) >> 56); \ + (a)[1] = (uint8_t) (((uint64_t) (val)) >> 48); \ + (a)[2] = (uint8_t) (((uint64_t) (val)) >> 40); \ + (a)[3] = (uint8_t) (((uint64_t) (val)) >> 32); \ + (a)[4] = (uint8_t) (((uint64_t) (val)) >> 24); \ + (a)[5] = (uint8_t) (((uint64_t) (val)) >> 16); \ + (a)[6] = (uint8_t) (((uint64_t) (val)) >> 8); \ + (a)[7] = (uint8_t) (((uint64_t) (val)) & 0xff); \ + } while (0) + +#define ESP_PUT_BE32(a, val) \ + do { \ + (a)[0] = (uint8_t) ((((uint32_t) (val)) >> 24) & 0xff); \ + (a)[1] = (uint8_t) ((((uint32_t) (val)) >> 16) & 0xff); \ + (a)[2] = (uint8_t) ((((uint32_t) (val)) >> 8) & 0xff); \ + (a)[3] = (uint8_t) (((uint32_t) (val)) & 0xff); \ + } while (0) + +#define RORc(x, y) \ +( ((((uint32_t) (x) & 0xFFFFFFFFUL) >> (uint32_t) ((y) & 31)) | \ + ((uint32_t) (x) << (uint32_t) (32 - ((y) & 31)))) & 0xFFFFFFFFUL) +#define Ch(x,y,z) (z ^ (x & (y ^ z))) +#define Maj(x,y,z) (((x | y) & z) | (x & y)) +#define S(x, n) RORc((x), (n)) +#define R(x, n) (((x)&0xFFFFFFFFUL)>>(n)) +#define Sigma0(x) (S(x, 2) ^ S(x, 13) ^ S(x, 22)) +#define Sigma1(x) (S(x, 6) ^ S(x, 11) ^ S(x, 25)) +#define Gamma0(x) (S(x, 7) ^ S(x, 18) ^ R(x, 3)) +#define Gamma1(x) (S(x, 17) ^ S(x, 19) ^ R(x, 10)) +#ifndef MIN +#define MIN(x, y) (((x) < (y)) ? (x) : (y)) +#endif + +#define RND(a,b,c,d,e,f,g,h,i) \ + t0 = h + Sigma1(e) + Ch(e, f, g) + K[i] + W[i]; \ + t1 = Sigma0(a) + Maj(a, b, c); \ + d += t0; \ + h = t0 + t1; + +static const uint32_t K[64] = { + 0x428a2f98UL, 0x71374491UL, 0xb5c0fbcfUL, 0xe9b5dba5UL, 0x3956c25bUL, + 0x59f111f1UL, 0x923f82a4UL, 0xab1c5ed5UL, 0xd807aa98UL, 0x12835b01UL, + 0x243185beUL, 0x550c7dc3UL, 0x72be5d74UL, 0x80deb1feUL, 0x9bdc06a7UL, + 0xc19bf174UL, 0xe49b69c1UL, 0xefbe4786UL, 0x0fc19dc6UL, 0x240ca1ccUL, + 0x2de92c6fUL, 0x4a7484aaUL, 0x5cb0a9dcUL, 0x76f988daUL, 0x983e5152UL, + 0xa831c66dUL, 0xb00327c8UL, 0xbf597fc7UL, 0xc6e00bf3UL, 0xd5a79147UL, + 0x06ca6351UL, 0x14292967UL, 0x27b70a85UL, 0x2e1b2138UL, 0x4d2c6dfcUL, + 0x53380d13UL, 0x650a7354UL, 0x766a0abbUL, 0x81c2c92eUL, 0x92722c85UL, + 0xa2bfe8a1UL, 0xa81a664bUL, 0xc24b8b70UL, 0xc76c51a3UL, 0xd192e819UL, + 0xd6990624UL, 0xf40e3585UL, 0x106aa070UL, 0x19a4c116UL, 0x1e376c08UL, + 0x2748774cUL, 0x34b0bcb5UL, 0x391c0cb3UL, 0x4ed8aa4aUL, 0x5b9cca4fUL, + 0x682e6ff3UL, 0x748f82eeUL, 0x78a5636fUL, 0x84c87814UL, 0x8cc70208UL, + 0x90befffaUL, 0xa4506cebUL, 0xbef9a3f7UL, 0xc67178f2UL +}; + +static void esp_sha256_transform(esp_sha256_t *ctx, const uint8_t *buf) { - memset(ctx, 0, sizeof(mbedtls_sha256_context)); + uint32_t S[8], W[64], t0, t1; + uint32_t t; + int i; + + for (i = 0; i < 8; i++) + S[i] = ctx->state[i]; + + for (i = 0; i < 16; i++) + W[i] = ESP_GET_BE32(buf + (4 * i)); + + for (i = 16; i < 64; i++) + W[i] = Gamma1(W[i - 2]) + W[i - 7] + Gamma0(W[i - 15]) + W[i - 16]; + + for (i = 0; i < 64; ++i) { + RND(S[0], S[1], S[2], S[3], S[4], S[5], S[6], S[7], i); + t = S[7]; S[7] = S[6]; S[6] = S[5]; S[5] = S[4]; + S[4] = S[3]; S[3] = S[2]; S[2] = S[1]; S[1] = S[0]; S[0] = t; + } + + for (i = 0; i < 8; i++) + ctx->state[i] = ctx->state[i] + S[i]; } -void mbedtls_sha256_free(mbedtls_sha256_context *ctx) +int esp_sha256_init(esp_sha256_t *ctx) { - memset(ctx, 0, sizeof(mbedtls_sha256_context)); + util_assert(ctx); + + ctx->is224 = 0; + + ctx->total[0] = 0; + ctx->total[1] = 0; + + ctx->state[0] = 0x6A09E667UL; + ctx->state[1] = 0xBB67AE85UL; + ctx->state[2] = 0x3C6EF372UL; + ctx->state[3] = 0xA54FF53AUL; + ctx->state[4] = 0x510E527FUL; + ctx->state[5] = 0x9B05688CUL; + ctx->state[6] = 0x1F83D9ABUL; + ctx->state[7] = 0x5BE0CD19UL; + + return 0; } -void mbedtls_sha256_clone(mbedtls_sha256_context *dst, const mbedtls_sha256_context *src) +int esp_sha224_init(esp_sha224_t *ctx) { - memcpy(dst, src, sizeof(mbedtls_sha256_context)); + util_assert(ctx); + + ctx->is224 = 1; + + ctx->total[0] = 0; + ctx->total[1] = 0; + + ctx->state[0] = 0xC1059ED8; + ctx->state[1] = 0x367CD507; + ctx->state[2] = 0x3070DD17; + ctx->state[3] = 0xF70E5939; + ctx->state[4] = 0xFFC00B31; + ctx->state[5] = 0x68581511; + ctx->state[6] = 0x64F98FA7; + ctx->state[7] = 0xBEFA4FA4; + + return 0; } -int mbedtls_sha256_starts_ret(mbedtls_sha256_context *ctx, int is224) +int esp_sha256_update(esp_sha256_t *ctx, const void *src, size_t size) { - int ret; + size_t fill; + uint32_t left; + const uint8_t *input = (const uint8_t *)src; - if (is224) - ret = esp_sha224_init(ctx); - else - ret = esp_sha256_init(ctx); + util_assert(ctx); + util_assert(src); + util_assert(size); - return ret; + left = ctx->total[0] & 0x3F; + fill = 64 - left; + + ctx->total[0] += size; + ctx->total[0] &= 0xFFFFFFFF; + + if (ctx->total[0] < size) + ctx->total[1]++; + + if (left && size >= fill) { + memcpy(ctx->buffer + left, input, fill); + + esp_sha256_transform(ctx, ctx->buffer); + + input += fill; + size -= fill; + left = 0; + } + + while (size >= 64) { + esp_sha256_transform(ctx, input); + + input += 64; + size -= 64; + } + + if (size > 0) + memcpy(ctx->buffer + left, input, size); + + return 0; } -int mbedtls_sha256_update_ret(mbedtls_sha256_context *ctx, const unsigned char *input, size_t ilen) +int esp_sha224_update(esp_sha224_t *ctx, const void *src, size_t size) { - return esp_sha256_update(ctx, input, ilen); + util_assert(ctx); + util_assert(src); + util_assert(size); + + return esp_sha256_update(ctx, src, size); } -int mbedtls_sha256_finish_ret(mbedtls_sha256_context *ctx, unsigned char output[64]) +int esp_sha224_finish(esp_sha224_t *ctx, void *dest) { - return esp_sha256_finish(ctx, output); + uint32_t used; + uint32_t high, low; + uint8_t *out = (uint8_t *)dest; + + util_assert(ctx); + util_assert(dest); + + used = ctx->total[0] & 0x3F; + + ctx->buffer[used++] = 0x80; + + if (used <= 56) { + memset(ctx->buffer + used, 0, 56 - used); + } else { + memset(ctx->buffer + used, 0, 64 - used); + esp_sha256_transform(ctx, ctx->buffer); + memset(ctx->buffer, 0, 56); + } + + high = (ctx->total[0] >> 29) | (ctx->total[1] << 3); + low = (ctx->total[0] << 3); + + ESP_PUT_BE32(ctx->buffer + 56, high); + ESP_PUT_BE32(ctx->buffer + 60, low); + + esp_sha256_transform(ctx, ctx->buffer); + + ESP_PUT_BE32(out + 0, ctx->state[0]); + ESP_PUT_BE32(out + 4, ctx->state[1]); + ESP_PUT_BE32(out + 8, ctx->state[2]); + ESP_PUT_BE32(out + 12, ctx->state[3]); + ESP_PUT_BE32(out + 16, ctx->state[4]); + ESP_PUT_BE32(out + 20, ctx->state[5]); + ESP_PUT_BE32(out + 24, ctx->state[6]); + + if (!ctx->is224) { + ESP_PUT_BE32(out + 28, ctx->state[7]); + } + + return( 0 ); } -int mbedtls_internal_sha256_process(mbedtls_sha256_context *ctx, const unsigned char data[128]) +int esp_sha256_finish(esp_sha256_t *ctx, void *dest) { - return esp_sha256_update(ctx, data, 64); + util_assert(ctx); + util_assert(dest); + + esp_sha224_finish(ctx, dest); + + return 0; } - -// int mbedtls_sha512_ret(const unsigned char *input, size_t ilen, unsigned char output[64], int is384) -// { - -// } - -#endif /* MBEDTLS_AES_ALT */ diff --git a/components/mbedtls/port/esp8266/sha512.c b/components/mbedtls/port/esp8266/sha512.c index db1ec919..61faf2c1 100644 --- a/components/mbedtls/port/esp8266/sha512.c +++ b/components/mbedtls/port/esp8266/sha512.c @@ -1,75 +1,302 @@ -/** - * \brief AES block cipher, ESP8266 accelerated version - * Based on mbedTLS FIPS-197 compliant version. - * - * Copyright (C) 2006-2015, ARM Limited, All Rights Reserved - * Additions Copyright (C) 2016-2017, Espressif Systems (Shanghai) PTE Ltd - * SPDX-License-Identifier: Apache-2.0 - * - * Licensed under the Apache License, Version 2.0 (the "License"); you may - * not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ +// Copyright 2018 Espressif Systems (Shanghai) PTE LTD +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +#include #include -#include "mbedtls/sha512.h" +#include "util_assert.h" +#include +#include "esp_sha.h" +#include "esp_log.h" -#if defined(MBEDTLS_SHA512_ALT) +#define UL64(x) x##ULL -void mbedtls_sha512_init(mbedtls_sha512_context *ctx) -{ - memset(ctx, 0, sizeof(mbedtls_sha512_context)); +#define SHR(x,n) ((x) >> (n)) +#define ROTR(x,n) (SHR((x),(n)) | ((x) << (64 - (n)))) + +#define S0(x) (ROTR(x, 1) ^ ROTR(x, 8) ^ SHR(x, 7)) +#define S1(x) (ROTR(x,19) ^ ROTR(x,61) ^ SHR(x, 6)) + +#define S2(x) (ROTR(x,28) ^ ROTR(x,34) ^ ROTR(x,39)) +#define S3(x) (ROTR(x,14) ^ ROTR(x,18) ^ ROTR(x,41)) + +#define F0(x,y,z) (((x) & (y)) | ((z) & ((x) | (y)))) +#define F1(x,y,z) ((z) ^ ((x) & ((y) ^ (z)))) + +#define P(a,b,c,d,e,f,g,h,x,K) \ + do \ + { \ + temp1 = (h) + S3(e) + F1((e),(f),(g)) + (K) + (x); \ + temp2 = S2(a) + F0((a),(b),(c)); \ + (d) += temp1; (h) = temp1 + temp2; \ + } while( 0 ) + +#define GET_UINT64_BE(n,b,i) \ +{ \ + (n) = ( (uint64_t) (b)[(i) ] << 56 ) \ + | ( (uint64_t) (b)[(i) + 1] << 48 ) \ + | ( (uint64_t) (b)[(i) + 2] << 40 ) \ + | ( (uint64_t) (b)[(i) + 3] << 32 ) \ + | ( (uint64_t) (b)[(i) + 4] << 24 ) \ + | ( (uint64_t) (b)[(i) + 5] << 16 ) \ + | ( (uint64_t) (b)[(i) + 6] << 8 ) \ + | ( (uint64_t) (b)[(i) + 7] ); \ } -void mbedtls_sha512_free(mbedtls_sha512_context *ctx) -{ - memset(ctx, 0, sizeof(mbedtls_sha512_context)); +#define PUT_UINT64_BE(n,b,i) \ +{ \ + (b)[(i) ] = (uint8_t) ( (n) >> 56 ); \ + (b)[(i) + 1] = (uint8_t) ( (n) >> 48 ); \ + (b)[(i) + 2] = (uint8_t) ( (n) >> 40 ); \ + (b)[(i) + 3] = (uint8_t) ( (n) >> 32 ); \ + (b)[(i) + 4] = (uint8_t) ( (n) >> 24 ); \ + (b)[(i) + 5] = (uint8_t) ( (n) >> 16 ); \ + (b)[(i) + 6] = (uint8_t) ( (n) >> 8 ); \ + (b)[(i) + 7] = (uint8_t) ( (n) ); \ } -void mbedtls_sha512_clone(mbedtls_sha512_context *dst, const mbedtls_sha512_context *src) +static const uint64_t K[80] = { - memcpy(dst, src, sizeof(mbedtls_sha512_context)); + UL64(0x428A2F98D728AE22), UL64(0x7137449123EF65CD), + UL64(0xB5C0FBCFEC4D3B2F), UL64(0xE9B5DBA58189DBBC), + UL64(0x3956C25BF348B538), UL64(0x59F111F1B605D019), + UL64(0x923F82A4AF194F9B), UL64(0xAB1C5ED5DA6D8118), + UL64(0xD807AA98A3030242), UL64(0x12835B0145706FBE), + UL64(0x243185BE4EE4B28C), UL64(0x550C7DC3D5FFB4E2), + UL64(0x72BE5D74F27B896F), UL64(0x80DEB1FE3B1696B1), + UL64(0x9BDC06A725C71235), UL64(0xC19BF174CF692694), + UL64(0xE49B69C19EF14AD2), UL64(0xEFBE4786384F25E3), + UL64(0x0FC19DC68B8CD5B5), UL64(0x240CA1CC77AC9C65), + UL64(0x2DE92C6F592B0275), UL64(0x4A7484AA6EA6E483), + UL64(0x5CB0A9DCBD41FBD4), UL64(0x76F988DA831153B5), + UL64(0x983E5152EE66DFAB), UL64(0xA831C66D2DB43210), + UL64(0xB00327C898FB213F), UL64(0xBF597FC7BEEF0EE4), + UL64(0xC6E00BF33DA88FC2), UL64(0xD5A79147930AA725), + UL64(0x06CA6351E003826F), UL64(0x142929670A0E6E70), + UL64(0x27B70A8546D22FFC), UL64(0x2E1B21385C26C926), + UL64(0x4D2C6DFC5AC42AED), UL64(0x53380D139D95B3DF), + UL64(0x650A73548BAF63DE), UL64(0x766A0ABB3C77B2A8), + UL64(0x81C2C92E47EDAEE6), UL64(0x92722C851482353B), + UL64(0xA2BFE8A14CF10364), UL64(0xA81A664BBC423001), + UL64(0xC24B8B70D0F89791), UL64(0xC76C51A30654BE30), + UL64(0xD192E819D6EF5218), UL64(0xD69906245565A910), + UL64(0xF40E35855771202A), UL64(0x106AA07032BBD1B8), + UL64(0x19A4C116B8D2D0C8), UL64(0x1E376C085141AB53), + UL64(0x2748774CDF8EEB99), UL64(0x34B0BCB5E19B48A8), + UL64(0x391C0CB3C5C95A63), UL64(0x4ED8AA4AE3418ACB), + UL64(0x5B9CCA4F7763E373), UL64(0x682E6FF3D6B2B8A3), + UL64(0x748F82EE5DEFB2FC), UL64(0x78A5636F43172F60), + UL64(0x84C87814A1F0AB72), UL64(0x8CC702081A6439EC), + UL64(0x90BEFFFA23631E28), UL64(0xA4506CEBDE82BDE9), + UL64(0xBEF9A3F7B2C67915), UL64(0xC67178F2E372532B), + UL64(0xCA273ECEEA26619C), UL64(0xD186B8C721C0C207), + UL64(0xEADA7DD6CDE0EB1E), UL64(0xF57D4F7FEE6ED178), + UL64(0x06F067AA72176FBA), UL64(0x0A637DC5A2C898A6), + UL64(0x113F9804BEF90DAE), UL64(0x1B710B35131C471B), + UL64(0x28DB77F523047D84), UL64(0x32CAAB7B40C72493), + UL64(0x3C9EBE0A15C9BEBC), UL64(0x431D67C49C100D4C), + UL64(0x4CC5D4BECB3E42B6), UL64(0x597F299CFC657E2A), + UL64(0x5FCB6FAB3AD6FAEC), UL64(0x6C44198C4A475817) +}; + +static int esp_sha512_transform(esp_sha512_t *ctx, const uint8_t *data) +{ + int i; + uint64_t temp1, temp2, W[80]; + uint64_t A, B, C, D, E, F, G, H; + + for( i = 0; i < 16; i++ ) { + GET_UINT64_BE(W[i], data, i << 3); + } + + for( ; i < 80; i++ ) + W[i] = S1(W[i - 2]) + W[i - 7] + S0(W[i - 15]) + W[i - 16]; + + A = ctx->state[0]; + B = ctx->state[1]; + C = ctx->state[2]; + D = ctx->state[3]; + E = ctx->state[4]; + F = ctx->state[5]; + G = ctx->state[6]; + H = ctx->state[7]; + i = 0; + + do { + P(A, B, C, D, E, F, G, H, W[i], K[i]); i++; + P(H, A, B, C, D, E, F, G, W[i], K[i]); i++; + P(G, H, A, B, C, D, E, F, W[i], K[i]); i++; + P(F, G, H, A, B, C, D, E, W[i], K[i]); i++; + P(E, F, G, H, A, B, C, D, W[i], K[i]); i++; + P(D, E, F, G, H, A, B, C, W[i], K[i]); i++; + P(C, D, E, F, G, H, A, B, W[i], K[i]); i++; + P(B, C, D, E, F, G, H, A, W[i], K[i]); i++; + } while (i < 80); + + ctx->state[0] += A; + ctx->state[1] += B; + ctx->state[2] += C; + ctx->state[3] += D; + ctx->state[4] += E; + ctx->state[5] += F; + ctx->state[6] += G; + ctx->state[7] += H; + + return( 0 ); } -int mbedtls_sha512_starts_ret(mbedtls_sha512_context *ctx, int is384) +int esp_sha512_init(esp_sha512_t *ctx) { - int ret; + util_assert(ctx); - if (is384) - ret = esp_sha384_init(ctx); - else - ret = esp_sha512_init(ctx); + ctx->is384 = 0; - return ret; + ctx->total[0] = 0; + ctx->total[1] = 0; + + ctx->state[0] = UL64(0x6A09E667F3BCC908); + ctx->state[1] = UL64(0xBB67AE8584CAA73B); + ctx->state[2] = UL64(0x3C6EF372FE94F82B); + ctx->state[3] = UL64(0xA54FF53A5F1D36F1); + ctx->state[4] = UL64(0x510E527FADE682D1); + ctx->state[5] = UL64(0x9B05688C2B3E6C1F); + ctx->state[6] = UL64(0x1F83D9ABFB41BD6B); + ctx->state[7] = UL64(0x5BE0CD19137E2179); + + return 0; } -int mbedtls_sha512_update_ret(mbedtls_sha512_context *ctx, const unsigned char *input, size_t ilen) +int esp_sha384_init(esp_sha384_t *ctx) { - return esp_sha512_update(ctx, input, ilen); + util_assert(ctx); + + ctx->is384 = 1; + + ctx->total[0] = 0; + ctx->total[1] = 0; + + ctx->state[0] = UL64(0xCBBB9D5DC1059ED8); + ctx->state[1] = UL64(0x629A292A367CD507); + ctx->state[2] = UL64(0x9159015A3070DD17); + ctx->state[3] = UL64(0x152FECD8F70E5939); + ctx->state[4] = UL64(0x67332667FFC00B31); + ctx->state[5] = UL64(0x8EB44A8768581511); + ctx->state[6] = UL64(0xDB0C2E0D64F98FA7); + ctx->state[7] = UL64(0x47B5481DBEFA4FA4); + + return 0; } -int mbedtls_sha512_finish_ret(mbedtls_sha512_context *ctx, unsigned char output[64]) +int esp_sha512_update(esp_sha512_t *ctx, const void *src, size_t size) { - return esp_sha512_finish(ctx, output); + size_t fill; + uint32_t left; + const uint8_t *input = (const uint8_t *)src; + + util_assert(ctx); + util_assert(src); + util_assert(size); + + left = (uint32_t) (ctx->total[0] & 0x7F); + fill = 128 - left; + + ctx->total[0] += (uint64_t)size; + + if( ctx->total[0] < (uint64_t)size) + ctx->total[1]++; + + if (left && size >= fill) { + memcpy(ctx->buffer + left, input, fill); + + esp_sha512_transform(ctx, ctx->buffer); + + input += fill; + size -= fill; + left = 0; + } + + while (size >= 128) { + esp_sha512_transform(ctx, input); + + input += 128; + size -= 128; + } + + if (size > 0) + memcpy((void *) (ctx->buffer + left), input, size); + + return( 0 ); } -int mbedtls_internal_sha512_process(mbedtls_sha512_context *ctx, const unsigned char data[128]) +int esp_sha384_update(esp_sha384_t *ctx, const void *src, size_t size) { - return esp_sha512_update(ctx, data, 128); + util_assert(ctx); + util_assert(src); + util_assert(size); + + return esp_sha512_update(ctx, src, size); } -// int mbedtls_sha512_ret(const unsigned char *input, size_t ilen, unsigned char output[64], int is384) -// { - -// } +int esp_sha384_finish(esp_sha384_t *ctx, void *dest) +{ + uint8_t used; + uint64_t high, low; + uint8_t *output = (uint8_t *)dest; -#endif /* MBEDTLS_AES_ALT */ + util_assert(ctx); + util_assert(dest); + + used = ctx->total[0] & 0x7F; + + ctx->buffer[used++] = 0x80; + + if (used <= 112) + memset(ctx->buffer + used, 0, 112 - used); + else { + memset(ctx->buffer + used, 0, 128 - used); + esp_sha512_transform(ctx, ctx->buffer); + memset(ctx->buffer, 0, 112); + } + + high = (ctx->total[0] >> 61) | (ctx->total[1] << 3); + low = (ctx->total[0] << 3); + + PUT_UINT64_BE(high, ctx->buffer, 112); + PUT_UINT64_BE(low, ctx->buffer, 120); + + esp_sha512_transform(ctx, ctx->buffer); + + PUT_UINT64_BE(ctx->state[0], output, 0); + PUT_UINT64_BE(ctx->state[1], output, 8); + PUT_UINT64_BE(ctx->state[2], output, 16); + PUT_UINT64_BE(ctx->state[3], output, 24); + PUT_UINT64_BE(ctx->state[4], output, 32); + PUT_UINT64_BE(ctx->state[5], output, 40); + + if (!ctx->is384) { + PUT_UINT64_BE(ctx->state[6], output, 48); + PUT_UINT64_BE(ctx->state[7], output, 56); + } + + return 0; +} + +int esp_sha512_finish(esp_sha512_t *ctx, void *dest) +{ + util_assert(ctx); + util_assert(dest); + + esp_sha384_finish(ctx, dest); + + return 0; +} diff --git a/components/mbedtls/port/esp_aes.c b/components/mbedtls/port/esp_aes.c new file mode 100644 index 00000000..5ba2e283 --- /dev/null +++ b/components/mbedtls/port/esp_aes.c @@ -0,0 +1,181 @@ +/** + * \brief AES block cipher, ESP8266 accelerated version + * Based on mbedTLS FIPS-197 compliant version. + * + * Copyright (C) 2006-2015, ARM Limited, All Rights Reserved + * Additions Copyright (C) 2016-2017, Espressif Systems (Shanghai) PTE Ltd + * SPDX-License-Identifier: Apache-2.0 + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include "mbedtls/aes.h" + +#if defined(MBEDTLS_AES_ALT) + +void mbedtls_aes_init(mbedtls_aes_context *ctx) +{ + memset(ctx, 0, sizeof(mbedtls_aes_context)); +} + +void mbedtls_aes_free(mbedtls_aes_context *ctx) +{ + memset(ctx, 0, sizeof(mbedtls_aes_context)); +} + +#if defined(MBEDTLS_CIPHER_MODE_XTS) +void mbedtls_aes_xts_init(mbedtls_aes_xts_context *ctx) +{ + memset(ctx, 0, sizeof(mbedtls_aes_xts_context)); +} + +void mbedtls_aes_xts_free(mbedtls_aes_xts_context *ctx) +{ + memset(ctx, 0, sizeof(mbedtls_aes_xts_context)); +} + +int mbedtls_aes_xts_setkey_enc(mbedtls_aes_xts_context *ctx, + const unsigned char *key, + unsigned int keybits) +{ + return esp_aes_xts_set_encrypt_key(ctx, key, keybits); +} + +int mbedtls_aes_xts_setkey_dec(mbedtls_aes_xts_context *ctx, + const unsigned char *key, + unsigned int keybits) +{ + return esp_aes_xts_set_decrypt_key(ctx, key, keybits); +} + +int mbedtls_aes_crypt_xts(mbedtls_aes_xts_context *ctx, + int mode, + size_t length, + const unsigned char data_unit[16], + const unsigned char *input, + unsigned char *output) +{ + return esp_aes_crypt_xts(ctx, MBEDTLS_AES_ENCRYPT == mode, length, data_unit, input, output); +} +#endif + +int mbedtls_aes_setkey_enc(mbedtls_aes_context *ctx, const unsigned char *key, + unsigned int keybits) +{ + return esp_aes_set_encrypt_key(ctx, key, keybits); +} + +int mbedtls_aes_setkey_dec(mbedtls_aes_context *ctx, const unsigned char *key, + unsigned int keybits) +{ + return esp_aes_set_decrypt_key(ctx, key, keybits); +} + +int mbedtls_aes_crypt_ecb(mbedtls_aes_context *ctx, + int mode, + const unsigned char input[16], + unsigned char output[16]) +{ + if (MBEDTLS_AES_DECRYPT == mode) + return esp_aes_decrypt_ecb(ctx, input, output); + else + return esp_aes_encrypt_ecb(ctx, input, output); +} + +#if defined(MBEDTLS_CIPHER_MODE_CBC) +int mbedtls_aes_crypt_cbc(mbedtls_aes_context *ctx, + int mode, + size_t length, + unsigned char iv[16], + const unsigned char *input, + unsigned char *output) +{ + if (MBEDTLS_AES_DECRYPT == mode) + return esp_aes_decrypt_cbc(ctx, input, length, output, length, iv); + else + return esp_aes_encrypt_cbc(ctx, input, length, output, length, iv); +} +#endif + +#if defined(MBEDTLS_CIPHER_MODE_CFB) +int mbedtls_aes_crypt_cfb128(mbedtls_aes_context *ctx, + int mode, + size_t length, + size_t *iv_off, + unsigned char iv[16], + const unsigned char *input, + unsigned char *output) +{ + if (MBEDTLS_AES_DECRYPT == mode) + return esp_aes_decrypt_cfb128(ctx, input, length, output, length, iv, iv_off); + else + return esp_aes_encrypt_cfb128(ctx, input, length, output, length, iv, iv_off); +} + +int mbedtls_aes_crypt_cfb8(mbedtls_aes_context *ctx, + int mode, + size_t length, + unsigned char iv[16], + const unsigned char *input, + unsigned char *output) +{ + if (MBEDTLS_AES_DECRYPT == mode) + return esp_aes_decrypt_cfb8(ctx, input, length, output, length, iv); + else + return esp_aes_encrypt_cfb8(ctx, input, length, output, length, iv); +} +#endif + +#if defined(MBEDTLS_CIPHER_MODE_OFB) +int mbedtls_aes_crypt_ofb(mbedtls_aes_context *ctx, + size_t length, + size_t *iv_off, + unsigned char iv[16], + const unsigned char *input, + unsigned char *output) +{ + return esp_aes_crypt_ofb(ctx, length, iv_off, iv, input, output); +} +#endif + +#if defined(MBEDTLS_CIPHER_MODE_CTR) +int mbedtls_aes_crypt_ctr(mbedtls_aes_context *ctx, + size_t length, + size_t *nc_off, + unsigned char nonce_counter[16], + unsigned char stream_block[16], + const unsigned char *input, + unsigned char *output) +{ + return esp_aes_encrypt_ctr(ctx, nc_off, nonce_counter, stream_block, input, + length, output, length); +} +#endif + +int mbedtls_internal_aes_encrypt(mbedtls_aes_context *ctx, + const unsigned char input[16], + unsigned char output[16]) +{ + return esp_aes_encrypt(ctx, input, 16, output, 16); +} + +int mbedtls_internal_aes_decrypt(mbedtls_aes_context *ctx, + const unsigned char input[16], + unsigned char output[16]) +{ + return esp_aes_decrypt(ctx, input, 16, output, 16); +} + +#endif /* MBEDTLS_AES_ALT */ diff --git a/components/mbedtls/port/esp_sha1.c b/components/mbedtls/port/esp_sha1.c new file mode 100644 index 00000000..45a63d60 --- /dev/null +++ b/components/mbedtls/port/esp_sha1.c @@ -0,0 +1,68 @@ +/** + * \brief AES block cipher, ESP8266 accelerated version + * Based on mbedTLS FIPS-197 compliant version. + * + * Copyright (C) 2006-2015, ARM Limited, All Rights Reserved + * Additions Copyright (C) 2016-2017, Espressif Systems (Shanghai) PTE Ltd + * SPDX-License-Identifier: Apache-2.0 + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include "mbedtls/sha1.h" + +#if defined(MBEDTLS_SHA1_ALT) + +void mbedtls_sha1_init(mbedtls_sha1_context *ctx) +{ + memset(ctx, 0, sizeof(mbedtls_sha1_context)); +} + +void mbedtls_sha1_free(mbedtls_sha1_context *ctx) +{ + memset(ctx, 0, sizeof(mbedtls_sha1_context)); +} + +void mbedtls_sha1_clone(mbedtls_sha1_context *dst, const mbedtls_sha1_context *src) +{ + memcpy(dst, src, sizeof(mbedtls_sha1_context)); +} + +int mbedtls_sha1_starts_ret(mbedtls_sha1_context *ctx) +{ + return esp_sha1_init(ctx); +} + +int mbedtls_sha1_update_ret(mbedtls_sha1_context *ctx, const unsigned char *input, size_t ilen) +{ + return esp_sha1_update(ctx, input, ilen); +} + +int mbedtls_sha1_finish_ret(mbedtls_sha1_context *ctx, unsigned char output[64]) +{ + return esp_sha1_finish(ctx, output); +} + +int mbedtls_internal_sha1_process(mbedtls_sha1_context *ctx, const unsigned char data[128]) +{ + return esp_sha1_update(ctx, data, 64); +} + +// int mbedtls_sha512_ret(const unsigned char *input, size_t ilen, unsigned char output[64], int is384) +// { + +// } + +#endif /* MBEDTLS_AES_ALT */ diff --git a/components/mbedtls/port/esp_sha256.c b/components/mbedtls/port/esp_sha256.c new file mode 100644 index 00000000..2e8f8448 --- /dev/null +++ b/components/mbedtls/port/esp_sha256.c @@ -0,0 +1,75 @@ +/** + * \brief AES block cipher, ESP8266 accelerated version + * Based on mbedTLS FIPS-197 compliant version. + * + * Copyright (C) 2006-2015, ARM Limited, All Rights Reserved + * Additions Copyright (C) 2016-2017, Espressif Systems (Shanghai) PTE Ltd + * SPDX-License-Identifier: Apache-2.0 + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include "mbedtls/sha256.h" + +#if defined(MBEDTLS_SHA256_ALT) + +void mbedtls_sha256_init(mbedtls_sha256_context *ctx) +{ + memset(ctx, 0, sizeof(mbedtls_sha256_context)); +} + +void mbedtls_sha256_free(mbedtls_sha256_context *ctx) +{ + memset(ctx, 0, sizeof(mbedtls_sha256_context)); +} + +void mbedtls_sha256_clone(mbedtls_sha256_context *dst, const mbedtls_sha256_context *src) +{ + memcpy(dst, src, sizeof(mbedtls_sha256_context)); +} + +int mbedtls_sha256_starts_ret(mbedtls_sha256_context *ctx, int is224) +{ + int ret; + + if (is224) + ret = esp_sha224_init(ctx); + else + ret = esp_sha256_init(ctx); + + return ret; +} + +int mbedtls_sha256_update_ret(mbedtls_sha256_context *ctx, const unsigned char *input, size_t ilen) +{ + return esp_sha256_update(ctx, input, ilen); +} + +int mbedtls_sha256_finish_ret(mbedtls_sha256_context *ctx, unsigned char output[64]) +{ + return esp_sha256_finish(ctx, output); +} + +int mbedtls_internal_sha256_process(mbedtls_sha256_context *ctx, const unsigned char data[128]) +{ + return esp_sha256_update(ctx, data, 64); +} + +// int mbedtls_sha512_ret(const unsigned char *input, size_t ilen, unsigned char output[64], int is384) +// { + +// } + +#endif /* MBEDTLS_AES_ALT */ diff --git a/components/mbedtls/port/esp_sha512.c b/components/mbedtls/port/esp_sha512.c new file mode 100644 index 00000000..db1ec919 --- /dev/null +++ b/components/mbedtls/port/esp_sha512.c @@ -0,0 +1,75 @@ +/** + * \brief AES block cipher, ESP8266 accelerated version + * Based on mbedTLS FIPS-197 compliant version. + * + * Copyright (C) 2006-2015, ARM Limited, All Rights Reserved + * Additions Copyright (C) 2016-2017, Espressif Systems (Shanghai) PTE Ltd + * SPDX-License-Identifier: Apache-2.0 + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include "mbedtls/sha512.h" + +#if defined(MBEDTLS_SHA512_ALT) + +void mbedtls_sha512_init(mbedtls_sha512_context *ctx) +{ + memset(ctx, 0, sizeof(mbedtls_sha512_context)); +} + +void mbedtls_sha512_free(mbedtls_sha512_context *ctx) +{ + memset(ctx, 0, sizeof(mbedtls_sha512_context)); +} + +void mbedtls_sha512_clone(mbedtls_sha512_context *dst, const mbedtls_sha512_context *src) +{ + memcpy(dst, src, sizeof(mbedtls_sha512_context)); +} + +int mbedtls_sha512_starts_ret(mbedtls_sha512_context *ctx, int is384) +{ + int ret; + + if (is384) + ret = esp_sha384_init(ctx); + else + ret = esp_sha512_init(ctx); + + return ret; +} + +int mbedtls_sha512_update_ret(mbedtls_sha512_context *ctx, const unsigned char *input, size_t ilen) +{ + return esp_sha512_update(ctx, input, ilen); +} + +int mbedtls_sha512_finish_ret(mbedtls_sha512_context *ctx, unsigned char output[64]) +{ + return esp_sha512_finish(ctx, output); +} + +int mbedtls_internal_sha512_process(mbedtls_sha512_context *ctx, const unsigned char data[128]) +{ + return esp_sha512_update(ctx, data, 128); +} + +// int mbedtls_sha512_ret(const unsigned char *input, size_t ilen, unsigned char output[64], int is384) +// { + +// } + +#endif /* MBEDTLS_AES_ALT */ diff --git a/components/mbedtls/port/esp8266/include/aes_alt.h b/components/mbedtls/port/include/aes_alt.h similarity index 100% rename from components/mbedtls/port/esp8266/include/aes_alt.h rename to components/mbedtls/port/include/aes_alt.h diff --git a/components/mbedtls/port/esp8266/include/arc4_alt.h b/components/mbedtls/port/include/arc4_alt.h similarity index 100% rename from components/mbedtls/port/esp8266/include/arc4_alt.h rename to components/mbedtls/port/include/arc4_alt.h diff --git a/components/util/include/esp_aes.h b/components/mbedtls/port/include/esp8266/esp_aes.h similarity index 100% rename from components/util/include/esp_aes.h rename to components/mbedtls/port/include/esp8266/esp_aes.h diff --git a/components/util/include/esp_arc4.h b/components/mbedtls/port/include/esp8266/esp_arc4.h similarity index 100% rename from components/util/include/esp_arc4.h rename to components/mbedtls/port/include/esp8266/esp_arc4.h diff --git a/components/util/include/esp_base64.h b/components/mbedtls/port/include/esp8266/esp_base64.h similarity index 100% rename from components/util/include/esp_base64.h rename to components/mbedtls/port/include/esp8266/esp_base64.h diff --git a/components/util/include/esp_md5.h b/components/mbedtls/port/include/esp8266/esp_md5.h similarity index 100% rename from components/util/include/esp_md5.h rename to components/mbedtls/port/include/esp8266/esp_md5.h diff --git a/components/mbedtls/port/esp8266/include/md5_alt.h b/components/mbedtls/port/include/md5_alt.h similarity index 100% rename from components/mbedtls/port/esp8266/include/md5_alt.h rename to components/mbedtls/port/include/md5_alt.h diff --git a/components/mbedtls/port/esp8266/include/sha1_alt.h b/components/mbedtls/port/include/sha1_alt.h similarity index 100% rename from components/mbedtls/port/esp8266/include/sha1_alt.h rename to components/mbedtls/port/include/sha1_alt.h diff --git a/components/mbedtls/port/esp8266/include/sha256_alt.h b/components/mbedtls/port/include/sha256_alt.h similarity index 100% rename from components/mbedtls/port/esp8266/include/sha256_alt.h rename to components/mbedtls/port/include/sha256_alt.h diff --git a/components/mbedtls/port/esp8266/include/sha512_alt.h b/components/mbedtls/port/include/sha512_alt.h similarity index 100% rename from components/mbedtls/port/esp8266/include/sha512_alt.h rename to components/mbedtls/port/include/sha512_alt.h diff --git a/components/util/test/test_aes.c b/components/mbedtls/test/test_aes.c similarity index 100% rename from components/util/test/test_aes.c rename to components/mbedtls/test/test_aes.c diff --git a/components/util/test/test_arc4.c b/components/mbedtls/test/test_arc4.c similarity index 100% rename from components/util/test/test_arc4.c rename to components/mbedtls/test/test_arc4.c diff --git a/components/util/test/test_base64.c b/components/mbedtls/test/test_base64.c similarity index 100% rename from components/util/test/test_base64.c rename to components/mbedtls/test/test_base64.c diff --git a/components/util/test/test_crc.c b/components/mbedtls/test/test_crc.c similarity index 99% rename from components/util/test/test_crc.c rename to components/mbedtls/test/test_crc.c index 525758dd..a67aaea8 100644 --- a/components/util/test/test_crc.c +++ b/components/mbedtls/test/test_crc.c @@ -15,7 +15,7 @@ #include #include #include -#include "crc.h" +#include "rom/crc.h" #include "unity.h" #define TEST_CRC_COUNT 4096 diff --git a/components/util/test/test_md5.c b/components/mbedtls/test/test_md5.c similarity index 100% rename from components/util/test/test_md5.c rename to components/mbedtls/test/test_md5.c diff --git a/components/util/test/test_sha.c b/components/mbedtls/test/test_sha.c similarity index 100% rename from components/util/test/test_sha.c rename to components/mbedtls/test/test_sha.c diff --git a/components/nvs_flash/CMakeLists.txt b/components/nvs_flash/CMakeLists.txt index abd3f4ce..b36e6ba5 100644 --- a/components/nvs_flash/CMakeLists.txt +++ b/components/nvs_flash/CMakeLists.txt @@ -1,6 +1,6 @@ set(COMPONENT_SRCDIRS "src") set(COMPONENT_ADD_INCLUDEDIRS "include") -set(COMPONENT_PRIV_REQUIRES "spi_flash" "util") +set(COMPONENT_PRIV_REQUIRES "spi_flash") register_component() diff --git a/components/nvs_flash/component.mk b/components/nvs_flash/component.mk index 269ed7db..20b0ec40 100755 --- a/components/nvs_flash/component.mk +++ b/components/nvs_flash/component.mk @@ -6,4 +6,4 @@ COMPONENT_ADD_INCLUDEDIRS := include COMPONENT_SRCDIRS := src -CPPFLAGS += -DNVS_CRC_HEADER_FILE=\"crc.h\" +CPPFLAGS += -DNVS_CRC_HEADER_FILE=\"rom/crc.h\" diff --git a/components/nvs_flash/src/nvs_page.cpp b/components/nvs_flash/src/nvs_page.cpp index 67fdfdd0..acbae535 100644 --- a/components/nvs_flash/src/nvs_page.cpp +++ b/components/nvs_flash/src/nvs_page.cpp @@ -12,11 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. #include "nvs_page.hpp" -#if defined(ESP_PLATFORM) #include -#else -#include "crc.h" -#endif #include #include diff --git a/components/nvs_flash/src/nvs_types.cpp b/components/nvs_flash/src/nvs_types.cpp index d44d8b29..8a1a42fb 100644 --- a/components/nvs_flash/src/nvs_types.cpp +++ b/components/nvs_flash/src/nvs_types.cpp @@ -13,11 +13,7 @@ // limitations under the License. #include "nvs_types.hpp" -#if defined(ESP_PLATFORM) #include -#else -#include "crc.h" -#endif namespace nvs { diff --git a/components/util/CMakeLists.txt b/components/util/CMakeLists.txt deleted file mode 100644 index db267c85..00000000 --- a/components/util/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -set(COMPONENT_SRCDIRS "src") -set(COMPONENT_ADD_INCLUDEDIRS "include") - -register_component() - -if(NOT BOOTLOADER_BUILD) -target_compile_definitions(${COMPONENT_LIB} PUBLIC -DUSING_IBUS_FASTER_GET) -endif() diff --git a/components/util/Kconfig b/components/util/Kconfig deleted file mode 100644 index 676a956a..00000000 --- a/components/util/Kconfig +++ /dev/null @@ -1,69 +0,0 @@ -menu "Util" - -config util_assert - bool "Enable assert for util components" - default n - help - Enable this option, util components will use assert to check if input - parameters are correct. - - Disable this option will speed up the process of some calculation a lot. - -config ESP_SHA - bool "Enable Espressif SHA" - default n - help - Enable Espressif SHA1, SHA256, SHA384 & SHA512 for other components to - save code size for ESP8285(ESP8266 + 1MB flash) users. - - Although this option is disable, bootloader will use it if booloader - is configured to use SHA256 to check hash. - - Disabling the "assert" function at menuconfig can speed up the calculation. - -config ESP_AES - bool "Enable Espressif AES" - default y - help - Enable Espressif AES ECB, CBC, CFB128, CFB8 & CRT for other components to - speed up process speed and save code size. - - ESP8285 is like ESP8266 + 1MB flash, but its internal I/O connection from CPU - core to flash is DIO not QIO, which makes it read flash data slower. - So the function will speed up ESP8285 obviously. - - The calculation uses "ibus_data" to speed up load data from instruction bus. - - Disabling the "assert" function at menuconfig can speed up the calculation. - -config ESP_MD5 - bool "Enable Espressif MD5" - default y - help - Enable Espressif MD5 for other components to - speed up process speed and save code size. - - ESP8285 is like ESP8266 + 1MB flash, but its internal I/O connection from CPU - core to flash is DIO not QIO, which makes it read flash data slower. - So the function will speed up ESP8285 obviously. - - The calculation uses "ibus_data" to speed up load data from instruction bus. - - Disabling the "assert" function at menuconfig can speed up the calculation. - -config ESP_ARC4 - bool "Enable Espressif ARC4" - default y - help - Enable Espressif ARC4 for other components to - speed up process speed and save code size. - - ESP8285 is like ESP8266 + 1MB flash, but its internal I/O connection from CPU - core to flash is DIO not QIO, which makes it read flash data slower. - So the function will speed up ESP8285 obviously. - - The calculation uses "ibus_data" to speed up load data from instruction bus. - - Disabling the "assert" function at menuconfig can speed up the calculation. - -endmenu # Util diff --git a/components/util/component.mk b/components/util/component.mk deleted file mode 100644 index 8221403a..00000000 --- a/components/util/component.mk +++ /dev/null @@ -1,11 +0,0 @@ -# -# Component Makefile -# - -COMPONENT_ADD_INCLUDEDIRS := include - -COMPONENT_SRCDIRS := src - -ifndef IS_BOOTLOADER_BUILD -CFLAGS += -DUSING_IBUS_FASTER_GET -endif diff --git a/components/util/include/crc.h b/components/util/include/crc.h deleted file mode 100644 index eeedc0cc..00000000 --- a/components/util/include/crc.h +++ /dev/null @@ -1,17 +0,0 @@ -// Copyright 2019-2020 Espressif Systems (Shanghai) PTE LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at - -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#pragma once - -#include "esp_crc.h" diff --git a/components/util/src/aes.c b/components/util/src/aes.c deleted file mode 100644 index 1e0ea5b9..00000000 --- a/components/util/src/aes.c +++ /dev/null @@ -1,1045 +0,0 @@ -// Copyright 2018-2019 Espressif Systems (Shanghai) PTE LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at - -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include -#include -#include "esp_aes.h" -#include "ibus_data.h" -#include "util_assert.h" - -/* - * 32-bit integer manipulation macros (little endian) - */ -#ifndef GET_UINT32_LE -#define GET_UINT32_LE(n, b, i) \ -{ \ - (n) = ((uint32_t)(b)[(i) + 0] << 0) \ - | ((uint32_t)(b)[(i) + 1] << 8) \ - | ((uint32_t)(b)[(i) + 2] << 16) \ - | ((uint32_t)(b)[(i) + 3] << 24); \ -} -#endif - -#ifndef PUT_UINT32_LE -#define PUT_UINT32_LE(n, b, i) \ -{ \ - (b)[(i) + 0] = (uint8_t)(((n) >> 0) & 0xFF); \ - (b)[(i) + 1] = (uint8_t)(((n) >> 8) & 0xFF); \ - (b)[(i) + 2] = (uint8_t)(((n) >> 16) & 0xFF); \ - (b)[(i) + 3] = (uint8_t)(((n) >> 24) & 0xFF); \ -} -#endif - -#undef AES_FROUND -#define AES_FROUND(X0,X1,X2,X3,Y0,Y1,Y2,Y3) \ -{ \ - X0 = *RK++ ^ s_aes_ft0[(Y0 >> 0) & 0xFF] \ - ^ s_aes_ft1[(Y1 >> 8) & 0xFF] \ - ^ s_aes_ft2[(Y2 >> 16) & 0xFF] \ - ^ s_aes_ft3[(Y3 >> 24) & 0xFF]; \ - \ - X1 = *RK++ ^ s_aes_ft0[(Y1 >> 0) & 0xFF] \ - ^ s_aes_ft1[(Y2 >> 8) & 0xFF] \ - ^ s_aes_ft2[(Y3 >> 16) & 0xFF] \ - ^ s_aes_ft3[(Y0 >> 24) & 0xFF]; \ - \ - X2 = *RK++ ^ s_aes_ft0[(Y2 >> 0) & 0xFF] \ - ^ s_aes_ft1[(Y3 >> 8) & 0xFF] \ - ^ s_aes_ft2[(Y0 >> 16) & 0xFF] \ - ^ s_aes_ft3[(Y1 >> 24) & 0xFF]; \ - \ - X3 = *RK++ ^ s_aes_ft0[(Y3 >> 0) & 0xFF] \ - ^ s_aes_ft1[(Y0 >> 8) & 0xFF] \ - ^ s_aes_ft2[(Y1 >> 16) & 0xFF] \ - ^ s_aes_ft3[(Y2 >> 24) & 0xFF]; \ -} - -#undef AES_RROUND -#define AES_RROUND(X0,X1,X2,X3,Y0,Y1,Y2,Y3) \ -{ \ - X0 = *RK++ ^ s_aes_rt0[(Y0 >> 0) & 0xFF] \ - ^ s_aes_rt1[(Y3 >> 8) & 0xFF] \ - ^ s_aes_rt2[(Y2 >> 16) & 0xFF] \ - ^ s_aes_rt3[(Y1 >> 24) & 0xFF]; \ - \ - X1 = *RK++ ^ s_aes_rt0[(Y1 >> 0) & 0xFF] \ - ^ s_aes_rt1[(Y0 >> 8) & 0xFF] \ - ^ s_aes_rt2[(Y3 >> 16) & 0xFF] \ - ^ s_aes_rt3[(Y2 >> 24) & 0xFF]; \ - \ - X2 = *RK++ ^ s_aes_rt0[(Y2 >> 0) & 0xFF] \ - ^ s_aes_rt1[(Y1 >> 8) & 0xFF] \ - ^ s_aes_rt2[(Y0 >> 16) & 0xFF] \ - ^ s_aes_rt3[(Y3 >> 24) & 0xFF]; \ - \ - X3 = *RK++ ^ s_aes_rt0[(Y3 >> 0) & 0xFF] \ - ^ s_aes_rt1[(Y2 >> 8) & 0xFF] \ - ^ s_aes_rt2[(Y1 >> 16) & 0xFF] \ - ^ s_aes_rt3[(Y0 >> 24) & 0xFF]; \ -} - -/* - * Forward S-box - */ -static const uint8_t s_aes_fsb[256] ESP_IBUS_ATTR = -{ - 0x63, 0x7C, 0x77, 0x7B, 0xF2, 0x6B, 0x6F, 0xC5, - 0x30, 0x01, 0x67, 0x2B, 0xFE, 0xD7, 0xAB, 0x76, - 0xCA, 0x82, 0xC9, 0x7D, 0xFA, 0x59, 0x47, 0xF0, - 0xAD, 0xD4, 0xA2, 0xAF, 0x9C, 0xA4, 0x72, 0xC0, - 0xB7, 0xFD, 0x93, 0x26, 0x36, 0x3F, 0xF7, 0xCC, - 0x34, 0xA5, 0xE5, 0xF1, 0x71, 0xD8, 0x31, 0x15, - 0x04, 0xC7, 0x23, 0xC3, 0x18, 0x96, 0x05, 0x9A, - 0x07, 0x12, 0x80, 0xE2, 0xEB, 0x27, 0xB2, 0x75, - 0x09, 0x83, 0x2C, 0x1A, 0x1B, 0x6E, 0x5A, 0xA0, - 0x52, 0x3B, 0xD6, 0xB3, 0x29, 0xE3, 0x2F, 0x84, - 0x53, 0xD1, 0x00, 0xED, 0x20, 0xFC, 0xB1, 0x5B, - 0x6A, 0xCB, 0xBE, 0x39, 0x4A, 0x4C, 0x58, 0xCF, - 0xD0, 0xEF, 0xAA, 0xFB, 0x43, 0x4D, 0x33, 0x85, - 0x45, 0xF9, 0x02, 0x7F, 0x50, 0x3C, 0x9F, 0xA8, - 0x51, 0xA3, 0x40, 0x8F, 0x92, 0x9D, 0x38, 0xF5, - 0xBC, 0xB6, 0xDA, 0x21, 0x10, 0xFF, 0xF3, 0xD2, - 0xCD, 0x0C, 0x13, 0xEC, 0x5F, 0x97, 0x44, 0x17, - 0xC4, 0xA7, 0x7E, 0x3D, 0x64, 0x5D, 0x19, 0x73, - 0x60, 0x81, 0x4F, 0xDC, 0x22, 0x2A, 0x90, 0x88, - 0x46, 0xEE, 0xB8, 0x14, 0xDE, 0x5E, 0x0B, 0xDB, - 0xE0, 0x32, 0x3A, 0x0A, 0x49, 0x06, 0x24, 0x5C, - 0xC2, 0xD3, 0xAC, 0x62, 0x91, 0x95, 0xE4, 0x79, - 0xE7, 0xC8, 0x37, 0x6D, 0x8D, 0xD5, 0x4E, 0xA9, - 0x6C, 0x56, 0xF4, 0xEA, 0x65, 0x7A, 0xAE, 0x08, - 0xBA, 0x78, 0x25, 0x2E, 0x1C, 0xA6, 0xB4, 0xC6, - 0xE8, 0xDD, 0x74, 0x1F, 0x4B, 0xBD, 0x8B, 0x8A, - 0x70, 0x3E, 0xB5, 0x66, 0x48, 0x03, 0xF6, 0x0E, - 0x61, 0x35, 0x57, 0xB9, 0x86, 0xC1, 0x1D, 0x9E, - 0xE1, 0xF8, 0x98, 0x11, 0x69, 0xD9, 0x8E, 0x94, - 0x9B, 0x1E, 0x87, 0xE9, 0xCE, 0x55, 0x28, 0xDF, - 0x8C, 0xA1, 0x89, 0x0D, 0xBF, 0xE6, 0x42, 0x68, - 0x41, 0x99, 0x2D, 0x0F, 0xB0, 0x54, 0xBB, 0x16 -}; - -/* - * Forward tables - */ -#define FT \ -\ - V(A5,63,63,C6), V(84,7C,7C,F8), V(99,77,77,EE), V(8D,7B,7B,F6), \ - V(0D,F2,F2,FF), V(BD,6B,6B,D6), V(B1,6F,6F,DE), V(54,C5,C5,91), \ - V(50,30,30,60), V(03,01,01,02), V(A9,67,67,CE), V(7D,2B,2B,56), \ - V(19,FE,FE,E7), V(62,D7,D7,B5), V(E6,AB,AB,4D), V(9A,76,76,EC), \ - V(45,CA,CA,8F), V(9D,82,82,1F), V(40,C9,C9,89), V(87,7D,7D,FA), \ - V(15,FA,FA,EF), V(EB,59,59,B2), V(C9,47,47,8E), V(0B,F0,F0,FB), \ - V(EC,AD,AD,41), V(67,D4,D4,B3), V(FD,A2,A2,5F), V(EA,AF,AF,45), \ - V(BF,9C,9C,23), V(F7,A4,A4,53), V(96,72,72,E4), V(5B,C0,C0,9B), \ - V(C2,B7,B7,75), V(1C,FD,FD,E1), V(AE,93,93,3D), V(6A,26,26,4C), \ - V(5A,36,36,6C), V(41,3F,3F,7E), V(02,F7,F7,F5), V(4F,CC,CC,83), \ - V(5C,34,34,68), V(F4,A5,A5,51), V(34,E5,E5,D1), V(08,F1,F1,F9), \ - V(93,71,71,E2), V(73,D8,D8,AB), V(53,31,31,62), V(3F,15,15,2A), \ - V(0C,04,04,08), V(52,C7,C7,95), V(65,23,23,46), V(5E,C3,C3,9D), \ - V(28,18,18,30), V(A1,96,96,37), V(0F,05,05,0A), V(B5,9A,9A,2F), \ - V(09,07,07,0E), V(36,12,12,24), V(9B,80,80,1B), V(3D,E2,E2,DF), \ - V(26,EB,EB,CD), V(69,27,27,4E), V(CD,B2,B2,7F), V(9F,75,75,EA), \ - V(1B,09,09,12), V(9E,83,83,1D), V(74,2C,2C,58), V(2E,1A,1A,34), \ - V(2D,1B,1B,36), V(B2,6E,6E,DC), V(EE,5A,5A,B4), V(FB,A0,A0,5B), \ - V(F6,52,52,A4), V(4D,3B,3B,76), V(61,D6,D6,B7), V(CE,B3,B3,7D), \ - V(7B,29,29,52), V(3E,E3,E3,DD), V(71,2F,2F,5E), V(97,84,84,13), \ - V(F5,53,53,A6), V(68,D1,D1,B9), V(00,00,00,00), V(2C,ED,ED,C1), \ - V(60,20,20,40), V(1F,FC,FC,E3), V(C8,B1,B1,79), V(ED,5B,5B,B6), \ - V(BE,6A,6A,D4), V(46,CB,CB,8D), V(D9,BE,BE,67), V(4B,39,39,72), \ - V(DE,4A,4A,94), V(D4,4C,4C,98), V(E8,58,58,B0), V(4A,CF,CF,85), \ - V(6B,D0,D0,BB), V(2A,EF,EF,C5), V(E5,AA,AA,4F), V(16,FB,FB,ED), \ - V(C5,43,43,86), V(D7,4D,4D,9A), V(55,33,33,66), V(94,85,85,11), \ - V(CF,45,45,8A), V(10,F9,F9,E9), V(06,02,02,04), V(81,7F,7F,FE), \ - V(F0,50,50,A0), V(44,3C,3C,78), V(BA,9F,9F,25), V(E3,A8,A8,4B), \ - V(F3,51,51,A2), V(FE,A3,A3,5D), V(C0,40,40,80), V(8A,8F,8F,05), \ - V(AD,92,92,3F), V(BC,9D,9D,21), V(48,38,38,70), V(04,F5,F5,F1), \ - V(DF,BC,BC,63), V(C1,B6,B6,77), V(75,DA,DA,AF), V(63,21,21,42), \ - V(30,10,10,20), V(1A,FF,FF,E5), V(0E,F3,F3,FD), V(6D,D2,D2,BF), \ - V(4C,CD,CD,81), V(14,0C,0C,18), V(35,13,13,26), V(2F,EC,EC,C3), \ - V(E1,5F,5F,BE), V(A2,97,97,35), V(CC,44,44,88), V(39,17,17,2E), \ - V(57,C4,C4,93), V(F2,A7,A7,55), V(82,7E,7E,FC), V(47,3D,3D,7A), \ - V(AC,64,64,C8), V(E7,5D,5D,BA), V(2B,19,19,32), V(95,73,73,E6), \ - V(A0,60,60,C0), V(98,81,81,19), V(D1,4F,4F,9E), V(7F,DC,DC,A3), \ - V(66,22,22,44), V(7E,2A,2A,54), V(AB,90,90,3B), V(83,88,88,0B), \ - V(CA,46,46,8C), V(29,EE,EE,C7), V(D3,B8,B8,6B), V(3C,14,14,28), \ - V(79,DE,DE,A7), V(E2,5E,5E,BC), V(1D,0B,0B,16), V(76,DB,DB,AD), \ - V(3B,E0,E0,DB), V(56,32,32,64), V(4E,3A,3A,74), V(1E,0A,0A,14), \ - V(DB,49,49,92), V(0A,06,06,0C), V(6C,24,24,48), V(E4,5C,5C,B8), \ - V(5D,C2,C2,9F), V(6E,D3,D3,BD), V(EF,AC,AC,43), V(A6,62,62,C4), \ - V(A8,91,91,39), V(A4,95,95,31), V(37,E4,E4,D3), V(8B,79,79,F2), \ - V(32,E7,E7,D5), V(43,C8,C8,8B), V(59,37,37,6E), V(B7,6D,6D,DA), \ - V(8C,8D,8D,01), V(64,D5,D5,B1), V(D2,4E,4E,9C), V(E0,A9,A9,49), \ - V(B4,6C,6C,D8), V(FA,56,56,AC), V(07,F4,F4,F3), V(25,EA,EA,CF), \ - V(AF,65,65,CA), V(8E,7A,7A,F4), V(E9,AE,AE,47), V(18,08,08,10), \ - V(D5,BA,BA,6F), V(88,78,78,F0), V(6F,25,25,4A), V(72,2E,2E,5C), \ - V(24,1C,1C,38), V(F1,A6,A6,57), V(C7,B4,B4,73), V(51,C6,C6,97), \ - V(23,E8,E8,CB), V(7C,DD,DD,A1), V(9C,74,74,E8), V(21,1F,1F,3E), \ - V(DD,4B,4B,96), V(DC,BD,BD,61), V(86,8B,8B,0D), V(85,8A,8A,0F), \ - V(90,70,70,E0), V(42,3E,3E,7C), V(C4,B5,B5,71), V(AA,66,66,CC), \ - V(D8,48,48,90), V(05,03,03,06), V(01,F6,F6,F7), V(12,0E,0E,1C), \ - V(A3,61,61,C2), V(5F,35,35,6A), V(F9,57,57,AE), V(D0,B9,B9,69), \ - V(91,86,86,17), V(58,C1,C1,99), V(27,1D,1D,3A), V(B9,9E,9E,27), \ - V(38,E1,E1,D9), V(13,F8,F8,EB), V(B3,98,98,2B), V(33,11,11,22), \ - V(BB,69,69,D2), V(70,D9,D9,A9), V(89,8E,8E,07), V(A7,94,94,33), \ - V(B6,9B,9B,2D), V(22,1E,1E,3C), V(92,87,87,15), V(20,E9,E9,C9), \ - V(49,CE,CE,87), V(FF,55,55,AA), V(78,28,28,50), V(7A,DF,DF,A5), \ - V(8F,8C,8C,03), V(F8,A1,A1,59), V(80,89,89,09), V(17,0D,0D,1A), \ - V(DA,BF,BF,65), V(31,E6,E6,D7), V(C6,42,42,84), V(B8,68,68,D0), \ - V(C3,41,41,82), V(B0,99,99,29), V(77,2D,2D,5A), V(11,0F,0F,1E), \ - V(CB,B0,B0,7B), V(FC,54,54,A8), V(D6,BB,BB,6D), V(3A,16,16,2C) - -#define V(a,b,c,d) 0x##a##b##c##d -static const uint32_t s_aes_ft0[256] = { FT }; -#undef V - -#define V(a,b,c,d) 0x##b##c##d##a -static const uint32_t s_aes_ft1[256] = { FT }; -#undef V - -#define V(a,b,c,d) 0x##c##d##a##b -static const uint32_t s_aes_ft2[256] = { FT }; -#undef V - -#define V(a,b,c,d) 0x##d##a##b##c -static const uint32_t s_aes_ft3[256] = { FT }; -#undef V - -#undef FT - -/* - * Reverse S-box - */ -static const uint8_t s_aes_rsb[256] ESP_IBUS_ATTR = -{ - 0x52, 0x09, 0x6A, 0xD5, 0x30, 0x36, 0xA5, 0x38, - 0xBF, 0x40, 0xA3, 0x9E, 0x81, 0xF3, 0xD7, 0xFB, - 0x7C, 0xE3, 0x39, 0x82, 0x9B, 0x2F, 0xFF, 0x87, - 0x34, 0x8E, 0x43, 0x44, 0xC4, 0xDE, 0xE9, 0xCB, - 0x54, 0x7B, 0x94, 0x32, 0xA6, 0xC2, 0x23, 0x3D, - 0xEE, 0x4C, 0x95, 0x0B, 0x42, 0xFA, 0xC3, 0x4E, - 0x08, 0x2E, 0xA1, 0x66, 0x28, 0xD9, 0x24, 0xB2, - 0x76, 0x5B, 0xA2, 0x49, 0x6D, 0x8B, 0xD1, 0x25, - 0x72, 0xF8, 0xF6, 0x64, 0x86, 0x68, 0x98, 0x16, - 0xD4, 0xA4, 0x5C, 0xCC, 0x5D, 0x65, 0xB6, 0x92, - 0x6C, 0x70, 0x48, 0x50, 0xFD, 0xED, 0xB9, 0xDA, - 0x5E, 0x15, 0x46, 0x57, 0xA7, 0x8D, 0x9D, 0x84, - 0x90, 0xD8, 0xAB, 0x00, 0x8C, 0xBC, 0xD3, 0x0A, - 0xF7, 0xE4, 0x58, 0x05, 0xB8, 0xB3, 0x45, 0x06, - 0xD0, 0x2C, 0x1E, 0x8F, 0xCA, 0x3F, 0x0F, 0x02, - 0xC1, 0xAF, 0xBD, 0x03, 0x01, 0x13, 0x8A, 0x6B, - 0x3A, 0x91, 0x11, 0x41, 0x4F, 0x67, 0xDC, 0xEA, - 0x97, 0xF2, 0xCF, 0xCE, 0xF0, 0xB4, 0xE6, 0x73, - 0x96, 0xAC, 0x74, 0x22, 0xE7, 0xAD, 0x35, 0x85, - 0xE2, 0xF9, 0x37, 0xE8, 0x1C, 0x75, 0xDF, 0x6E, - 0x47, 0xF1, 0x1A, 0x71, 0x1D, 0x29, 0xC5, 0x89, - 0x6F, 0xB7, 0x62, 0x0E, 0xAA, 0x18, 0xBE, 0x1B, - 0xFC, 0x56, 0x3E, 0x4B, 0xC6, 0xD2, 0x79, 0x20, - 0x9A, 0xDB, 0xC0, 0xFE, 0x78, 0xCD, 0x5A, 0xF4, - 0x1F, 0xDD, 0xA8, 0x33, 0x88, 0x07, 0xC7, 0x31, - 0xB1, 0x12, 0x10, 0x59, 0x27, 0x80, 0xEC, 0x5F, - 0x60, 0x51, 0x7F, 0xA9, 0x19, 0xB5, 0x4A, 0x0D, - 0x2D, 0xE5, 0x7A, 0x9F, 0x93, 0xC9, 0x9C, 0xEF, - 0xA0, 0xE0, 0x3B, 0x4D, 0xAE, 0x2A, 0xF5, 0xB0, - 0xC8, 0xEB, 0xBB, 0x3C, 0x83, 0x53, 0x99, 0x61, - 0x17, 0x2B, 0x04, 0x7E, 0xBA, 0x77, 0xD6, 0x26, - 0xE1, 0x69, 0x14, 0x63, 0x55, 0x21, 0x0C, 0x7D -}; - -/* - * Reverse tables - */ -#define RT \ -\ - V(50,A7,F4,51), V(53,65,41,7E), V(C3,A4,17,1A), V(96,5E,27,3A), \ - V(CB,6B,AB,3B), V(F1,45,9D,1F), V(AB,58,FA,AC), V(93,03,E3,4B), \ - V(55,FA,30,20), V(F6,6D,76,AD), V(91,76,CC,88), V(25,4C,02,F5), \ - V(FC,D7,E5,4F), V(D7,CB,2A,C5), V(80,44,35,26), V(8F,A3,62,B5), \ - V(49,5A,B1,DE), V(67,1B,BA,25), V(98,0E,EA,45), V(E1,C0,FE,5D), \ - V(02,75,2F,C3), V(12,F0,4C,81), V(A3,97,46,8D), V(C6,F9,D3,6B), \ - V(E7,5F,8F,03), V(95,9C,92,15), V(EB,7A,6D,BF), V(DA,59,52,95), \ - V(2D,83,BE,D4), V(D3,21,74,58), V(29,69,E0,49), V(44,C8,C9,8E), \ - V(6A,89,C2,75), V(78,79,8E,F4), V(6B,3E,58,99), V(DD,71,B9,27), \ - V(B6,4F,E1,BE), V(17,AD,88,F0), V(66,AC,20,C9), V(B4,3A,CE,7D), \ - V(18,4A,DF,63), V(82,31,1A,E5), V(60,33,51,97), V(45,7F,53,62), \ - V(E0,77,64,B1), V(84,AE,6B,BB), V(1C,A0,81,FE), V(94,2B,08,F9), \ - V(58,68,48,70), V(19,FD,45,8F), V(87,6C,DE,94), V(B7,F8,7B,52), \ - V(23,D3,73,AB), V(E2,02,4B,72), V(57,8F,1F,E3), V(2A,AB,55,66), \ - V(07,28,EB,B2), V(03,C2,B5,2F), V(9A,7B,C5,86), V(A5,08,37,D3), \ - V(F2,87,28,30), V(B2,A5,BF,23), V(BA,6A,03,02), V(5C,82,16,ED), \ - V(2B,1C,CF,8A), V(92,B4,79,A7), V(F0,F2,07,F3), V(A1,E2,69,4E), \ - V(CD,F4,DA,65), V(D5,BE,05,06), V(1F,62,34,D1), V(8A,FE,A6,C4), \ - V(9D,53,2E,34), V(A0,55,F3,A2), V(32,E1,8A,05), V(75,EB,F6,A4), \ - V(39,EC,83,0B), V(AA,EF,60,40), V(06,9F,71,5E), V(51,10,6E,BD), \ - V(F9,8A,21,3E), V(3D,06,DD,96), V(AE,05,3E,DD), V(46,BD,E6,4D), \ - V(B5,8D,54,91), V(05,5D,C4,71), V(6F,D4,06,04), V(FF,15,50,60), \ - V(24,FB,98,19), V(97,E9,BD,D6), V(CC,43,40,89), V(77,9E,D9,67), \ - V(BD,42,E8,B0), V(88,8B,89,07), V(38,5B,19,E7), V(DB,EE,C8,79), \ - V(47,0A,7C,A1), V(E9,0F,42,7C), V(C9,1E,84,F8), V(00,00,00,00), \ - V(83,86,80,09), V(48,ED,2B,32), V(AC,70,11,1E), V(4E,72,5A,6C), \ - V(FB,FF,0E,FD), V(56,38,85,0F), V(1E,D5,AE,3D), V(27,39,2D,36), \ - V(64,D9,0F,0A), V(21,A6,5C,68), V(D1,54,5B,9B), V(3A,2E,36,24), \ - V(B1,67,0A,0C), V(0F,E7,57,93), V(D2,96,EE,B4), V(9E,91,9B,1B), \ - V(4F,C5,C0,80), V(A2,20,DC,61), V(69,4B,77,5A), V(16,1A,12,1C), \ - V(0A,BA,93,E2), V(E5,2A,A0,C0), V(43,E0,22,3C), V(1D,17,1B,12), \ - V(0B,0D,09,0E), V(AD,C7,8B,F2), V(B9,A8,B6,2D), V(C8,A9,1E,14), \ - V(85,19,F1,57), V(4C,07,75,AF), V(BB,DD,99,EE), V(FD,60,7F,A3), \ - V(9F,26,01,F7), V(BC,F5,72,5C), V(C5,3B,66,44), V(34,7E,FB,5B), \ - V(76,29,43,8B), V(DC,C6,23,CB), V(68,FC,ED,B6), V(63,F1,E4,B8), \ - V(CA,DC,31,D7), V(10,85,63,42), V(40,22,97,13), V(20,11,C6,84), \ - V(7D,24,4A,85), V(F8,3D,BB,D2), V(11,32,F9,AE), V(6D,A1,29,C7), \ - V(4B,2F,9E,1D), V(F3,30,B2,DC), V(EC,52,86,0D), V(D0,E3,C1,77), \ - V(6C,16,B3,2B), V(99,B9,70,A9), V(FA,48,94,11), V(22,64,E9,47), \ - V(C4,8C,FC,A8), V(1A,3F,F0,A0), V(D8,2C,7D,56), V(EF,90,33,22), \ - V(C7,4E,49,87), V(C1,D1,38,D9), V(FE,A2,CA,8C), V(36,0B,D4,98), \ - V(CF,81,F5,A6), V(28,DE,7A,A5), V(26,8E,B7,DA), V(A4,BF,AD,3F), \ - V(E4,9D,3A,2C), V(0D,92,78,50), V(9B,CC,5F,6A), V(62,46,7E,54), \ - V(C2,13,8D,F6), V(E8,B8,D8,90), V(5E,F7,39,2E), V(F5,AF,C3,82), \ - V(BE,80,5D,9F), V(7C,93,D0,69), V(A9,2D,D5,6F), V(B3,12,25,CF), \ - V(3B,99,AC,C8), V(A7,7D,18,10), V(6E,63,9C,E8), V(7B,BB,3B,DB), \ - V(09,78,26,CD), V(F4,18,59,6E), V(01,B7,9A,EC), V(A8,9A,4F,83), \ - V(65,6E,95,E6), V(7E,E6,FF,AA), V(08,CF,BC,21), V(E6,E8,15,EF), \ - V(D9,9B,E7,BA), V(CE,36,6F,4A), V(D4,09,9F,EA), V(D6,7C,B0,29), \ - V(AF,B2,A4,31), V(31,23,3F,2A), V(30,94,A5,C6), V(C0,66,A2,35), \ - V(37,BC,4E,74), V(A6,CA,82,FC), V(B0,D0,90,E0), V(15,D8,A7,33), \ - V(4A,98,04,F1), V(F7,DA,EC,41), V(0E,50,CD,7F), V(2F,F6,91,17), \ - V(8D,D6,4D,76), V(4D,B0,EF,43), V(54,4D,AA,CC), V(DF,04,96,E4), \ - V(E3,B5,D1,9E), V(1B,88,6A,4C), V(B8,1F,2C,C1), V(7F,51,65,46), \ - V(04,EA,5E,9D), V(5D,35,8C,01), V(73,74,87,FA), V(2E,41,0B,FB), \ - V(5A,1D,67,B3), V(52,D2,DB,92), V(33,56,10,E9), V(13,47,D6,6D), \ - V(8C,61,D7,9A), V(7A,0C,A1,37), V(8E,14,F8,59), V(89,3C,13,EB), \ - V(EE,27,A9,CE), V(35,C9,61,B7), V(ED,E5,1C,E1), V(3C,B1,47,7A), \ - V(59,DF,D2,9C), V(3F,73,F2,55), V(79,CE,14,18), V(BF,37,C7,73), \ - V(EA,CD,F7,53), V(5B,AA,FD,5F), V(14,6F,3D,DF), V(86,DB,44,78), \ - V(81,F3,AF,CA), V(3E,C4,68,B9), V(2C,34,24,38), V(5F,40,A3,C2), \ - V(72,C3,1D,16), V(0C,25,E2,BC), V(8B,49,3C,28), V(41,95,0D,FF), \ - V(71,01,A8,39), V(DE,B3,0C,08), V(9C,E4,B4,D8), V(90,C1,56,64), \ - V(61,84,CB,7B), V(70,B6,32,D5), V(74,5C,6C,48), V(42,57,B8,D0) - -#define V(a,b,c,d) 0x##a##b##c##d -static const uint32_t s_aes_rt0[256] = { RT }; -#undef V - -#define V(a,b,c,d) 0x##b##c##d##a -static const uint32_t s_aes_rt1[256] = { RT }; -#undef V - -#define V(a,b,c,d) 0x##c##d##a##b -static const uint32_t s_aes_rt2[256] = { RT }; -#undef V - -#define V(a,b,c,d) 0x##d##a##b##c -static const uint32_t s_aes_rt3[256] = { RT }; -#undef V - -#undef RT - -/* - * Round constants - */ -static const uint32_t s_aes_rcon[10] = -{ - 0x00000001, 0x00000002, 0x00000004, 0x00000008, - 0x00000010, 0x00000020, 0x00000040, 0x00000080, - 0x0000001B, 0x00000036 -}; - -void esp_aes_init(esp_aes_t *aes) -{ - -} - -int esp_aes_set_encrypt_key(esp_aes_t *aes, const void *p_key, size_t keybits) -{ - unsigned int i; - uint32_t *RK; - const uint8_t *key = (const uint8_t *)p_key; - - switch (keybits) { - case 128: - aes->nr = 10; - break; - case 192: - aes->nr = 12; - break; - case 256: - aes->nr = 14; - break; - default : - return -EINVAL; - } - - aes->rk = RK = aes->buf; - - for (i = 0; i < (keybits >> 5); i++) { - GET_UINT32_LE(RK[i], key, i << 2); - } - - switch (aes->nr) { - case 10: - for (i = 0; i < 10; i++, RK += 4) { - RK[4] = RK[0] ^ s_aes_rcon[i] - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((RK[3] >> 8) & 0xFF, s_aes_fsb) << 0) - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((RK[3] >> 16) & 0xFF, s_aes_fsb) << 8) - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((RK[3] >> 24) & 0xFF, s_aes_fsb) << 16) - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((RK[3] >> 0) & 0xFF, s_aes_fsb) << 24); - - RK[5] = RK[1] ^ RK[4]; - RK[6] = RK[2] ^ RK[5]; - RK[7] = RK[3] ^ RK[6]; - } - break; - case 12: - for (i = 0; i < 8; i++, RK += 6) { - RK[6] = RK[0] ^ s_aes_rcon[i] - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((RK[5] >> 8) & 0xFF, s_aes_fsb) << 0) - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((RK[5] >> 16) & 0xFF, s_aes_fsb) << 8) - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((RK[5] >> 24) & 0xFF, s_aes_fsb) << 16) - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((RK[5] >> 0) & 0xFF, s_aes_fsb) << 24); - - RK[7] = RK[1] ^ RK[6]; - RK[8] = RK[2] ^ RK[7]; - RK[9] = RK[3] ^ RK[8]; - RK[10] = RK[4] ^ RK[9]; - RK[11] = RK[5] ^ RK[10]; - } - break; - case 14: - for (i = 0; i < 7; i++, RK += 8) { - RK[8] = RK[0] ^ s_aes_rcon[i] - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((RK[7] >> 8) & 0xFF, s_aes_fsb) << 0) - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((RK[7] >> 16) & 0xFF, s_aes_fsb) << 8) - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((RK[7] >> 24) & 0xFF, s_aes_fsb) << 16) - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((RK[7] >> 0) & 0xFF, s_aes_fsb) << 24); - - RK[9] = RK[1] ^ RK[8]; - RK[10] = RK[2] ^ RK[9]; - RK[11] = RK[3] ^ RK[10]; - - RK[12] = RK[4] ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((RK[11] >> 0) & 0xFF, s_aes_fsb) << 0) - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((RK[11] >> 8) & 0xFF, s_aes_fsb) << 8) - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((RK[11] >> 16) & 0xFF, s_aes_fsb) << 16) - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((RK[11] >> 24) & 0xFF, s_aes_fsb) << 24); - - RK[13] = RK[5] ^ RK[12]; - RK[14] = RK[6] ^ RK[13]; - RK[15] = RK[7] ^ RK[14]; - } - break; - } - - return 0; -} - -int esp_aes_set_decrypt_key(esp_aes_t *aes, const void *key, size_t keybits) -{ - int i, j, ret; - esp_aes_t cty; - uint32_t *RK; - uint32_t *SK; - - esp_aes_init(&cty); - - aes->rk = RK = aes->buf; - - /* Also checks keybits */ - if ((ret = esp_aes_set_encrypt_key(&cty, key, keybits)) != 0) - return ret; - - aes->nr = cty.nr; - - SK = cty.rk + cty.nr * 4; - - *RK++ = *SK++; - *RK++ = *SK++; - *RK++ = *SK++; - *RK++ = *SK++; - - for (i = aes->nr - 1, SK -= 8; i > 0; i--, SK -= 8) { - for (j = 0; j < 4; j++, SK++) { - *RK++ = s_aes_rt0[ESP_IBUS_GET_U8_DATA((*SK >> 0) & 0xFF, s_aes_fsb)] - ^ s_aes_rt1[ESP_IBUS_GET_U8_DATA((*SK >> 8) & 0xFF, s_aes_fsb)] - ^ s_aes_rt2[ESP_IBUS_GET_U8_DATA((*SK >> 16) & 0xFF, s_aes_fsb)] - ^ s_aes_rt3[ESP_IBUS_GET_U8_DATA((*SK >> 24) & 0xFF, s_aes_fsb)]; - } - } - - *RK++ = *SK++; - *RK++ = *SK++; - *RK++ = *SK++; - *RK++ = *SK++; - - return ret; -} - -static void __esp_aes_encrypt(esp_aes_t *aes, const void *p_src, void *p_dst) -{ - int i; - uint32_t *RK, X0, X1, X2, X3, Y0, Y1, Y2, Y3; - const uint8_t *input = (const uint8_t *)p_src; - uint8_t *output = (uint8_t *)p_dst; - - RK = aes->rk; - - GET_UINT32_LE(X0, input, 0); X0 ^= *RK++; - GET_UINT32_LE(X1, input, 4); X1 ^= *RK++; - GET_UINT32_LE(X2, input, 8); X2 ^= *RK++; - GET_UINT32_LE(X3, input, 12); X3 ^= *RK++; - - for (i =(aes->nr >> 1)- 1; i > 0; i--) { - AES_FROUND(Y0, Y1, Y2, Y3, X0, X1, X2, X3); - AES_FROUND(X0, X1, X2, X3, Y0, Y1, Y2, Y3); - } - - AES_FROUND(Y0, Y1, Y2, Y3, X0, X1, X2, X3); - - X0 = *RK++ ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y0 >> 0) & 0xFF, s_aes_fsb) << 0) - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y1 >> 8) & 0xFF, s_aes_fsb) << 8) - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y2 >> 16) & 0xFF, s_aes_fsb) << 16) - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y3 >> 24) & 0xFF, s_aes_fsb) << 24); - - X1 = *RK++ ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y1 >> 0) & 0xFF, s_aes_fsb) << 0) - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y2 >> 8) & 0xFF, s_aes_fsb) << 8) - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y3 >> 16) & 0xFF, s_aes_fsb) << 16) - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y0 >> 24) & 0xFF, s_aes_fsb) << 24); - - X2 = *RK++ ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y2 >> 0) & 0xFF, s_aes_fsb) << 0) - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y3 >> 8) & 0xFF, s_aes_fsb) << 8) - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y0 >> 16) & 0xFF, s_aes_fsb) << 16) - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y1 >> 24) & 0xFF, s_aes_fsb) << 24); - - X3 = *RK++ ^ ((uint32_t) ESP_IBUS_GET_U8_DATA((Y3 >> 0) & 0xFF, s_aes_fsb) << 0) - ^ ((uint32_t) ESP_IBUS_GET_U8_DATA((Y0 >> 8) & 0xFF, s_aes_fsb) << 8) - ^ ((uint32_t) ESP_IBUS_GET_U8_DATA((Y1 >> 16) & 0xFF, s_aes_fsb) << 16) - ^ ((uint32_t) ESP_IBUS_GET_U8_DATA((Y2 >> 24) & 0xFF, s_aes_fsb) << 24); - - PUT_UINT32_LE(X0, output, 0); - PUT_UINT32_LE(X1, output, 4); - PUT_UINT32_LE(X2, output, 8); - PUT_UINT32_LE(X3, output, 12); -} - -static void __esp_aes_decrypt(esp_aes_t *aes, const void *p_src, void *p_dst) -{ - int i; - uint32_t *RK, X0, X1, X2, X3, Y0, Y1, Y2, Y3; - const uint8_t *input = (const uint8_t *)p_src; - uint8_t *output = (uint8_t *)p_dst; - - RK = aes->rk; - - GET_UINT32_LE(X0, input, 0); X0 ^= *RK++; - GET_UINT32_LE(X1, input, 4); X1 ^= *RK++; - GET_UINT32_LE(X2, input, 8); X2 ^= *RK++; - GET_UINT32_LE(X3, input, 12); X3 ^= *RK++; - - for (i =(aes->nr >> 1)- 1; i > 0; i--) { - AES_RROUND(Y0, Y1, Y2, Y3, X0, X1, X2, X3); - AES_RROUND(X0, X1, X2, X3, Y0, Y1, Y2, Y3); - } - - AES_RROUND(Y0, Y1, Y2, Y3, X0, X1, X2, X3); - - X0 = *RK++ ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y0 >> 0) & 0xFF, s_aes_rsb) << 0) - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y3 >> 8) & 0xFF, s_aes_rsb) << 8) - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y2 >> 16) & 0xFF, s_aes_rsb) << 16) - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y1 >> 24) & 0xFF, s_aes_rsb) << 24); - - X1 = *RK++ ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y1 >> 0) & 0xFF, s_aes_rsb) << 0) - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y0 >> 8) & 0xFF, s_aes_rsb) << 8) - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y3 >> 16) & 0xFF, s_aes_rsb) << 16) - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y2 >> 24) & 0xFF, s_aes_rsb) << 24); - - X2 = *RK++ ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y2 >> 0) & 0xFF, s_aes_rsb) << 0) - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y1 >> 8) & 0xFF, s_aes_rsb) << 8) - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y0 >> 16) & 0xFF, s_aes_rsb) << 16) - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y3 >> 24) & 0xFF, s_aes_rsb) << 24); - - X3 = *RK++ ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y3 >> 0) & 0xFF, s_aes_rsb) << 0) - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y2 >> 8) & 0xFF, s_aes_rsb) << 8) - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y1 >> 16) & 0xFF, s_aes_rsb) << 16) - ^ ((uint32_t)ESP_IBUS_GET_U8_DATA((Y0 >> 24) & 0xFF, s_aes_rsb) << 24); - - PUT_UINT32_LE(X0, output, 0); - PUT_UINT32_LE(X1, output, 4); - PUT_UINT32_LE(X2, output, 8); - PUT_UINT32_LE(X3, output, 12); -} - -int esp_aes_encrypt(esp_aes_t *aes, - const void *p_src, - size_t slen, - void *p_dst, - size_t dlen) -{ - const uint8_t *input = (const uint8_t *)p_src; - uint8_t *output = (uint8_t *)p_dst; - - util_assert(aes); - util_assert(p_src); - util_assert(p_dst); - util_assert((slen > 0) && ((slen % 16) == 0)); - util_assert(dlen >= slen); - - for (size_t i = 0; i < slen; i += 16) - __esp_aes_encrypt(aes, input + i, output + i); - - return 0; -} - -int esp_aes_decrypt(esp_aes_t *aes, - const void *p_src, - size_t slen, - void *p_dst, - size_t dlen) -{ - const uint8_t *input = (const uint8_t *)p_src; - uint8_t *output = (uint8_t *)p_dst; - - util_assert(aes); - util_assert(p_src); - util_assert(p_dst); - util_assert((slen > 0) && ((slen % 16) == 0)); - util_assert(dlen >= slen); - - for (size_t i = 0; i < slen; i += 16) - __esp_aes_decrypt(aes, input + i, output + i); - - return 0; -} - -int esp_aes_encrypt_cbc(esp_aes_t *aes, - const void *p_src, - size_t slen, - void *p_dst, - size_t dlen, - void *p_iv) -{ - const uint8_t *input = (const uint8_t *)p_src; - uint8_t *iv = (uint8_t *)p_iv; - uint8_t *output = (uint8_t *)p_dst; - - util_assert(aes); - util_assert(p_src); - util_assert(p_dst); - util_assert(p_iv); - util_assert((slen > 0) && ((slen % 16) == 0)); - util_assert(dlen >= slen); - - for (int i = 0; i < slen; i += 16) { - for(int j = 0; j < 16; j++ ) - output[j] = input[j] ^ iv[j]; - - __esp_aes_encrypt(aes, output, output); - memcpy(iv, output, 16); - - input += 16; - output += 16; - } - - return( 0 ); -} - -int esp_aes_decrypt_cbc(esp_aes_t *aes, - const void *p_src, - size_t slen, - void *p_dst, - size_t dlen, - void *p_iv) -{ - const uint8_t *input = (const uint8_t *)p_src; - uint8_t *iv = (uint8_t *)p_iv; - uint8_t *output = (uint8_t *)p_dst; - - util_assert(aes); - util_assert(p_src); - util_assert(p_dst); - util_assert(p_iv); - util_assert((slen > 0) && ((slen % 16) == 0)); - util_assert(dlen >= slen); - - for (int i = 0; i < slen; i += 16) { - uint8_t temp[16]; - - memcpy(temp, input, 16); - __esp_aes_decrypt(aes, input, output); - - for (int j = 0; j < 16; j++) - output[j] = output[j] ^ iv[j]; - - memcpy(iv, temp, 16); - - input += 16; - output += 16; - } - - return( 0 ); -} - -int esp_aes_encrypt_cfb8(esp_aes_t *aes, - const void *p_src, - size_t slen, - void *p_dst, - size_t dlen, - void *p_iv) -{ - uint8_t c; - uint8_t ov[17]; - const uint8_t *input = (const uint8_t *)p_src; - uint8_t *iv = (uint8_t *)p_iv; - uint8_t *output = (uint8_t *)p_dst; - - for (int i = 0; i < slen; i++) { - memcpy(ov, iv, 16); - __esp_aes_encrypt(aes, iv, iv); - - c = *output++ = iv[0] ^ *input++; - ov[16] = c; - - memcpy(iv, ov + 1, 16); - } - - return 0; -} - -int esp_aes_decrypt_cfb8(esp_aes_t *aes, - const void *p_src, - size_t slen, - void *p_dst, - size_t dlen, - void *p_iv) -{ - uint8_t ov[17]; - const uint8_t *input = (const uint8_t *)p_src; - uint8_t *iv = (uint8_t *)p_iv; - uint8_t *output = (uint8_t *)p_dst; - - util_assert(aes); - util_assert(p_src); - util_assert(p_dst); - util_assert(p_iv); - util_assert((slen > 0) && ((slen % 16) == 0)); - util_assert(dlen >= slen); - - for (int i = 0; i < slen; i++) { - memcpy(ov, iv, 16); - __esp_aes_encrypt(aes, iv, iv); - - ov[16] = *input; - *output++ = iv[0] ^ *input++; - - memcpy(iv, ov + 1, 16); - } - - return 0; -} - -int esp_aes_encrypt_cfb128(esp_aes_t *aes, - const void *p_src, - size_t slen, - void *p_dst, - size_t dlen, - void *p_iv, - size_t *iv_off) -{ - size_t n; - const uint8_t *input = (const uint8_t *)p_src; - uint8_t *iv = (uint8_t *)p_iv; - uint8_t *output = (uint8_t *)p_dst; - - util_assert(aes); - util_assert(p_src); - util_assert(p_dst); - util_assert(p_iv); - util_assert(iv_off); - util_assert((slen > 0) && ((slen % 16) == 0)); - util_assert(dlen >= slen); - - n = *iv_off; - for (int i = 0; i < slen; i++) { - if (n == 0) - __esp_aes_encrypt(aes, iv, iv); - - iv[n] = *output++ = iv[n] ^ *input++; - - n = (n + 1) & 0x0F; - } - - *iv_off = n; - - return 0; -} - -int esp_aes_decrypt_cfb128(esp_aes_t *aes, - const void *p_src, - size_t slen, - void *p_dst, - size_t dlen, - void *p_iv, - size_t *iv_off) -{ - uint8_t c; - size_t n; - const uint8_t *input = (const uint8_t *)p_src; - uint8_t *iv = (uint8_t *)p_iv; - uint8_t *output = (uint8_t *)p_dst; - - util_assert(aes); - util_assert(p_src); - util_assert(p_dst); - util_assert(p_iv); - util_assert(iv_off); - util_assert((slen > 0) && ((slen % 16) == 0)); - util_assert(dlen >= slen); - - n = *iv_off; - for (int i = 0; i < slen; i++) { - if (n == 0) - __esp_aes_encrypt(aes, iv, iv); - - c = *input++; - *output++ = c ^ iv[n]; - iv[n] = c; - - n = (n + 1) & 0x0F; - } - - *iv_off = n; - - return 0; -} - -int esp_aes_encrypt_ctr(esp_aes_t *aes, - size_t *nc_off, - void *p_nonce_counter, - void *p_stream_block, - const void *p_src, - size_t slen, - void *p_dst, - size_t dlen) -{ - uint8_t c; - size_t n; - uint8_t *output = (uint8_t *)p_dst; - uint8_t *nonce_counter = (uint8_t *)p_nonce_counter; - uint8_t *stream_block = (uint8_t *)p_stream_block; - const uint8_t *input = (const uint8_t *)p_src; - - util_assert(aes); - util_assert(nc_off); - util_assert(p_nonce_counter); - util_assert(p_stream_block); - util_assert(p_src); - util_assert(p_dst); - util_assert((slen > 0) && ((slen % 16) == 0)); - util_assert(dlen >= slen); - - n = *nc_off; - for (int i = 0; i < slen; i++) { - if( n == 0 ) { - __esp_aes_encrypt(aes, nonce_counter, stream_block); - - for (int j = 16; j > 0; j--) - if (++nonce_counter[j - 1] != 0) - break; - } - c = *input++; - *output++ = c ^ stream_block[n]; - - n = (n + 1) & 0x0F; - } - - *nc_off = n; - - return 0; -} - -static void aes_xts_decode_keys(const uint8_t *key, - size_t keybits, - const uint8_t **key1, - size_t *key1bits, - const uint8_t **key2, - size_t *key2bits) -{ - const size_t half_keybits = keybits / 2; - const size_t half_keybytes = half_keybits / 8; - - *key1bits = half_keybits; - *key2bits = half_keybits; - *key1 = &key[0]; - *key2 = &key[half_keybytes]; -} - -static void aes_gf128mul_x_ble(uint8_t *r, const uint8_t *i) -{ - uint64_t x[2], y[2]; - - memcpy(x, i, 16); - - y[0] = (x[0] << 1) ^ 0x0087 >> (8 - ((x[1] >> 63 ) << 3)); - y[1] = (x[0] >> 63) | (x[1] << 1); - - memcpy(r, y, 16); -} - -int esp_aes_xts_set_encrypt_key(esp_aes_xts_t *ctx, const void *p_key, size_t keybits) -{ - int ret; - const uint8_t *key1, *key2; - size_t key1bits, key2bits; - const uint8_t *key = (const uint8_t *)p_key; - - util_assert(ctx); - util_assert(key); - - if (keybits != 256 && keybits != 512) - return -EINVAL; - - aes_xts_decode_keys(key, keybits, &key1, &key1bits, &key2, &key2bits); - - ret = esp_aes_set_encrypt_key(&ctx->tweak, key2, key2bits); - if (ret) - return ret; - - return esp_aes_set_encrypt_key(&ctx->crypt, key1, key1bits); -} - -int esp_aes_xts_set_decrypt_key(esp_aes_xts_t *ctx, const void *p_key, size_t keybits) -{ - int ret; - const uint8_t *key1, *key2; - size_t key1bits, key2bits; - const uint8_t *key = (const uint8_t *)p_key; - - util_assert(ctx); - util_assert(key); - - if (keybits != 256 && keybits != 512) - return -EINVAL; - - aes_xts_decode_keys(key, keybits, &key1, &key1bits, &key2, &key2bits); - - ret = esp_aes_set_encrypt_key(&ctx->tweak, key2, key2bits); - if (ret) - return ret; - - return esp_aes_set_decrypt_key(&ctx->crypt, key1, key1bits); -} - -int esp_aes_crypt_xts(esp_aes_xts_t *ctx, - int encrypt, - size_t length, - const void *p_data_unit, - const void *p_src, - void *p_dst) -{ - size_t blocks = length / 16; - size_t leftover = length % 16; - uint8_t tweak[16]; - uint8_t prev_tweak[16]; - uint8_t tmp[16]; - void (*crypt_func)(esp_aes_t *aes, const void *p_src, void *p_dst); - - const uint8_t *data_unit = (const uint8_t *)p_data_unit; - const uint8_t *input = (const uint8_t *)p_src; - uint8_t *output = (uint8_t *)p_dst; - - util_assert(ctx); - util_assert(data_unit); - util_assert(input); - util_assert(output); - - if (length < 16 || (length > (1 << 20) * 16)) - return -EINVAL; - - crypt_func = encrypt ? __esp_aes_encrypt : __esp_aes_decrypt; - - __esp_aes_encrypt(&ctx->tweak, data_unit, tweak); - - while (blocks--) { - if (blocks == 0 && leftover && !encrypt) { - memcpy(prev_tweak, tweak, sizeof(tweak)); - aes_gf128mul_x_ble(tweak, tweak); - } - - for (int i = 0; i < 16; i++) - tmp[i] = input[i] ^ tweak[i]; - - crypt_func(&ctx->crypt, tmp, tmp); - - for (int i = 0; i < 16; i++) - output[i] = tmp[i] ^ tweak[i]; - - aes_gf128mul_x_ble(tweak, tweak); - - output += 16; - input += 16; - } - - if (leftover) { - int i; - uint8_t *t = encrypt ? tweak : prev_tweak; - uint8_t *prev_output = output - 16; - - for (i = 0; i < leftover; i++) { - output[i] = prev_output[i]; - tmp[i] = input[i] ^ t[i]; - } - - for (; i < 16; i++ ) - tmp[i] = prev_output[i] ^ t[i]; - - crypt_func(&ctx->crypt, tmp, tmp); - - for (i = 0; i < 16; i++) - prev_output[i] = tmp[i] ^ t[i]; - } - - return 0; -} - -int esp_aes_crypt_ofb(esp_aes_t *ctx, - size_t length, - size_t *iv_off, - void *p_iv, - const void *p_src, - void *p_dst) -{ - size_t n; - uint8_t *iv = (uint8_t *)p_iv; - const uint8_t *input = (const uint8_t *)p_src; - uint8_t *output = (uint8_t *)p_dst; - - util_assert(ctx != NULL); - util_assert(iv_off != NULL); - util_assert(iv != NULL); - util_assert(input != NULL); - util_assert(output != NULL); - - n = *iv_off; - - if (n > 15) - return -EINVAL; - - while (length--) { - if (n == 0) { - esp_aes_encrypt(ctx, iv, 16, iv, 16); - } - *output++ = *input++ ^ iv[n]; - - n = (n + 1) & 0x0F; - } - - *iv_off = n; - - return 0; -} diff --git a/components/util/src/sha1.c b/components/util/src/sha1.c deleted file mode 100644 index 3f10ef38..00000000 --- a/components/util/src/sha1.c +++ /dev/null @@ -1,165 +0,0 @@ -// Copyright 2018 Espressif Systems (Shanghai) PTE LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include -#include -#include "util_assert.h" -#include -#include "esp_sha.h" -#include "esp_log.h" - -#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits)))) - -#define blk0(i) (block->l[i] = (rol(block->l[i], 24) & 0xFF00FF00) | \ - (rol(block->l[i], 8) & 0x00FF00FF)) - -#define blk(i) (block->l[i & 15] = rol(block->l[(i + 13) & 15] ^ \ - block->l[(i + 8) & 15] ^ block->l[(i + 2) & 15] ^ block->l[i & 15], 1)) - -#define R0(v,w,x,y,z,i) \ - z += ((w & (x ^ y)) ^ y) + blk0(i) + 0x5A827999 + rol(v, 5); \ - w = rol(w, 30); -#define R1(v,w,x,y,z,i) \ - z += ((w & (x ^ y)) ^ y) + blk(i) + 0x5A827999 + rol(v, 5); \ - w = rol(w, 30); -#define R2(v,w,x,y,z,i) \ - z += (w ^ x ^ y) + blk(i) + 0x6ED9EBA1 + rol(v, 5); w = rol(w, 30); -#define R3(v,w,x,y,z,i) \ - z += (((w | x) & y) | (w & x)) + blk(i) + 0x8F1BBCDC + rol(v, 5); \ - w = rol(w, 30); -#define R4(v,w,x,y,z,i) \ - z += (w ^ x ^ y) + blk(i) + 0xCA62C1D6 + rol(v, 5); \ - w=rol(w, 30); - -typedef union { - uint8_t c[64]; - uint32_t l[16]; -} block_t; - -static void esp_sha1_transform(uint32_t state[5], const uint8_t buffer[64]) -{ - uint32_t a, b, c, d, e; - block_t workspace; - block_t *block = &workspace; - - memcpy(block, buffer, 64); - - a = state[0]; - b = state[1]; - c = state[2]; - d = state[3]; - e = state[4]; - - R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3); - R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7); - R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11); - R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15); - R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19); - R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23); - R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27); - R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31); - R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35); - R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39); - R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43); - R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47); - R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51); - R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55); - R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59); - R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63); - R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67); - R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71); - R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75); - R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79); - - state[0] += a; - state[1] += b; - state[2] += c; - state[3] += d; - state[4] += e; -} - -int esp_sha1_init(esp_sha1_t *ctx) -{ - util_assert(ctx); - - ctx->state[0] = 0x67452301; - ctx->state[1] = 0xEFCDAB89; - ctx->state[2] = 0x98BADCFE; - ctx->state[3] = 0x10325476; - ctx->state[4] = 0xC3D2E1F0; - - ctx->total[0] = ctx->total[1] = 0; - - return 0; -} - -int esp_sha1_update(esp_sha1_t *ctx, const void *src, size_t size) -{ - uint32_t i, j; - const uint8_t *data = (const uint8_t *)src; - - util_assert(ctx); - util_assert(src); - util_assert(size); - - j = (ctx->total[0] >> 3) & 63; - - if ((ctx->total[0] += size << 3) < (size << 3)) - ctx->total[1]++; - - ctx->total[1] += (size >> 29); - - if ((j + size) > 63) { - memcpy(&ctx->buffer[j], data, (i = 64-j)); - - esp_sha1_transform(ctx->state, ctx->buffer); - for ( ; i + 63 < size; i += 64) - esp_sha1_transform(ctx->state, &data[i]); - - j = 0; - } else - i = 0; - - memcpy(&ctx->buffer[j], &data[i], size - i); - - return 0; -} - -int esp_sha1_finish(esp_sha1_t *ctx, void *dest) -{ - uint32_t i; - uint32_t index; - uint8_t finalcount[8]; - uint8_t *digest = (uint8_t *)dest; - - util_assert(ctx); - util_assert(dest); - - for (i = 0; i < 8; i++) - finalcount[i] = (uint8_t)((ctx->total[(i >= 4 ? 0 : 1)] >> ((3-(i & 3)) * 8) ) & 255); - - index = 0x80; - esp_sha1_update(ctx, (uint8_t *)&index, 1); - - while ((ctx->total[0] & 504) != 448) { - index = 0; - esp_sha1_update(ctx, (uint8_t *)&index, 1); - } - esp_sha1_update(ctx, finalcount, 8); - - for (i = 0; i < 20; i++) - digest[i] = (uint8_t)((ctx->state[i >> 2] >> ((3 - (i & 3)) * 8)) & 255); - - return 0; -} diff --git a/components/util/src/sha256.c b/components/util/src/sha256.c deleted file mode 100644 index 3b658beb..00000000 --- a/components/util/src/sha256.c +++ /dev/null @@ -1,252 +0,0 @@ -// Copyright 2018 Espressif Systems (Shanghai) PTE LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include -#include -#include "util_assert.h" -#include -#include "esp_sha.h" -#include "esp_log.h" - -#define ESP_GET_BE32(a) ((((uint32_t) (a)[0]) << 24) | (((uint32_t) (a)[1]) << 16) | \ - (((uint32_t) (a)[2]) << 8) | ((uint32_t) (a)[3])) - -#define ESP_PUT_BE64(a, val) \ - do { \ - (a)[0] = (uint8_t) (((uint64_t) (val)) >> 56); \ - (a)[1] = (uint8_t) (((uint64_t) (val)) >> 48); \ - (a)[2] = (uint8_t) (((uint64_t) (val)) >> 40); \ - (a)[3] = (uint8_t) (((uint64_t) (val)) >> 32); \ - (a)[4] = (uint8_t) (((uint64_t) (val)) >> 24); \ - (a)[5] = (uint8_t) (((uint64_t) (val)) >> 16); \ - (a)[6] = (uint8_t) (((uint64_t) (val)) >> 8); \ - (a)[7] = (uint8_t) (((uint64_t) (val)) & 0xff); \ - } while (0) - -#define ESP_PUT_BE32(a, val) \ - do { \ - (a)[0] = (uint8_t) ((((uint32_t) (val)) >> 24) & 0xff); \ - (a)[1] = (uint8_t) ((((uint32_t) (val)) >> 16) & 0xff); \ - (a)[2] = (uint8_t) ((((uint32_t) (val)) >> 8) & 0xff); \ - (a)[3] = (uint8_t) (((uint32_t) (val)) & 0xff); \ - } while (0) - -#define RORc(x, y) \ -( ((((uint32_t) (x) & 0xFFFFFFFFUL) >> (uint32_t) ((y) & 31)) | \ - ((uint32_t) (x) << (uint32_t) (32 - ((y) & 31)))) & 0xFFFFFFFFUL) -#define Ch(x,y,z) (z ^ (x & (y ^ z))) -#define Maj(x,y,z) (((x | y) & z) | (x & y)) -#define S(x, n) RORc((x), (n)) -#define R(x, n) (((x)&0xFFFFFFFFUL)>>(n)) -#define Sigma0(x) (S(x, 2) ^ S(x, 13) ^ S(x, 22)) -#define Sigma1(x) (S(x, 6) ^ S(x, 11) ^ S(x, 25)) -#define Gamma0(x) (S(x, 7) ^ S(x, 18) ^ R(x, 3)) -#define Gamma1(x) (S(x, 17) ^ S(x, 19) ^ R(x, 10)) -#ifndef MIN -#define MIN(x, y) (((x) < (y)) ? (x) : (y)) -#endif - -#define RND(a,b,c,d,e,f,g,h,i) \ - t0 = h + Sigma1(e) + Ch(e, f, g) + K[i] + W[i]; \ - t1 = Sigma0(a) + Maj(a, b, c); \ - d += t0; \ - h = t0 + t1; - -static const uint32_t K[64] = { - 0x428a2f98UL, 0x71374491UL, 0xb5c0fbcfUL, 0xe9b5dba5UL, 0x3956c25bUL, - 0x59f111f1UL, 0x923f82a4UL, 0xab1c5ed5UL, 0xd807aa98UL, 0x12835b01UL, - 0x243185beUL, 0x550c7dc3UL, 0x72be5d74UL, 0x80deb1feUL, 0x9bdc06a7UL, - 0xc19bf174UL, 0xe49b69c1UL, 0xefbe4786UL, 0x0fc19dc6UL, 0x240ca1ccUL, - 0x2de92c6fUL, 0x4a7484aaUL, 0x5cb0a9dcUL, 0x76f988daUL, 0x983e5152UL, - 0xa831c66dUL, 0xb00327c8UL, 0xbf597fc7UL, 0xc6e00bf3UL, 0xd5a79147UL, - 0x06ca6351UL, 0x14292967UL, 0x27b70a85UL, 0x2e1b2138UL, 0x4d2c6dfcUL, - 0x53380d13UL, 0x650a7354UL, 0x766a0abbUL, 0x81c2c92eUL, 0x92722c85UL, - 0xa2bfe8a1UL, 0xa81a664bUL, 0xc24b8b70UL, 0xc76c51a3UL, 0xd192e819UL, - 0xd6990624UL, 0xf40e3585UL, 0x106aa070UL, 0x19a4c116UL, 0x1e376c08UL, - 0x2748774cUL, 0x34b0bcb5UL, 0x391c0cb3UL, 0x4ed8aa4aUL, 0x5b9cca4fUL, - 0x682e6ff3UL, 0x748f82eeUL, 0x78a5636fUL, 0x84c87814UL, 0x8cc70208UL, - 0x90befffaUL, 0xa4506cebUL, 0xbef9a3f7UL, 0xc67178f2UL -}; - -static void esp_sha256_transform(esp_sha256_t *ctx, const uint8_t *buf) -{ - uint32_t S[8], W[64], t0, t1; - uint32_t t; - int i; - - for (i = 0; i < 8; i++) - S[i] = ctx->state[i]; - - for (i = 0; i < 16; i++) - W[i] = ESP_GET_BE32(buf + (4 * i)); - - for (i = 16; i < 64; i++) - W[i] = Gamma1(W[i - 2]) + W[i - 7] + Gamma0(W[i - 15]) + W[i - 16]; - - for (i = 0; i < 64; ++i) { - RND(S[0], S[1], S[2], S[3], S[4], S[5], S[6], S[7], i); - t = S[7]; S[7] = S[6]; S[6] = S[5]; S[5] = S[4]; - S[4] = S[3]; S[3] = S[2]; S[2] = S[1]; S[1] = S[0]; S[0] = t; - } - - for (i = 0; i < 8; i++) - ctx->state[i] = ctx->state[i] + S[i]; -} - -int esp_sha256_init(esp_sha256_t *ctx) -{ - util_assert(ctx); - - ctx->is224 = 0; - - ctx->total[0] = 0; - ctx->total[1] = 0; - - ctx->state[0] = 0x6A09E667UL; - ctx->state[1] = 0xBB67AE85UL; - ctx->state[2] = 0x3C6EF372UL; - ctx->state[3] = 0xA54FF53AUL; - ctx->state[4] = 0x510E527FUL; - ctx->state[5] = 0x9B05688CUL; - ctx->state[6] = 0x1F83D9ABUL; - ctx->state[7] = 0x5BE0CD19UL; - - return 0; -} - -int esp_sha224_init(esp_sha224_t *ctx) -{ - util_assert(ctx); - - ctx->is224 = 1; - - ctx->total[0] = 0; - ctx->total[1] = 0; - - ctx->state[0] = 0xC1059ED8; - ctx->state[1] = 0x367CD507; - ctx->state[2] = 0x3070DD17; - ctx->state[3] = 0xF70E5939; - ctx->state[4] = 0xFFC00B31; - ctx->state[5] = 0x68581511; - ctx->state[6] = 0x64F98FA7; - ctx->state[7] = 0xBEFA4FA4; - - return 0; -} - -int esp_sha256_update(esp_sha256_t *ctx, const void *src, size_t size) -{ - size_t fill; - uint32_t left; - const uint8_t *input = (const uint8_t *)src; - - util_assert(ctx); - util_assert(src); - util_assert(size); - - left = ctx->total[0] & 0x3F; - fill = 64 - left; - - ctx->total[0] += size; - ctx->total[0] &= 0xFFFFFFFF; - - if (ctx->total[0] < size) - ctx->total[1]++; - - if (left && size >= fill) { - memcpy(ctx->buffer + left, input, fill); - - esp_sha256_transform(ctx, ctx->buffer); - - input += fill; - size -= fill; - left = 0; - } - - while (size >= 64) { - esp_sha256_transform(ctx, input); - - input += 64; - size -= 64; - } - - if (size > 0) - memcpy(ctx->buffer + left, input, size); - - return 0; -} - -int esp_sha224_update(esp_sha224_t *ctx, const void *src, size_t size) -{ - util_assert(ctx); - util_assert(src); - util_assert(size); - - return esp_sha256_update(ctx, src, size); -} - -int esp_sha224_finish(esp_sha224_t *ctx, void *dest) -{ - uint32_t used; - uint32_t high, low; - uint8_t *out = (uint8_t *)dest; - - util_assert(ctx); - util_assert(dest); - - used = ctx->total[0] & 0x3F; - - ctx->buffer[used++] = 0x80; - - if (used <= 56) { - memset(ctx->buffer + used, 0, 56 - used); - } else { - memset(ctx->buffer + used, 0, 64 - used); - esp_sha256_transform(ctx, ctx->buffer); - memset(ctx->buffer, 0, 56); - } - - high = (ctx->total[0] >> 29) | (ctx->total[1] << 3); - low = (ctx->total[0] << 3); - - ESP_PUT_BE32(ctx->buffer + 56, high); - ESP_PUT_BE32(ctx->buffer + 60, low); - - esp_sha256_transform(ctx, ctx->buffer); - - ESP_PUT_BE32(out + 0, ctx->state[0]); - ESP_PUT_BE32(out + 4, ctx->state[1]); - ESP_PUT_BE32(out + 8, ctx->state[2]); - ESP_PUT_BE32(out + 12, ctx->state[3]); - ESP_PUT_BE32(out + 16, ctx->state[4]); - ESP_PUT_BE32(out + 20, ctx->state[5]); - ESP_PUT_BE32(out + 24, ctx->state[6]); - - if (!ctx->is224) { - ESP_PUT_BE32(out + 28, ctx->state[7]); - } - - return( 0 ); -} - -int esp_sha256_finish(esp_sha256_t *ctx, void *dest) -{ - util_assert(ctx); - util_assert(dest); - - esp_sha224_finish(ctx, dest); - - return 0; -} diff --git a/components/util/src/sha512.c b/components/util/src/sha512.c deleted file mode 100644 index 61faf2c1..00000000 --- a/components/util/src/sha512.c +++ /dev/null @@ -1,302 +0,0 @@ -// Copyright 2018 Espressif Systems (Shanghai) PTE LTD -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -#include -#include -#include "util_assert.h" -#include -#include "esp_sha.h" -#include "esp_log.h" - -#define UL64(x) x##ULL - -#define SHR(x,n) ((x) >> (n)) -#define ROTR(x,n) (SHR((x),(n)) | ((x) << (64 - (n)))) - -#define S0(x) (ROTR(x, 1) ^ ROTR(x, 8) ^ SHR(x, 7)) -#define S1(x) (ROTR(x,19) ^ ROTR(x,61) ^ SHR(x, 6)) - -#define S2(x) (ROTR(x,28) ^ ROTR(x,34) ^ ROTR(x,39)) -#define S3(x) (ROTR(x,14) ^ ROTR(x,18) ^ ROTR(x,41)) - -#define F0(x,y,z) (((x) & (y)) | ((z) & ((x) | (y)))) -#define F1(x,y,z) ((z) ^ ((x) & ((y) ^ (z)))) - -#define P(a,b,c,d,e,f,g,h,x,K) \ - do \ - { \ - temp1 = (h) + S3(e) + F1((e),(f),(g)) + (K) + (x); \ - temp2 = S2(a) + F0((a),(b),(c)); \ - (d) += temp1; (h) = temp1 + temp2; \ - } while( 0 ) - -#define GET_UINT64_BE(n,b,i) \ -{ \ - (n) = ( (uint64_t) (b)[(i) ] << 56 ) \ - | ( (uint64_t) (b)[(i) + 1] << 48 ) \ - | ( (uint64_t) (b)[(i) + 2] << 40 ) \ - | ( (uint64_t) (b)[(i) + 3] << 32 ) \ - | ( (uint64_t) (b)[(i) + 4] << 24 ) \ - | ( (uint64_t) (b)[(i) + 5] << 16 ) \ - | ( (uint64_t) (b)[(i) + 6] << 8 ) \ - | ( (uint64_t) (b)[(i) + 7] ); \ -} - -#define PUT_UINT64_BE(n,b,i) \ -{ \ - (b)[(i) ] = (uint8_t) ( (n) >> 56 ); \ - (b)[(i) + 1] = (uint8_t) ( (n) >> 48 ); \ - (b)[(i) + 2] = (uint8_t) ( (n) >> 40 ); \ - (b)[(i) + 3] = (uint8_t) ( (n) >> 32 ); \ - (b)[(i) + 4] = (uint8_t) ( (n) >> 24 ); \ - (b)[(i) + 5] = (uint8_t) ( (n) >> 16 ); \ - (b)[(i) + 6] = (uint8_t) ( (n) >> 8 ); \ - (b)[(i) + 7] = (uint8_t) ( (n) ); \ -} - -static const uint64_t K[80] = -{ - UL64(0x428A2F98D728AE22), UL64(0x7137449123EF65CD), - UL64(0xB5C0FBCFEC4D3B2F), UL64(0xE9B5DBA58189DBBC), - UL64(0x3956C25BF348B538), UL64(0x59F111F1B605D019), - UL64(0x923F82A4AF194F9B), UL64(0xAB1C5ED5DA6D8118), - UL64(0xD807AA98A3030242), UL64(0x12835B0145706FBE), - UL64(0x243185BE4EE4B28C), UL64(0x550C7DC3D5FFB4E2), - UL64(0x72BE5D74F27B896F), UL64(0x80DEB1FE3B1696B1), - UL64(0x9BDC06A725C71235), UL64(0xC19BF174CF692694), - UL64(0xE49B69C19EF14AD2), UL64(0xEFBE4786384F25E3), - UL64(0x0FC19DC68B8CD5B5), UL64(0x240CA1CC77AC9C65), - UL64(0x2DE92C6F592B0275), UL64(0x4A7484AA6EA6E483), - UL64(0x5CB0A9DCBD41FBD4), UL64(0x76F988DA831153B5), - UL64(0x983E5152EE66DFAB), UL64(0xA831C66D2DB43210), - UL64(0xB00327C898FB213F), UL64(0xBF597FC7BEEF0EE4), - UL64(0xC6E00BF33DA88FC2), UL64(0xD5A79147930AA725), - UL64(0x06CA6351E003826F), UL64(0x142929670A0E6E70), - UL64(0x27B70A8546D22FFC), UL64(0x2E1B21385C26C926), - UL64(0x4D2C6DFC5AC42AED), UL64(0x53380D139D95B3DF), - UL64(0x650A73548BAF63DE), UL64(0x766A0ABB3C77B2A8), - UL64(0x81C2C92E47EDAEE6), UL64(0x92722C851482353B), - UL64(0xA2BFE8A14CF10364), UL64(0xA81A664BBC423001), - UL64(0xC24B8B70D0F89791), UL64(0xC76C51A30654BE30), - UL64(0xD192E819D6EF5218), UL64(0xD69906245565A910), - UL64(0xF40E35855771202A), UL64(0x106AA07032BBD1B8), - UL64(0x19A4C116B8D2D0C8), UL64(0x1E376C085141AB53), - UL64(0x2748774CDF8EEB99), UL64(0x34B0BCB5E19B48A8), - UL64(0x391C0CB3C5C95A63), UL64(0x4ED8AA4AE3418ACB), - UL64(0x5B9CCA4F7763E373), UL64(0x682E6FF3D6B2B8A3), - UL64(0x748F82EE5DEFB2FC), UL64(0x78A5636F43172F60), - UL64(0x84C87814A1F0AB72), UL64(0x8CC702081A6439EC), - UL64(0x90BEFFFA23631E28), UL64(0xA4506CEBDE82BDE9), - UL64(0xBEF9A3F7B2C67915), UL64(0xC67178F2E372532B), - UL64(0xCA273ECEEA26619C), UL64(0xD186B8C721C0C207), - UL64(0xEADA7DD6CDE0EB1E), UL64(0xF57D4F7FEE6ED178), - UL64(0x06F067AA72176FBA), UL64(0x0A637DC5A2C898A6), - UL64(0x113F9804BEF90DAE), UL64(0x1B710B35131C471B), - UL64(0x28DB77F523047D84), UL64(0x32CAAB7B40C72493), - UL64(0x3C9EBE0A15C9BEBC), UL64(0x431D67C49C100D4C), - UL64(0x4CC5D4BECB3E42B6), UL64(0x597F299CFC657E2A), - UL64(0x5FCB6FAB3AD6FAEC), UL64(0x6C44198C4A475817) -}; - -static int esp_sha512_transform(esp_sha512_t *ctx, const uint8_t *data) -{ - int i; - uint64_t temp1, temp2, W[80]; - uint64_t A, B, C, D, E, F, G, H; - - for( i = 0; i < 16; i++ ) { - GET_UINT64_BE(W[i], data, i << 3); - } - - for( ; i < 80; i++ ) - W[i] = S1(W[i - 2]) + W[i - 7] + S0(W[i - 15]) + W[i - 16]; - - A = ctx->state[0]; - B = ctx->state[1]; - C = ctx->state[2]; - D = ctx->state[3]; - E = ctx->state[4]; - F = ctx->state[5]; - G = ctx->state[6]; - H = ctx->state[7]; - i = 0; - - do { - P(A, B, C, D, E, F, G, H, W[i], K[i]); i++; - P(H, A, B, C, D, E, F, G, W[i], K[i]); i++; - P(G, H, A, B, C, D, E, F, W[i], K[i]); i++; - P(F, G, H, A, B, C, D, E, W[i], K[i]); i++; - P(E, F, G, H, A, B, C, D, W[i], K[i]); i++; - P(D, E, F, G, H, A, B, C, W[i], K[i]); i++; - P(C, D, E, F, G, H, A, B, W[i], K[i]); i++; - P(B, C, D, E, F, G, H, A, W[i], K[i]); i++; - } while (i < 80); - - ctx->state[0] += A; - ctx->state[1] += B; - ctx->state[2] += C; - ctx->state[3] += D; - ctx->state[4] += E; - ctx->state[5] += F; - ctx->state[6] += G; - ctx->state[7] += H; - - return( 0 ); -} - -int esp_sha512_init(esp_sha512_t *ctx) -{ - util_assert(ctx); - - ctx->is384 = 0; - - ctx->total[0] = 0; - ctx->total[1] = 0; - - ctx->state[0] = UL64(0x6A09E667F3BCC908); - ctx->state[1] = UL64(0xBB67AE8584CAA73B); - ctx->state[2] = UL64(0x3C6EF372FE94F82B); - ctx->state[3] = UL64(0xA54FF53A5F1D36F1); - ctx->state[4] = UL64(0x510E527FADE682D1); - ctx->state[5] = UL64(0x9B05688C2B3E6C1F); - ctx->state[6] = UL64(0x1F83D9ABFB41BD6B); - ctx->state[7] = UL64(0x5BE0CD19137E2179); - - return 0; -} - -int esp_sha384_init(esp_sha384_t *ctx) -{ - util_assert(ctx); - - ctx->is384 = 1; - - ctx->total[0] = 0; - ctx->total[1] = 0; - - ctx->state[0] = UL64(0xCBBB9D5DC1059ED8); - ctx->state[1] = UL64(0x629A292A367CD507); - ctx->state[2] = UL64(0x9159015A3070DD17); - ctx->state[3] = UL64(0x152FECD8F70E5939); - ctx->state[4] = UL64(0x67332667FFC00B31); - ctx->state[5] = UL64(0x8EB44A8768581511); - ctx->state[6] = UL64(0xDB0C2E0D64F98FA7); - ctx->state[7] = UL64(0x47B5481DBEFA4FA4); - - return 0; -} - -int esp_sha512_update(esp_sha512_t *ctx, const void *src, size_t size) -{ - size_t fill; - uint32_t left; - const uint8_t *input = (const uint8_t *)src; - - util_assert(ctx); - util_assert(src); - util_assert(size); - - left = (uint32_t) (ctx->total[0] & 0x7F); - fill = 128 - left; - - ctx->total[0] += (uint64_t)size; - - if( ctx->total[0] < (uint64_t)size) - ctx->total[1]++; - - if (left && size >= fill) { - memcpy(ctx->buffer + left, input, fill); - - esp_sha512_transform(ctx, ctx->buffer); - - input += fill; - size -= fill; - left = 0; - } - - while (size >= 128) { - esp_sha512_transform(ctx, input); - - input += 128; - size -= 128; - } - - if (size > 0) - memcpy((void *) (ctx->buffer + left), input, size); - - return( 0 ); -} - -int esp_sha384_update(esp_sha384_t *ctx, const void *src, size_t size) -{ - util_assert(ctx); - util_assert(src); - util_assert(size); - - return esp_sha512_update(ctx, src, size); -} - -int esp_sha384_finish(esp_sha384_t *ctx, void *dest) -{ - uint8_t used; - uint64_t high, low; - uint8_t *output = (uint8_t *)dest; - - util_assert(ctx); - util_assert(dest); - - used = ctx->total[0] & 0x7F; - - ctx->buffer[used++] = 0x80; - - if (used <= 112) - memset(ctx->buffer + used, 0, 112 - used); - else { - memset(ctx->buffer + used, 0, 128 - used); - esp_sha512_transform(ctx, ctx->buffer); - memset(ctx->buffer, 0, 112); - } - - high = (ctx->total[0] >> 61) | (ctx->total[1] << 3); - low = (ctx->total[0] << 3); - - PUT_UINT64_BE(high, ctx->buffer, 112); - PUT_UINT64_BE(low, ctx->buffer, 120); - - esp_sha512_transform(ctx, ctx->buffer); - - PUT_UINT64_BE(ctx->state[0], output, 0); - PUT_UINT64_BE(ctx->state[1], output, 8); - PUT_UINT64_BE(ctx->state[2], output, 16); - PUT_UINT64_BE(ctx->state[3], output, 24); - PUT_UINT64_BE(ctx->state[4], output, 32); - PUT_UINT64_BE(ctx->state[5], output, 40); - - if (!ctx->is384) { - PUT_UINT64_BE(ctx->state[6], output, 48); - PUT_UINT64_BE(ctx->state[7], output, 56); - } - - return 0; -} - -int esp_sha512_finish(esp_sha512_t *ctx, void *dest) -{ - util_assert(ctx); - util_assert(dest); - - esp_sha384_finish(ctx, dest); - - return 0; -} diff --git a/components/util/test/component.mk b/components/util/test/component.mk deleted file mode 100644 index 5dd172bd..00000000 --- a/components/util/test/component.mk +++ /dev/null @@ -1,5 +0,0 @@ -# -#Component Makefile -# - -COMPONENT_ADD_LDFLAGS = -Wl,--whole-archive -l$(COMPONENT_NAME) -Wl,--no-whole-archive diff --git a/components/wpa_supplicant/CMakeLists.txt b/components/wpa_supplicant/CMakeLists.txt index 0620d299..9da78968 100644 --- a/components/wpa_supplicant/CMakeLists.txt +++ b/components/wpa_supplicant/CMakeLists.txt @@ -1,7 +1,7 @@ set(COMPONENT_SRCDIRS "src/crypto" "src/fast_crypto" "src/wps" "src/wpa2/eap_peer" "src/wpa2/tls" "src/wpa2/utils" "port" "src") set(COMPONENT_ADD_INCLUDEDIRS "include" "port/include") -set(COMPONENT_PRIV_REQUIRES "mbedtls" "freertos" "heap" "newlib" "util") +set(COMPONENT_PRIV_REQUIRES "mbedtls" "freertos" "heap" "newlib") register_component() diff --git a/examples/wifi/espnow/main/espnow_example_main.c b/examples/wifi/espnow/main/espnow_example_main.c index 37407ca2..ede61bda 100644 --- a/examples/wifi/espnow/main/espnow_example_main.c +++ b/examples/wifi/espnow/main/espnow_example_main.c @@ -27,7 +27,7 @@ #include "esp_system.h" #include "esp_now.h" #include "rom/ets_sys.h" -#include "crc.h" +#include "rom/crc.h" #include "espnow_example.h" static const char *TAG = "espnow_example"; diff --git a/tools/cmake/build.cmake b/tools/cmake/build.cmake index 2ff4b335..566ff8e9 100644 --- a/tools/cmake/build.cmake +++ b/tools/cmake/build.cmake @@ -154,7 +154,7 @@ function(__build_init idf_path) endforeach() # Set components required by all other components in the build - set(requires_common newlib freertos heap log lwip util) + set(requires_common newlib freertos heap log lwip) idf_build_set_property(__COMPONENT_REQUIRES_COMMON "${requires_common}") __build_get_idf_git_revision()