wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 18:57:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3333 from miyazakh/espidf_pkcs7

Browse Source 
add user settings of pkcs7 for ESP-IDF port
This commit is contained in:
Chris Conlon
2020-09-24 09:58:00 -06:00
committed by GitHub
parent 6780e5eb0b a22b2085b1
commit 679b107044
5 changed files with 59 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
IDE/Espressif/ESP-IDF/examples/wolfssl_test/sdkconfig.defaults
View File

@ -1,2 +1,2 @@
CONFIG_MAIN_TASK_STACK_SIZE=10000 CONFIG_MAIN_TASK_STACK_SIZE=11000
CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0= CONFIG_TASK_WDT_CHECK_IDLE_TASK_CPU0=

34
IDE/Espressif/ESP-IDF/test/test_wolfssl.c
View File

@ -308,8 +308,8 @@ int mp_performance_check(int mul, int mulmod, int exptmod)
int mp_unitest_mul(const char* strZ, const char* strX, const char* strY, int verbose) int mp_unitest_mul(const char* strZ, const char* strX, const char* strY, int verbose)
{ {
int ret = 0; int ret = 0;
char* buf; char* buf = NULL;
char* bufZ; char* bufZ = NULL;
int radixX_size; int radixX_size;
int radixZ_size; int radixZ_size;
int radixY_size; int radixY_size;
@ -338,7 +338,7 @@ int mp_unitest_mul(const char* strZ, const char* strX, const char* strY, int ver
bufZ = (char*)XMALLOC(radixZ_size, NULL, DYNAMIC_TYPE_TMP_BUFFER); bufZ = (char*)XMALLOC(radixZ_size, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if(bufZ != NULL) { if(bufZ != NULL) {
mp_toradix(&z, bufZ, 16); mp_toradix(&z, bufZ, 16);
bufZ[radixZ_size] ='\0'; bufZ[radixZ_size-1] ='\0';
} }
if(verbose) { if(verbose) {
@ -353,11 +353,11 @@ int mp_unitest_mul(const char* strZ, const char* strX, const char* strY, int ver
buf = (char*)XMALLOC(radixX_size, NULL, DYNAMIC_TYPE_TMP_BUFFER); buf = (char*)XMALLOC(radixX_size, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if(buf != NULL) { if(buf != NULL) {
mp_toradix(&x, buf, 16); mp_toradix(&x, buf, 16);
buf[radixX_size] ='\0'; buf[radixX_size-1] ='\0';
printf("X : %s ", buf); printf("X : %s ", buf);
mp_toradix(&y, buf, 16); mp_toradix(&y, buf, 16);
buf[radixY_size] ='\0'; buf[radixY_size-1] ='\0';
printf("Y : %s ", buf); printf("Y : %s ", buf);
} }
if(bufZ != NULL) { if(bufZ != NULL) {
@ -413,7 +413,7 @@ int mp_unitest_mulmod(const char* strZ, const char* strX, const char* strY,
bufZ = (char*)XMALLOC(radixZ_size, NULL, DYNAMIC_TYPE_TMP_BUFFER); bufZ = (char*)XMALLOC(radixZ_size, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if(bufZ != NULL) { if(bufZ != NULL) {
mp_toradix(&z, bufZ, 16); mp_toradix(&z, bufZ, 16);
bufZ[radixZ_size] ='\0'; bufZ[radixZ_size-1] ='\0';
} }
if(verbose) { if(verbose) {
@ -430,15 +430,15 @@ int mp_unitest_mulmod(const char* strZ, const char* strX, const char* strY,
buf = (char*)XMALLOC(radixX_size, NULL, DYNAMIC_TYPE_TMP_BUFFER); buf = (char*)XMALLOC(radixX_size, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if(buf != NULL) { if(buf != NULL) {
mp_toradix(&x, buf, 16); mp_toradix(&x, buf, 16);
buf[radixX_size] ='\0'; buf[radixX_size-1] ='\0';
printf("X : %s ", buf); printf("X : %s ", buf);
mp_toradix(&y, buf, 16); mp_toradix(&y, buf, 16);
buf[radixY_size] ='\0'; buf[radixY_size-1] ='\0';
printf("Y : %s ", buf); printf("Y : %s ", buf);
mp_toradix(&m, buf, 16); mp_toradix(&m, buf, 16);
buf[radixM_size] ='\0'; buf[radixM_size-1] ='\0';
printf("M : %s ", buf); printf("M : %s ", buf);
} }
if(bufZ != NULL) { if(bufZ != NULL) {
@ -459,8 +459,8 @@ int mp_unitest_exptmod(const char* strZ, const char* strX, const char* strY,
const char* strM, int verbose) const char* strM, int verbose)
{ {
int ret = 0; int ret = 0;
char* buf; char* buf = NULL;
char* bufZ; char* bufZ = NULL;
int radixX_size; int radixX_size;
int radixZ_size; int radixZ_size;
int radixY_size; int radixY_size;
@ -494,7 +494,7 @@ int mp_unitest_exptmod(const char* strZ, const char* strX, const char* strY,
bufZ = (char*)XMALLOC(radixZ_size, NULL, DYNAMIC_TYPE_TMP_BUFFER); bufZ = (char*)XMALLOC(radixZ_size, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if(bufZ != NULL) { if(bufZ != NULL) {
mp_toradix(&z, bufZ, 16); mp_toradix(&z, bufZ, 16);
bufZ[radixZ_size] ='\0'; bufZ[radixZ_size-1] ='\0';
} }
if(verbose) { if(verbose) {
@ -511,15 +511,15 @@ int mp_unitest_exptmod(const char* strZ, const char* strX, const char* strY,
buf = (char*)XMALLOC(radixX_size, NULL, DYNAMIC_TYPE_TMP_BUFFER); buf = (char*)XMALLOC(radixX_size, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if(buf != NULL) { if(buf != NULL) {
mp_toradix(&x, buf, 16); mp_toradix(&x, buf, 16);
buf[radixX_size] ='\0'; buf[radixX_size-1] ='\0';
printf("X : %s ", buf); printf("X : %s ", buf);
mp_toradix(&y, buf, 16); mp_toradix(&y, buf, 16);
buf[radixY_size] ='\0'; buf[radixY_size-1] ='\0';
printf("Y : %s ", buf); printf("Y : %s ", buf);
mp_toradix(&m, buf, 16); mp_toradix(&m, buf, 16);
buf[radixM_size] ='\0'; buf[radixM_size-1] ='\0';
printf("M : %s ", buf); printf("M : %s ", buf);
} }
if(bufZ != NULL) { if(bufZ != NULL) {
@ -562,7 +562,7 @@ TEST_CASE("wolfssl mp exptmod test" , "[wolfssl]")
TEST_CASE("wolfssl mp mulmod test" , "[wolfssl]") TEST_CASE("wolfssl mp mulmod test" , "[wolfssl]")
{ {
ESP_LOGI(TAG, "mp test"); ESP_LOGI(TAG, "mp test");
int verbose = 0; int verbose = 1;
/* Z X Y M */ /* Z X Y M */
TEST_ASSERT_EQUAL(0, mp_unitest_mulmod("02", "5", "1", "3", verbose)); TEST_ASSERT_EQUAL(0, mp_unitest_mulmod("02", "5", "1", "3", verbose));
TEST_ASSERT_EQUAL(0, mp_unitest_mulmod("01", "-5", "1", "3", verbose)); TEST_ASSERT_EQUAL(0, mp_unitest_mulmod("01", "-5", "1", "3", verbose));
@ -602,7 +602,7 @@ TEST_CASE("wolfssl mp mulmod test" , "[wolfssl]")
TEST_CASE("wolfssl mp mul test" , "[wolfssl]") TEST_CASE("wolfssl mp mul test" , "[wolfssl]")
{ {
ESP_LOGI(TAG, "mp test"); ESP_LOGI(TAG, "mp test");
int verbose = 0; int verbose = 1;
TEST_ASSERT_EQUAL(0, mp_unitest_mul("0A", "5", "2", verbose)); TEST_ASSERT_EQUAL(0, mp_unitest_mul("0A", "5", "2", verbose));
TEST_ASSERT_EQUAL(0, mp_unitest_mul("-0A", "-5", "2", verbose)); TEST_ASSERT_EQUAL(0, mp_unitest_mul("-0A", "-5", "2", verbose));

9
IDE/Espressif/ESP-IDF/user_settings.h
View File

@ -43,6 +43,15 @@
#define CURVE25519_SMALL #define CURVE25519_SMALL
#define HAVE_ED25519 #define HAVE_ED25519
/* when you want to use pkcs7 */
/* #define HAVE_PKCS7 */
#if defined(HAVE_PKCS7)
#define HAVE_AES_KEYWRAP
#define HAVE_X963_KDF
#define WOLFSSL_AES_DIRECT
#endif
/* when you want to use aes counter mode */ /* when you want to use aes counter mode */
/* #define WOLFSSL_AES_DIRECT */ /* #define WOLFSSL_AES_DIRECT */
/* #define WOLFSSL_AES_COUNTER */ /* #define WOLFSSL_AES_COUNTER */

2
wolfcrypt/src/pkcs7.c
View File

@ -11853,7 +11853,7 @@ int wc_PKCS7_DecodeEncryptedData(PKCS7* pkcs7, byte* in, word32 inSz,
byte *tmpIv = tmpIvBuf; byte *tmpIv = tmpIvBuf;
int encryptedContentSz = 0; int encryptedContentSz = 0;
byte padLen; byte padLen = 0;
byte* encryptedContent = NULL; byte* encryptedContent = NULL;
byte* pkiMsg = in; byte* pkiMsg = in;

32
wolfssl/wolfcrypt/types.h
View File

@ -494,7 +494,37 @@ decouple library dependencies with standard string, memory and so on.
for snprintf */ for snprintf */
#include <stdio.h> #include <stdio.h>
#endif #endif
#define XSNPRINTF snprintf #if defined(WOLFSSL_ESPIDF) && \
(!defined(NO_ASN_TIME) && defined(HAVE_PKCS7))
#include<stdarg.h>
/* later gcc than 7.1 introduces -Wformat-truncation */
/* In cases when truncation is expected the caller needs*/
/* to check the return value from the function so that */
/* compiler doesn't complain. */
/* xtensa-esp32-elf v8.2.0 warns trancation at */
/* GetAsnTimeString() */
static WC_INLINE
int _xsnprintf_(char *s, size_t n, const char *format, ...)
{
va_list ap;
int ret;
if ((int)n <= 0) return -1;
va_start(ap, format);
ret = vsnprintf(s, n, format, ap);
if (ret < 0)
ret = -1;
va_end(ap);
return ret;
}
#define XSNPRINTF _xsnprintf_
#else
#define XSNPRINTF snprintf
#endif
#endif #endif
#else #else
#if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__) #if defined(_MSC_VER) || defined(__CYGWIN__) || defined(__MINGW32__)