mirror of
https://github.com/wolfSSL/wolfssl.git
synced 2026-02-04 02:25:09 +01:00
Merge pull request #2034 from miyazakh/Espressif_port_Phase2B
Initial support atecc608a on 32se
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
/* logging.c
|
||||
*
|
||||
* Copyright (C) 2006-2017 wolfSSL Inc.
|
||||
* Copyright (C) 2006-2019 wolfSSL Inc.
|
||||
*
|
||||
* This file is part of wolfSSL.
|
||||
*
|
||||
@@ -255,8 +255,7 @@ static void wolfssl_log(const int logLevel, const char *const logMessage)
|
||||
#elif defined(WOLFSSL_APACHE_MYNEWT)
|
||||
LOG_DEBUG(&mynewt_log, LOG_MODULE_DEFAULT, "%s\n", logMessage);
|
||||
#elif defined(WOLFSSL_ESPIDF)
|
||||
extern char* TAG;
|
||||
ESP_LOGI(TAG, "%s", logMessage);
|
||||
ESP_LOGI("wolfssl", "%s", logMessage);
|
||||
#else
|
||||
fprintf(stderr, "%s\n", logMessage);
|
||||
#endif
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
/* atmel.c
|
||||
*
|
||||
* Copyright (C) 2006-2018 wolfSSL Inc.
|
||||
* Copyright (C) 2006-2019 wolfSSL Inc.
|
||||
*
|
||||
* This file is part of wolfSSL.
|
||||
*
|
||||
@@ -338,7 +338,7 @@ int atmel_ecc_create_pms(int slotId, const uint8_t* peerKey, uint8_t* pms)
|
||||
int slotIdEnc;
|
||||
|
||||
slotIdEnc = atmel_ecc_alloc(ATMEL_SLOT_ECDHE_ENC);
|
||||
if (slotIdEnc != ATECC_INVALID_SLOT)
|
||||
if (slotIdEnc == ATECC_INVALID_SLOT)
|
||||
return BAD_FUNC_ARG;
|
||||
|
||||
/* get encryption key */
|
||||
|
||||
@@ -2074,7 +2074,7 @@ int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)
|
||||
}
|
||||
|
||||
#elif defined(WOLFSSL_ESPIDF)
|
||||
#if defined(WOLFSSL_ESPWROOM32)
|
||||
#if defined(WOLFSSL_ESPWROOM32) || defined(WOLFSSL_ESPWROOM32SE)
|
||||
#include <esp_system.h>
|
||||
|
||||
int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz)
|
||||
|
||||
Reference in New Issue
Block a user