From 26a6643383ca61e84ee186329a1ab3708c951bfa Mon Sep 17 00:00:00 2001 From: Jacob Barthelmeh Date: Wed, 24 Feb 2021 00:13:49 +0700 Subject: [PATCH] fix typo on black keymod size and set devid default with TLS --- src/internal.c | 9 +++++++++ wolfcrypt/src/port/caam/wolfcaam_init.c | 4 ++-- wolfssl/wolfcrypt/port/caam/wolfcaam.h | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/internal.c b/src/internal.c index 79ec90351..e56b336c5 100644 --- a/src/internal.c +++ b/src/internal.c @@ -91,6 +91,10 @@ #ifdef HAVE_NTRU #include "libntruencrypt/ntru_crypto.h" #endif +#ifdef WOLFSSL_QNX_CAAM + /* included to get CAAM devId value */ + #include +#endif #if defined(DEBUG_WOLFSSL) || defined(SHOW_SECRETS) || \ defined(CHACHA_AEAD_TEST) || defined(WOLFSSL_SESSION_EXPORT_DEBUG) @@ -1781,7 +1785,12 @@ int InitSSL_Ctx(WOLFSSL_CTX* ctx, WOLFSSL_METHOD* method, void* heap) } #endif +#ifdef WOLFSSL_QNX_CAAM + /* default to try using CAAM when built */ + ctx->devId = WOLFSSL_CAAM_DEVID; +#else ctx->devId = INVALID_DEVID; +#endif #if defined(WOLFSSL_DTLS) #ifdef WOLFSSL_SCTP diff --git a/wolfcrypt/src/port/caam/wolfcaam_init.c b/wolfcrypt/src/port/caam/wolfcaam_init.c index 65eb4e4ed..00a118b32 100644 --- a/wolfcrypt/src/port/caam/wolfcaam_init.c +++ b/wolfcrypt/src/port/caam/wolfcaam_init.c @@ -312,7 +312,7 @@ int wc_caamCreateBlob_ex(byte* data, word32 dataSz, byte* out, word32* outSz, } if (type == WC_CAAM_BLOB_RED) { - arg[0] = 0; + arg[0] = 0; if (mod != NULL) { if (modSz != WC_CAAM_RED_KEYMOD_SZ) { WOLFSSL_MSG("bad key mod red size"); @@ -397,7 +397,7 @@ int wc_caamOpenBlob_ex(byte* data, word32 dataSz, byte* out, word32* outSz, } if (type == WC_CAAM_BLOB_RED) { - arg[0] = 0; + arg[0] = 0; if (mod != NULL) { if (modSz != WC_CAAM_RED_KEYMOD_SZ) { WOLFSSL_MSG("bad key mod red size"); diff --git a/wolfssl/wolfcrypt/port/caam/wolfcaam.h b/wolfssl/wolfcrypt/port/caam/wolfcaam.h index 465fea5c4..36b783c70 100644 --- a/wolfssl/wolfcrypt/port/caam/wolfcaam.h +++ b/wolfssl/wolfcrypt/port/caam/wolfcaam.h @@ -73,7 +73,7 @@ WOLFSSL_API int wc_caamCoverKey(byte* in, word32 inSz, byte* out, word32* outSz, #define WC_CAAM_BLOB_RED 1 #define WC_CAAM_BLOB_BLACK 2 #define WC_CAAM_RED_KEYMOD_SZ 8 -#define WC_CAAM_BLACK_KEYMOD_SZ 8 +#define WC_CAAM_BLACK_KEYMOD_SZ 16 #define WC_CAAM_MAX_ENTROPY 44 #ifndef WOLFSSL_QNX_CAAM