Port to RT1170 and expand CAAM driver #5938

JacobBarthelmeh · 2022-12-28T21:21:05Z

Contains MCUExpresso project for building on RT1170 and patches to expand the existing NXP CAAM driver for ECC and Blobs.

dgarske

[check-source-text] [2 of 18] [8239ef801b]
weird control chars, hard tabs, CRs, trailing whitespace:
./wolfcrypt/src/random.c:3326:»   defined(WOLFSSL_IMXRT1170_CAAM))
./wolfcrypt/src/pkcs7.c:7515:»»»»»»»»»  pkcs7->devId, pkcs7->heap);
./wolfcrypt/src/pkcs7.c:7599:»»»»pkcs7->devId, pkcs7->heap);
./wolfcrypt/src/pkcs7.c:8381:»»»pkcs7->devId, pkcs7->heap);
./wolfcrypt/src/pkcs7.c:10901:»»»»»pkcs7->devId, pkcs7->heap);
./wolfcrypt/src/pkcs7.c:11315:»»»pkcs7->devId, pkcs7->heap);
./wolfcrypt/src/pkcs7.c:12199:»»»pkcs7->devId, pkcs7->heap);
./wolfcrypt/src/pkcs7.c:12648:»»»»»»»pkcs7->devId, pkcs7->heap);
./wolfcrypt/src/wc_port.c:436:»    defined(WOLFSSL_SECO_CAAM) || defined(WOLFSSL_IMXRT1170_CAAM)
[...and more...]
warning, overlong lines added:
/IDE/MCUEXPRESSO/RT1170/PKCS7_example_cm7/source/PKCS7_example.c:354             ret = VerifyBundle(&rng, cert, certSz, key, keySz, bundle, bundleSz);
/wolfcrypt/src/port/caam/wolfcaam_fsl_nxp.c:35 /* Note: If JR interface is cached and multiple jobs are being scheduled at the same time, */
/wolfcrypt/src/port/caam/wolfcaam_fsl_nxp.c:36 /* it is recommended to move JR interfaces to non-cahed memory, rather than invalidate */
/wolfcrypt/src/port/caam/wolfcaam_fsl_nxp.c:61     /* setup memory for job ring interfaces. Can be in system memory or CAAM's secure memory.
/wolfcrypt/src/port/caam/wolfcaam_fsl_nxp.c:62      * Although this driver example only uses job ring interface 0, example setup for job ring interface 1 is also
/wolfcrypt/src/port/caam/wolfcaam_fsl_nxp.c:123 static int wc_CAAM_CommonHash(caam_handle_t* hndl, caam_hash_ctx_t *ctx, const byte* in, int inSz, byte* digest,
/wolfcrypt/src/port/caam/wolfcaam_fsl_nxp.c:135                 tmpIn = (byte*)XMALLOC(inSz + 16, NULL, DYNAMIC_TYPE_TMP_BUFFER);
/wolfcrypt/src/port/caam/wolfcaam_fsl_nxp.c:192     return wc_CAAM_CommonHash(&sha->hndl, &sha->ctx, in, inSz, digest, WC_SHA_DIGEST_SIZE, WC_HASH_TYPE_SHA);
/wolfcrypt/src/port/caam/wolfcaam_fsl_nxp.c:198 int wc_CAAM_Sha224Hash(wc_Sha224* sha, const byte* in, word32 inSz, byte* digest)
/wolfcrypt/src/port/caam/wolfcaam_fsl_nxp.c:200     return wc_CAAM_CommonHash(&sha->hndl, &sha->ctx, in, inSz, digest, WC_SHA224_DIGEST_SIZE, WC_HASH_TYPE_SHA224);
/wolfcrypt/src/port/caam/wolfcaam_fsl_nxp.c:205 int wc_CAAM_Sha256Hash(wc_Sha256* sha, const byte* in, word32 inSz, byte* digest)
/wolfcrypt/src/port/caam/wolfcaam_fsl_nxp.c:207     return wc_CAAM_CommonHash(&sha->hndl, &sha->ctx, in, inSz, digest, WC_SHA256_DIGEST_SIZE, WC_HASH_TYPE_SHA256);
/wolfcrypt/src/port/caam/wolfcaam_fsl_nxp.c:212 int wc_CAAM_Sha384Hash(wc_Sha384* sha, const byte* in, word32 inSz, byte* digest)
/wolfcrypt/src/port/caam/wolfcaam_fsl_nxp.c:214     return wc_CAAM_CommonHash(&sha->hndl, &sha->ctx, in, inSz, digest, WC_SHA384_DIGEST_SIZE, WC_HASH_TYPE_SHA384);
/wolfcrypt/src/port/caam/wolfcaam_fsl_nxp.c:220 int wc_CAAM_Sha512Hash(wc_Sha512* sha, const byte* in, word32 inSz, byte* digest)
/wolfcrypt/src/port/caam/wolfcaam_fsl_nxp.c:222     return wc_CAAM_CommonHash(&sha->hndl, &sha->ctx, in, inSz, digest, WC_SHA512_DIGEST_SIZE, WC_HASH_TYPE_SHA512);
/wolfcrypt/src/port/caam/wolfcaam_fsl_nxp.c:236         status = CAAM_AES_DecryptCbc(CAAM, &hndl, (const uint8_t*)buf[2].TheAddress,
/wolfcrypt/src/port/caam/wolfcaam_fsl_nxp.c:237                 (uint8_t*)buf[3].TheAddress, buf[3].Length, (const uint8_t*)buf[4].TheAddress, (const uint8_t*)buf[0].TheAddress, buf[0].Length);
/wolfcrypt/src/port/caam/wolfcaam_fsl_nxp.c:238         XMEMCPY((byte*)buf[4].TheAddress, (byte*)buf[2].TheAddress + buf[2].Length - AES_BLOCK_SIZE, AES_BLOCK_SIZE);
/wolfcrypt/src/port/caam/wolfcaam_fsl_nxp.c:241         status = CAAM_AES_EncryptCbc(CAAM, &hndl,  (const uint8_t*)buf[2].TheAddress,
/wolfcrypt/src/port/caam/wolfcaam_fsl_nxp.c:242                  (uint8_t*)buf[3].TheAddress, buf[3].Length,  (const uint8_t*)buf[4].TheAddress,  (const uint8_t*)buf[0].TheAddress, buf[0].Length);
/wolfcrypt/src/port/caam/wolfcaam_fsl_nxp.c:243         XMEMCPY((byte*)buf[4].TheAddress, (byte*)buf[3].TheAddress + buf[3].Length - AES_BLOCK_SIZE, AES_BLOCK_SIZE);
/wolfcrypt/src/port/caam/wolfcaam_fsl_nxp.c:265         tmpIn = (byte*)XMALLOC(buf[2].Length + 16, NULL, DYNAMIC_TYPE_TMP_BUFFER);
/wolfcrypt/src/port/caam/wolfcaam_fsl_nxp.c:275         tmpOut = (byte*)XMALLOC(buf[3].Length + 16, NULL, DYNAMIC_TYPE_TMP_BUFFER);
/wolfcrypt/src/port/caam/wolfcaam_init.c:28  * WOLFSSL_CAAM_DIRECT bypasses crypto callback shim layer meant for communicating with a driver, i.e. making use of NXP driver
/wolfcrypt/src/sha256.c:849          ret = wc_CAAM_HashInit(&sha256->hndl, &sha256->ctx, WC_HASH_TYPE_SHA256);
/wolfssl/internal.h:4222     word16            ownSuites:1;        /* if suites are malloced in ssl object */
/wolfssl/internal.h:4870     byte              cbioFlag;  /* WOLFSSL_CBIO_RECV/SEND: CBIORecv/Send is set */
/wolfssl/internal.h:4900     void*           hsKey;              /* Handshake key (RsaKey or ecc_key) allocated from heap */
/wolfssl/wolfcrypt/port/caam/wolfcaam_hash.h:30 WOLFSSL_LOCAL int wc_CAAM_HashInit(caam_handle_t* hndl, caam_hash_ctx_t* ctx, int type);
    check-source-text fail_AB
exiting with status 1
succeeded: check-file-modes
failed: check-source-text

dgarske

Should the examples like IDE/MCUEXPRESSO/RT1170/CSR_example_cm7/source/CSR_example.c be moved to a different repo like wolfssl-examples?

JacobBarthelmeh · 2023-01-23T17:07:38Z

That's what I get for developing in an IDE without setting up the formatting. Thanks David for the review.

Yeah those examples could be moved and just the main wolfSSL library project left in the IDE/ directory along with the wolfcrypt_test.

JacobBarthelmeh · 2023-01-30T23:49:52Z

ok to test

wolfSSL-Bot · 2023-02-09T20:58:39Z

Can one of the admins verify this patch?

dgarske · 2023-02-22T21:34:55Z

wolfssl/openssl/sha.h

@@ -107,8 +111,20 @@ typedef WOLFSSL_SHA_CTX SHA_CTX;
 * to Sha224, is expected to also be 16 byte aligned addresses.  */
 typedef struct WOLFSSL_SHA224_CTX {
    /* big enough to hold wolfcrypt Sha224, but check on init */
+#if defined(WOLFSSL_IMXRT1170_CAAM)


Perhaps you can hijack CTX_SHA2_HW_ADDER instead to avoid duplication of this compatibility sizing? Comment applies to several places.

dgarske · 2023-02-22T21:35:51Z

wolfcrypt/src/port/caam/wolfcaam_hash.c

@@ -84,7 +85,7 @@ static int _InitSha(byte* ctx, word32 ctxSz, void* heap, int devId,
    arg[1] = ctxSz + WC_CAAM_CTXLEN;
    arg[2] = (word32)devId;

-    if ((ret = wc_caamAddAndWait(buf, arg, type)) != 0) {
+    if ((ret = wc_caamAddAndWait(buf, 1, arg, type)) != 0) {


Perhaps it would be helpful to add a macro/enum for the 1 and 2 values here?

dgarske · 2023-02-22T21:36:43Z

wolfcrypt/src/port/caam/wolfcaam_fsl_nxp.c

+static caam_job_ring_interface_t jr3;
+#endif
+
+wolfSSL_Mutex caamMutex;


Can this be a static? Same for the ones in qnx and seco?

dgarske · 2023-02-22T21:39:02Z

wolfcrypt/src/port/caam/wolfcaam_fsl_nxp.c

+        byte *tmpIn  = NULL;
+
+        if ((wc_ptr_t)in % CAAM_BUFFER_ALIGN) {
+            /* input not alligned */


A few spelling alligned -> aligned.

dgarske · 2023-02-22T21:40:18Z

IDE/MCUEXPRESSO/RT1170/fsl_caam_c.patch

@@ -0,0 +1,465 @@
+--- fsl_caam-orig.c	2022-10-21 15:50:35.709951000 -0700


Are you upstreaming any of these NXP patches?

… static mutex

dgarske

Awesome!

JacobBarthelmeh self-assigned this Dec 28, 2022

JacobBarthelmeh force-pushed the RT1170 branch from dd984b6 to a584b07 Compare January 18, 2023 14:49

JacobBarthelmeh mentioned this pull request Jan 18, 2023

add caam cmake example wolfSSL/wolfssl-examples#361

Open

JacobBarthelmeh assigned dgarske and unassigned JacobBarthelmeh Jan 23, 2023

dgarske requested changes Jan 23, 2023

View reviewed changes

dgarske assigned JacobBarthelmeh and unassigned dgarske Jan 23, 2023

dgarske requested changes Jan 23, 2023

View reviewed changes

JacobBarthelmeh force-pushed the RT1170 branch from fc5c101 to 980a521 Compare January 26, 2023 22:58

Port to RT1170 and expand CAAM driver

b801a96

JacobBarthelmeh force-pushed the RT1170 branch from 6941409 to b801a96 Compare February 22, 2023 16:26

JacobBarthelmeh assigned dgarske and unassigned JacobBarthelmeh Feb 22, 2023

dgarske self-requested a review February 22, 2023 20:45

dgarske requested changes Feb 22, 2023

View reviewed changes

dgarske assigned JacobBarthelmeh and unassigned dgarske Feb 22, 2023

fix spelling, refactor openssl extra struct, remove magic number, use…

121ee7a

… static mutex

dgarske approved these changes Feb 22, 2023

View reviewed changes

dgarske self-assigned this Feb 22, 2023

dgarske merged commit 69ceedb into wolfSSL:master Feb 23, 2023

gojimmypi mentioned this pull request Feb 24, 2023

fix WOLFSSL_SHA_CTX for OpenSSL w/Espressif HW hash #6121

Closed

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Port to RT1170 and expand CAAM driver #5938

Port to RT1170 and expand CAAM driver #5938

JacobBarthelmeh commented Dec 28, 2022

dgarske left a comment

dgarske left a comment

JacobBarthelmeh commented Jan 23, 2023

JacobBarthelmeh commented Jan 30, 2023

wolfSSL-Bot commented Feb 9, 2023

dgarske Feb 22, 2023

dgarske Feb 22, 2023

dgarske Feb 22, 2023

dgarske Feb 22, 2023

dgarske Feb 22, 2023

dgarske left a comment

		@@ -0,0 +1,465 @@
		--- fsl_caam-orig.c 2022-10-21 15:50:35.709951000 -0700

Port to RT1170 and expand CAAM driver #5938

Port to RT1170 and expand CAAM driver #5938

Conversation

JacobBarthelmeh commented Dec 28, 2022

dgarske left a comment

Choose a reason for hiding this comment

dgarske left a comment

Choose a reason for hiding this comment

JacobBarthelmeh commented Jan 23, 2023

JacobBarthelmeh commented Jan 30, 2023

wolfSSL-Bot commented Feb 9, 2023

dgarske Feb 22, 2023

Choose a reason for hiding this comment

dgarske Feb 22, 2023

Choose a reason for hiding this comment

dgarske Feb 22, 2023

Choose a reason for hiding this comment

dgarske Feb 22, 2023

Choose a reason for hiding this comment

dgarske Feb 22, 2023

Choose a reason for hiding this comment

dgarske left a comment

Choose a reason for hiding this comment