From 84ecf942631e140715d108637e1f03d9a7df02a8 Mon Sep 17 00:00:00 2001 From: Jacob Barthelmeh Date: Wed, 27 Dec 2017 15:24:14 -0700 Subject: [PATCH] spelling mistakes, formatting, and change error name --- wolfcrypt/src/aes.c | 10 +++--- wolfcrypt/src/error.c | 8 ++--- wolfcrypt/src/port/caam/caam_aes.c | 2 +- wolfcrypt/src/port/caam/caam_driver.c | 36 +++++++++++----------- wolfcrypt/src/port/caam/caam_init.c | 14 ++++----- wolfcrypt/src/port/caam/caam_sha.c | 2 +- wolfcrypt/src/random.c | 2 +- wolfssl/wolfcrypt/error-crypt.h | 4 +-- wolfssl/wolfcrypt/port/caam/caam_driver.h | 2 +- wolfssl/wolfcrypt/port/caam/wolfcaam.h | 2 +- wolfssl/wolfcrypt/port/caam/wolfcaam_sha.h | 2 +- 11 files changed, 42 insertions(+), 42 deletions(-) diff --git a/wolfcrypt/src/aes.c b/wolfcrypt/src/aes.c index c33120e2f..afe768445 100644 --- a/wolfcrypt/src/aes.c +++ b/wolfcrypt/src/aes.c @@ -2161,8 +2161,8 @@ static void wc_AesDecrypt(Aes* aes, const byte* inBlock, byte* outBlock) word32 localSz = 32; if (keylen == (16 + WC_CAAM_BLOB_SZ) || - keylen == (24 + WC_CAAM_BLOB_SZ) || - keylen == (32 + WC_CAAM_BLOB_SZ)) { + keylen == (24 + WC_CAAM_BLOB_SZ) || + keylen == (32 + WC_CAAM_BLOB_SZ)) { if (wc_caamOpenBlob((byte*)userKey, keylen, local, &localSz) != 0) { return BAD_FUNC_ARG; } @@ -2218,9 +2218,9 @@ static void wc_AesDecrypt(Aes* aes, const byte* inBlock, byte* outBlock) ret = wc_AesSetKeyLocal(aes, userKey, keylen, iv, dir); #ifdef WOLFSSL_IMX6_CAAM_BLOB - ForceZero(local, sizeof(local)); + ForceZero(local, sizeof(local)); #endif - return ret; + return ret; } #if defined(WOLFSSL_AES_DIRECT) || defined(WOLFSSL_AES_COUNTER) @@ -2250,7 +2250,7 @@ static void wc_AesDecrypt(Aes* aes, const byte* inBlock, byte* outBlock) ret = wc_AesSetKeyLocal(aes, userKey, keylen, iv, dir); #ifdef WOLFSSL_IMX6_CAAM_BLOB - ForceZero(local, sizeof(local)); + ForceZero(local, sizeof(local)); #endif return ret; diff --git a/wolfcrypt/src/error.c b/wolfcrypt/src/error.c index e537d1927..50f529e10 100644 --- a/wolfcrypt/src/error.c +++ b/wolfcrypt/src/error.c @@ -434,11 +434,11 @@ const char* wc_GetErrorString(int error) case ECC_PRIVATEONLY_E: return "Invalid use of private only ECC key"; - case WC_CAAM_E: - return "Error with CAAM use"; + case WC_HW_E: + return "Error with hardware crypto use"; - case WC_CAAM_WAIT: - return "CAAM Driver waiting on resource"; + case WC_HW_WAIT_E: + return "Hardware waiting on resource"; default: return "unknown error number"; diff --git a/wolfcrypt/src/port/caam/caam_aes.c b/wolfcrypt/src/port/caam/caam_aes.c index 1e24fc744..a2f1ca9cf 100644 --- a/wolfcrypt/src/port/caam/caam_aes.c +++ b/wolfcrypt/src/port/caam/caam_aes.c @@ -1,6 +1,6 @@ /* caam_aes.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/port/caam/caam_driver.c b/wolfcrypt/src/port/caam/caam_driver.c index e3ce796be..ddab72dfc 100644 --- a/wolfcrypt/src/port/caam/caam_driver.c +++ b/wolfcrypt/src/port/caam/caam_driver.c @@ -1,6 +1,6 @@ /* caam_driver.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -105,13 +105,13 @@ static Error caamReset() { int t = 100000; /* time out counter for flushing job ring */ - /* make sure interupts are masked in JRCFGR0_LS register */ + /* make sure interrupts are masked in JRCFGR0_LS register */ CAAM_WRITE(CAAM_BASE | 0x1054, CAAM_READ(CAAM_BASE | 0x1054) | 1); /* flush and reset job rings using JRCR0 register */ CAAM_WRITE(CAAM_BASE | 0x106C, 1); - /* check register JRINTR for if halt is in prgress */ + /* check register JRINTR for if halt is in progress */ while (t > 0 && ((CAAM_READ(CAAM_BASE | 0x104C) & 0x4) == 0x4)) t--; if (t == 0) { /*unrecoverable failure, the job ring is locked, up hard reset needed*/ @@ -145,14 +145,14 @@ static Error caamCreatePartition(unsigned char page, unsigned char par) return MemoryMapMayNotBeEmpty; } - /* set generic all access permisions, gets reset later */ + /* set generic all access permissions, gets reset later */ CAAM_WRITE(CAAM_BASE | (0x1108 + (par * 16)), 0xF); CAAM_WRITE(CAAM_BASE | (0x110C + (par * 16)), 0xF); CAAM_WRITE(CAAM_BASE | (0x1104 + (par * 16)), 0xFF); /* check ownership of page */ CAAM_WRITE(CAAM_BASE | 0x10F4, (page << 16) | 0x5); - /* wait for inquery cmd to complete */ + /* wait for inquiry cmd to complete */ while ((CAAM_READ(CAAM_BASE | 0x10FC) & 0x0000C000) > 0 && (CAAM_READ(CAAM_BASE | 0x10FC) & 0x00003000) == 0) { } @@ -163,7 +163,7 @@ static Error caamCreatePartition(unsigned char page, unsigned char par) (CAAM_READ(CAAM_BASE | 0x10FC) & 0x00003000) == 0) {} if ((CAAM_READ(CAAM_BASE | 0x10FC) & 0x00003000) > 0) { /* error while deallocating page */ - return MemoryMapMayNotBeEmpty; /* PSP set on page or is unavialbale */ + return MemoryMapMayNotBeEmpty; /* PSP set on page or is unavailable */ } } else { @@ -186,7 +186,7 @@ static Error caamCreatePartition(unsigned char page, unsigned char par) /* double check ownership now of page */ CAAM_WRITE(CAAM_BASE | 0x10F4, (page << 16) | 0x5); - /* wait for inquery cmd to complete */ + /* wait for inquiry cmd to complete */ while ((CAAM_READ(CAAM_BASE | 0x10FC) & 0x0000C000) > 0 && (CAAM_READ(CAAM_BASE | 0x10FC) & 0x00003000) == 0) { } @@ -286,7 +286,7 @@ static int caamInitRng(struct CAAM_DEVICE* dev) reg |= CAAM_CTLERR; CAAM_WRITE(CAAM_RTMCTL, reg); - /* check input slot is avialable and then add */ + /* check input slot is available and then add */ if (CAAM_READ(CAAM_BASE | 0x1014) > 0) { UINT4* in = (UINT4*)dev->ring.JobIn; @@ -318,7 +318,7 @@ static Error caamDoJob(struct DescStruct* desc) desc->desc[0] &= 0xFFFFFF80; desc->desc[0] += desc->idx; - /* check input slot is avialable and then add */ + /* check input slot is available and then add */ if (CAAM_READ(CAAM_BASE | 0x1014) > 0) { UINT4* in = (UINT4*)desc->caam->ring.JobIn; @@ -396,7 +396,7 @@ static int caamAddIO(struct DescStruct* desc, UINT4 options, UINT4 sz, } if (dataSz % align > 0) { - /* store potental overlap */ + /* store potential overlap */ int tmpSz = dataSz % align; int add = (tmpSz < (align - desc->alignIdx)) ? tmpSz : align - desc->alignIdx; @@ -557,7 +557,7 @@ static Error caamBlob(struct DescStruct* desc) CAAM AES Operations ****************************************************************************/ -/* returns amount writin on success and negative value in error case. +/* returns amount written on success and negative value in error case. * Is different from caamAddIO in that it only adds a single input buffer * rather than multiple ones. */ @@ -786,7 +786,7 @@ static Error caamAes(struct DescStruct* desc) case CAAM_AESCTR: ofst = 0x00001000; - /* fall through because states are the same only the offest changes */ + /* fall through because states are the same only the offset changes */ case CAAM_AESCBC: { @@ -851,7 +851,7 @@ static Error caamAes(struct DescStruct* desc) align = 16; } - /* indefinit loop for input/output buffers */ + /* indefinite loop for input/output buffers */ desc->headIdx = desc->idx; desc->output = 0; offset = 0; /* store left over amount for output buffer */ @@ -1047,7 +1047,7 @@ static Error caamAead(struct DescStruct* desc) FIFOL_TYPE_AAD + desc->aadSz; desc->desc[desc->idx++] = BSP_VirtualToPhysical(desc->aadSzBuf); - /* now set aadSz to unformated version for getting buffers */ + /* now set aadSz to unformatted version for getting buffers */ if (desc->aadSz == 2) { unsigned char* pt = (unsigned char*)desc->aadSzBuf; desc->aadSz = (((UINT4)pt[0] & 0xFF) << 8) | @@ -1230,7 +1230,7 @@ static Error caamSha(struct DescStruct* desc, int start) ASP_FlushCaches((Address)desc->iv, ctxSz); /*Manage Context (current digest + 8 byte running message length)*/ if ((desc->state & CAAM_ALG_INIT) != CAAM_ALG_INIT) { - /* dont load into the class 2 context register on inti. + /* don't load into the class 2 context register on inti. Found that loading in caused context to not get set. */ if (desc->idx + 2 > MAX_DESC_SZ) { return TransferFailed; @@ -1588,7 +1588,7 @@ static void HandleInterrupt(Address id) Value InterruptStatus = INTERRUPT_AtomicWrite(&local->InterruptStatus, 0); int i; - /* Loop through decriptors and try to dismiss them */ + /* Loop through descriptors and try to dismiss them */ for (i = 0; i < DESC_COUNT; i++) { struct DescStruct* desc = &local->DescArray[i]; if (InterruptStatus & (1 << i)) { @@ -1650,7 +1650,7 @@ void InitCAAM(void) } - /* call interupt to make IORequests available */ + /* call interrupt to make IORequests available */ caam.InterruptStatus = 0; INTERRUPT_InitCall(&caam.HandleInterruptCall, &HandleInterrupt, "Start up CAAM IORequest"); @@ -1667,7 +1667,7 @@ void InitCAAM(void) /* set up job ring */ - /* @TODO create partion in physical memory for job rings + /* @TODO create partition in physical memory for job rings current partion security is set to the default */ for (i = 1; i < CAAM_PAGE_MAX; i++) { ret = caamCreatePartition(i, i); diff --git a/wolfcrypt/src/port/caam/caam_init.c b/wolfcrypt/src/port/caam/caam_init.c index 309827eaf..6ba5e062e 100644 --- a/wolfcrypt/src/port/caam/caam_init.c +++ b/wolfcrypt/src/port/caam/caam_init.c @@ -1,6 +1,6 @@ /* caam_init.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * @@ -124,7 +124,7 @@ int wc_caamInit() } else { WOLFSSL_MSG("Hashing not supported by CAAM"); - return WC_CAAM_E; + return WC_HW_E; } #endif @@ -134,7 +134,7 @@ int wc_caamInit() } else { WOLFSSL_MSG("AES not supported by CAAM"); - return WC_CAAM_E; + return WC_HW_E; } #endif @@ -178,14 +178,14 @@ void wc_caamWriteRegister(word32 reg, word32 value) } -/* return 0 on success and WC_CAAM_E on failure. Can also return WC_CAAM_WAIT +/* return 0 on success and WC_HW_E on failure. Can also return WC_HW_WAIT_E * in the case that the driver is waiting for a resource. */ int wc_caamAddAndWait(Buffer* buf, word32 arg[4], word32 type) { int ret; if (caam == NULLIODevice) { WOLFSSL_MSG("Error CAAM IODevice not found! Bad password?"); - return WC_CAAM_E; + return WC_HW_E; } if ((ret = SynchronousSendIORequest(caam, type, (const Value*)arg, buf)) @@ -197,10 +197,10 @@ int wc_caamAddAndWait(Buffer* buf, word32 arg[4], word32 type) /* if waiting for resource or RNG return waiting */ if (ret == Waiting) { WOLFSSL_MSG("Waiting on CAAM driver"); - return WC_CAAM_WAIT; + return WC_HW_WAIT_E; } - return WC_CAAM_E; + return WC_HW_E; } (void)ret; diff --git a/wolfcrypt/src/port/caam/caam_sha.c b/wolfcrypt/src/port/caam/caam_sha.c index ff67707b3..bbd048321 100644 --- a/wolfcrypt/src/port/caam/caam_sha.c +++ b/wolfcrypt/src/port/caam/caam_sha.c @@ -1,6 +1,6 @@ /* caam_sha.c * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfcrypt/src/random.c b/wolfcrypt/src/random.c index c27e19e98..dec607666 100644 --- a/wolfcrypt/src/random.c +++ b/wolfcrypt/src/random.c @@ -1657,7 +1657,7 @@ int wc_GenerateSeed(OS_Seed* os, byte* output, word32 sz) } /* driver could be waiting for entropy */ - if (ret != WC_CAAM_WAIT) { + if (ret != WC_HW_WAIT_E) { return ret; } sleep(1); diff --git a/wolfssl/wolfcrypt/error-crypt.h b/wolfssl/wolfcrypt/error-crypt.h index ef98d8728..8204dd13d 100644 --- a/wolfssl/wolfcrypt/error-crypt.h +++ b/wolfssl/wolfcrypt/error-crypt.h @@ -191,8 +191,8 @@ enum { ECC_PRIVATEONLY_E = -246, /* Invalid use of private only ECC key*/ EXTKEYUSAGE_E = -247, /* Bad Extended Key Usage value */ - WC_CAAM_E = -248, /* Error with CAAM use */ - WC_CAAM_WAIT = -249, /* CAAM Driver waiting on resource */ + WC_HW_E = -248, /* Error with hardware crypto use */ + WC_HW_WAIT_E = -249, /* Hardware waiting on resource */ WC_LAST_E = -249, /* Update this to indicate last error */ MIN_CODE_E = -300 /* errors -101 - -299 */ diff --git a/wolfssl/wolfcrypt/port/caam/caam_driver.h b/wolfssl/wolfcrypt/port/caam/caam_driver.h index 8091778a7..fd490813a 100644 --- a/wolfssl/wolfcrypt/port/caam/caam_driver.h +++ b/wolfssl/wolfcrypt/port/caam/caam_driver.h @@ -1,6 +1,6 @@ /* caam_driver.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/port/caam/wolfcaam.h b/wolfssl/wolfcrypt/port/caam/wolfcaam.h index 2e72ba067..26921f2cf 100644 --- a/wolfssl/wolfcrypt/port/caam/wolfcaam.h +++ b/wolfssl/wolfcrypt/port/caam/wolfcaam.h @@ -1,6 +1,6 @@ /* wolfcaam.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. * diff --git a/wolfssl/wolfcrypt/port/caam/wolfcaam_sha.h b/wolfssl/wolfcrypt/port/caam/wolfcaam_sha.h index 51c9a1942..cb4b08781 100644 --- a/wolfssl/wolfcrypt/port/caam/wolfcaam_sha.h +++ b/wolfssl/wolfcrypt/port/caam/wolfcaam_sha.h @@ -1,6 +1,6 @@ /* wolfcaam_sha.h * - * Copyright (C) 2006-2016 wolfSSL Inc. + * Copyright (C) 2006-2017 wolfSSL Inc. * * This file is part of wolfSSL. *