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

fix typo on black keymod size and set devid default with TLS

Browse Source
This commit is contained in:
Jacob Barthelmeh
2021-02-24 00:13:49 +07:00
parent 73349d9a83
commit 26a6643383
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/internal.c
View File

@ -91,6 +91,10 @@
#ifdef HAVE_NTRU #ifdef HAVE_NTRU
#include "libntruencrypt/ntru_crypto.h" #include "libntruencrypt/ntru_crypto.h"
#endif #endif
#ifdef WOLFSSL_QNX_CAAM
/* included to get CAAM devId value */
#include <wolfssl/wolfcrypt/port/caam/wolfcaam.h>
#endif
#if defined(DEBUG_WOLFSSL) || defined(SHOW_SECRETS) || \ #if defined(DEBUG_WOLFSSL) || defined(SHOW_SECRETS) || \
defined(CHACHA_AEAD_TEST) || defined(WOLFSSL_SESSION_EXPORT_DEBUG) 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 #endif
#ifdef WOLFSSL_QNX_CAAM
/* default to try using CAAM when built */
ctx->devId = WOLFSSL_CAAM_DEVID;
#else
ctx->devId = INVALID_DEVID; ctx->devId = INVALID_DEVID;
#endif
#if defined(WOLFSSL_DTLS) #if defined(WOLFSSL_DTLS)
#ifdef WOLFSSL_SCTP #ifdef WOLFSSL_SCTP

4
wolfcrypt/src/port/caam/wolfcaam_init.c
View File

@ -312,7 +312,7 @@ int wc_caamCreateBlob_ex(byte* data, word32 dataSz, byte* out, word32* outSz,
} }
if (type == WC_CAAM_BLOB_RED) { if (type == WC_CAAM_BLOB_RED) {
arg[0] = 0; arg[0] = 0;
if (mod != NULL) { if (mod != NULL) {
if (modSz != WC_CAAM_RED_KEYMOD_SZ) { if (modSz != WC_CAAM_RED_KEYMOD_SZ) {
WOLFSSL_MSG("bad key mod red size"); 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) { if (type == WC_CAAM_BLOB_RED) {
arg[0] = 0; arg[0] = 0;
if (mod != NULL) { if (mod != NULL) {
if (modSz != WC_CAAM_RED_KEYMOD_SZ) { if (modSz != WC_CAAM_RED_KEYMOD_SZ) {
WOLFSSL_MSG("bad key mod red size"); WOLFSSL_MSG("bad key mod red size");

2
wolfssl/wolfcrypt/port/caam/wolfcaam.h
View File

@ -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_RED 1
#define WC_CAAM_BLOB_BLACK 2 #define WC_CAAM_BLOB_BLACK 2
#define WC_CAAM_RED_KEYMOD_SZ 8 #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 #define WC_CAAM_MAX_ENTROPY 44
#ifndef WOLFSSL_QNX_CAAM #ifndef WOLFSSL_QNX_CAAM