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

Fixes for CAAM build macros and spelling.

Browse Source
This commit is contained in:
David Garske
2021-08-03 13:11:58 -07:00
parent 9aa528d19d
commit 0df28083d3
14 changed files with 55 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wolfcrypt/src/ecc.c
View File

@ -8789,7 +8789,7 @@ int wc_ecc_import_private_key_ex(const byte* priv, word32 privSz,
} }
#elif defined(WOLFSSL_QNX_CAAM) #elif defined(WOLFSSL_QNX_CAAM)
if ((wc_ecc_size(key) + WC_CAAM_MAC_SZ) == (int)privSz) { if ((wc_ecc_size(key) + WC_CAAM_MAC_SZ) == (int)privSz) {
int part = caamFindUnusuedPartition(); int part = caamFindUnusedPartition();
if (part >= 0) { if (part >= 0) {
CAAM_ADDRESS vaddr = caamGetPartition(part, privSz*3); CAAM_ADDRESS vaddr = caamGetPartition(part, privSz*3);
if (vaddr == 0) { if (vaddr == 0) {

3
wolfcrypt/src/port/caam/caam_aes.c
View File

@ -19,6 +19,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
*/ */
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>

14
wolfcrypt/src/port/caam/caam_driver.c
View File

@ -19,7 +19,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
*/ */
#if (defined(__INTEGRITY) || defined(INTEGRITY)) || \ #if (defined(__INTEGRITY) || defined(INTEGRITY)) || \
(defined(__QNX__) || defined(__QNXNTO__)) (defined(__QNX__) || defined(__QNXNTO__))
@ -29,11 +28,11 @@
#include <sys/iofunc.h> #include <sys/iofunc.h>
#include <sys/neutrino.h> #include <sys/neutrino.h>
#include "caam_qnx.h" #include <wolfssl/wolfcrypt/port/caam/caam_qnx.h>
#endif #endif
#include "caam_driver.h" #include <wolfssl/wolfcrypt/port/caam/caam_driver.h>
#include "caam_error.h" #include <wolfssl/wolfcrypt/port/caam/caam_error.h>
#include <string.h> /* for memcpy / memset */ #include <string.h> /* for memcpy / memset */
@ -265,7 +264,7 @@ static Error caamFreeAllPart()
/* search through the partitions to find an unused one /* search through the partitions to find an unused one
* returns negative value on failure, on success returns 0 or greater * returns negative value on failure, on success returns 0 or greater
*/ */
int caamFindUnusuedPartition() int caamFindUnusedPartition()
{ {
unsigned int SMPO; unsigned int SMPO;
unsigned int i; unsigned int i;
@ -870,7 +869,7 @@ int caamECDSAMake(DESCSTRUCT* desc, CAAM_BUFFER* buf, unsigned int args[4])
desc->desc[desc->idx++] = pdECDSEL; desc->desc[desc->idx++] = pdECDSEL;
if (isBlackKey == 1) { if (isBlackKey == 1) {
/* create secure partition for private key out */ /* create secure partition for private key out */
part = caamFindUnusuedPartition(); part = caamFindUnusedPartition();
if (part < 0) { if (part < 0) {
WOLFSSL_MSG("error finding an unused partition for new key"); WOLFSSL_MSG("error finding an unused partition for new key");
return -1; return -1;
@ -1527,4 +1526,5 @@ int CleanupCAAM()
caamFreeAllPart(); caamFreeAllPart();
return 0; return 0;
} }
#endif
#endif /* __INTEGRITY || INTEGRITY || __QNX__ || __QNXNTO__ */

8
wolfcrypt/src/port/caam/caam_error.c
View File

@ -19,8 +19,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
*/ */
#include "caam_driver.h" #if (defined(__INTEGRITY) || defined(INTEGRITY)) || \
#include "caam_error.h" (defined(__QNX__) || defined(__QNXNTO__))
#include <wolfssl/wolfcrypt/port/caam/caam_driver.h>
#include <wolfssl/wolfcrypt/port/caam/caam_error.h>
/* return a negative value if CAAM reset needed */ /* return a negative value if CAAM reset needed */
int caamParseCCBError(unsigned int error) int caamParseCCBError(unsigned int error)
@ -205,3 +208,4 @@ unsigned int caamParseJRError(unsigned int error)
return err; return err;
} }
#endif

8
wolfcrypt/src/port/caam/caam_integrity.c
View File

@ -19,11 +19,17 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
*/ */
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <wolfssl/wolfcrypt/settings.h>
#if defined(__INTEGRITY) || defined(INTEGRITY) #if defined(__INTEGRITY) || defined(INTEGRITY)
/* build into Integrity kernel */ /* build into Integrity kernel */
#include <bsp.h> #include <bsp.h>
#include "wolfssl/wolfcrypt/port/caam/caam_driver.h" #include <wolfssl/wolfcrypt/port/caam/caam_driver.h>
#define CAAM_READ(reg) *(volatile unsigned int*)(reg) #define CAAM_READ(reg) *(volatile unsigned int*)(reg)
#define CAAM_WRITE(reg, in) *(volatile unsigned int*)(reg) = (in); #define CAAM_WRITE(reg, in) *(volatile unsigned int*)(reg) = (in);

17
wolfcrypt/src/port/caam/caam_qnx.c
View File

@ -19,8 +19,16 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
*/ */
#include "caam_driver.h" #ifdef HAVE_CONFIG_H
#include "wolfssl/version.h" #include <config.h>
#endif
#include <wolfssl/wolfcrypt/settings.h>
#if defined(__QNX__) || defined(__QNXNTO__)
#include <wolfssl/wolfcrypt/port/caam/caam_driver.h>
#include <wolfssl/version.h>
#include <errno.h> #include <errno.h>
#include <stdio.h> #include <stdio.h>
@ -193,7 +201,7 @@ void CAAM_ADR_UNMAP(void* vaddr, unsigned int out, int outSz,
} }
/* syncoronize virtual buffer with physical /* synchronize virtual buffer with physical
* return 0 on success */ * return 0 on success */
int CAAM_ADR_SYNC(void* vaddr, int sz) int CAAM_ADR_SYNC(void* vaddr, int sz)
{ {
@ -1115,7 +1123,7 @@ int io_devctl (resmgr_context_t *ctp, io_devctl_t *msg, iofunc_ocb_t *ocb)
break; break;
case WC_CAAM_FIND_PART: case WC_CAAM_FIND_PART:
ret = caamFindUnusuedPartition(); ret = caamFindUnusedPartition();
if (ret < 0) { if (ret < 0) {
/* none found, try again later */ /* none found, try again later */
return EAGAIN; return EAGAIN;
@ -1289,3 +1297,4 @@ int main(int argc, char *argv[])
return 0; return 0;
} }
#endif /* __QNX__ || __QNXNTO__ */

8
wolfcrypt/src/port/caam/caam_sha.c
View File

@ -19,6 +19,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
*/ */
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>
@ -35,7 +38,9 @@
#endif #endif
#if defined(__INTEGRITY) || defined(INTEGRITY)
#include <INTEGRITY.h> #include <INTEGRITY.h>
#endif
#include <wolfssl/wolfcrypt/port/caam/caam_driver.h> #include <wolfssl/wolfcrypt/port/caam/caam_driver.h>
#include <wolfssl/wolfcrypt/port/caam/wolfcaam.h> #include <wolfssl/wolfcrypt/port/caam/wolfcaam.h>
@ -393,5 +398,4 @@ int wc_Sha512Final(wc_Sha512* sha, byte* out)
} }
#endif /* WOLFSSL_SHA512 */ #endif /* WOLFSSL_SHA512 */
#endif /* WOLFSSL_IMX6_CAAM */ #endif /* WOLFSSL_IMX6_CAAM && !NO_IMX6_CAAM_HASH */

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

@ -25,7 +25,7 @@
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>
#if defined(WOLFSSL_CMAC) && defined(WOLFSSL_QNX_CAAM) #if defined(WOLFSSL_QNX_CAAM) && defined(WOLFSSL_CMAC)
#include <wolfssl/wolfcrypt/logging.h> #include <wolfssl/wolfcrypt/logging.h>
#include <wolfssl/wolfcrypt/error-crypt.h> #include <wolfssl/wolfcrypt/error-crypt.h>
@ -169,4 +169,4 @@ int wc_CAAM_Cmac(Cmac* cmac, const byte* key, word32 keySz, const byte* in,
return 0; return 0;
} }
#endif #endif /* WOLFSSL_QNX_CAAM && WOLFSSL_CMAC */

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

@ -25,7 +25,7 @@
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>
#if defined(HAVE_ECC) && defined(WOLFSSL_QNX_CAAM) #if defined(WOLFSSL_QNX_CAAM) && defined(HAVE_ECC)
#include <wolfssl/wolfcrypt/logging.h> #include <wolfssl/wolfcrypt/logging.h>
#include <wolfssl/wolfcrypt/error-crypt.h> #include <wolfssl/wolfcrypt/error-crypt.h>
@ -466,4 +466,4 @@ int wc_CAAM_EccCheckPrivKey(ecc_key* key, const byte* pubKey, word32 pubKeySz) {
return CRYPTOCB_UNAVAILABLE; return CRYPTOCB_UNAVAILABLE;
} }
#endif /* HAVE_ECC && WOLFSSL_QNX_CAAM */ #endif /* WOLFSSL_QNX_CAAM && HAVE_ECC */

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

@ -500,7 +500,7 @@ int wc_caamCoverKey(byte* in, word32 inSz, byte* out, word32* outSz, int flag)
/* return 0 or greater on success for the partition number available /* return 0 or greater on success for the partition number available
* returns a negative value on failure * returns a negative value on failure
*/ */
int caamFindUnusuedPartition() int caamFindUnusedPartition()
{ {
CAAM_BUFFER buf[1]; CAAM_BUFFER buf[1];
word32 arg[4]; word32 arg[4];
@ -604,5 +604,5 @@ int caamReadPartition(CAAM_ADDRESS addr, unsigned char* out, int outSz)
return 0; return 0;
} }
#endif /* WOLFSSL_IMX6_CAAM */ #endif /* WOLFSSL_IMX6_CAAM || WOLFSSL_IMX6_CAAM_RNG ||
WOLFSSL_IMX6UL_CAAM || WOLFSSL_IMX6_CAAM_BLOB */

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

@ -25,7 +25,7 @@
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>
#if defined(WOLFSSL_QNX_CAAM) #if defined(WOLFSSL_QNX_CAAM) && (defined(__QNX__) || defined(__QNXNTO__))
#include <wolfssl/wolfcrypt/logging.h> #include <wolfssl/wolfcrypt/logging.h>
#include <wolfssl/wolfcrypt/error-crypt.h> #include <wolfssl/wolfcrypt/error-crypt.h>
@ -349,4 +349,4 @@ int SynchronousSendRequest(int type, unsigned int args[4], CAAM_BUFFER *buf,
return Success; return Success;
} }
#endif #endif /* WOLFSSL_QNX_CAAM && (__QNX__ || __QNXNTO__) */

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

@ -332,7 +332,7 @@ int caamBlob(DESCSTRUCT *desc);
CAAM_ADDRESS caamGetPartition(unsigned int part, int partSz, unsigned int flag); CAAM_ADDRESS caamGetPartition(unsigned int part, int partSz, unsigned int flag);
int caamFreePart(unsigned int part); int caamFreePart(unsigned int part);
int caamFindUnusuedPartition(void); int caamFindUnusedPartition(void);

1
wolfssl/wolfcrypt/port/caam/caam_error.h
View File

@ -26,4 +26,5 @@ int caamParseError(unsigned int error);
int caamParseDECOError(unsigned int error); int caamParseDECOError(unsigned int error);
int caamParseCCBError(unsigned int error); int caamParseCCBError(unsigned int error);
unsigned int caamParseJRError(unsigned int error); unsigned int caamParseJRError(unsigned int error);
#endif /* CAAM_ERROR_H */ #endif /* CAAM_ERROR_H */

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

@ -49,7 +49,7 @@ WOLFSSL_LOCAL void wc_caamWriteRegister(word32 reg, word32 value);
WOLFSSL_LOCAL int wc_caamAddAndWait(CAAM_BUFFER* buf, int sz, word32 arg[4], WOLFSSL_LOCAL int wc_caamAddAndWait(CAAM_BUFFER* buf, int sz, word32 arg[4],
word32 type); word32 type);
WOLFSSL_LOCAL int caamFindUnusuedPartition(void); WOLFSSL_LOCAL int caamFindUnusedPartition(void);
WOLFSSL_LOCAL CAAM_ADDRESS caamGetPartition(int part, int sz); WOLFSSL_LOCAL CAAM_ADDRESS caamGetPartition(int part, int sz);
WOLFSSL_LOCAL int caamFreePart(int partNum); WOLFSSL_LOCAL int caamFreePart(int partNum);
WOLFSSL_LOCAL int caamWriteToPartition(CAAM_ADDRESS addr, const unsigned char* in, int inSz); WOLFSSL_LOCAL int caamWriteToPartition(CAAM_ADDRESS addr, const unsigned char* in, int inSz);