From 4fd629d4e7d8712a65e28ba03fd48e23a84debad Mon Sep 17 00:00:00 2001 From: Hideki Miyazaki Date: Thu, 20 Apr 2023 16:07:51 +0900 Subject: [PATCH] fix white spaces and overlong lines --- wolfcrypt/src/port/Renesas/renesas_common.c | 13 ++++++++----- wolfcrypt/src/port/Renesas/renesas_sce_util.c | 3 ++- wolfcrypt/src/rsa.c | 12 +++++++----- wolfcrypt/src/sha256.c | 12 ++++++++---- wolfcrypt/test/test.c | 4 ++-- 5 files changed, 27 insertions(+), 17 deletions(-) diff --git a/wolfcrypt/src/port/Renesas/renesas_common.c b/wolfcrypt/src/port/Renesas/renesas_common.c index 000123b01..319832aff 100644 --- a/wolfcrypt/src/port/Renesas/renesas_common.c +++ b/wolfcrypt/src/port/Renesas/renesas_common.c @@ -21,10 +21,12 @@ #include -#if defined(WOLFSSL_RENESAS_SCEPROTECT) || defined(WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY) \ +#if defined(WOLFSSL_RENESAS_SCEPROTECT) + || defined(WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY) \ || defined(WOLFSSL_RENESAS_TSIP_TLS) -#if defined(WOLFSSL_RENESAS_SCEPROTECT) || defined(WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY) +#if defined(WOLFSSL_RENESAS_SCEPROTECT) || \ + defined(WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY) #include #define cmn_hw_lock wc_sce_hw_lock #define cmn_hw_unlock wc_sce_hw_unlock @@ -349,8 +351,8 @@ static int Renesas_cmn_CryptoDevCb(int devIdArg, wc_CryptoInfo* info, void* ctx) sizeof(sce_aes_wrapped_key_t)); info->cipher.aescbc.aes->ctx.keySize = 32; - } else if (cbInfo->flags2.bits.aes128_installedkey_set == 1 && - info->cipher.aescbc.aes->keylen == 16) { + } else if (cbInfo->flags2.bits.aes128_installedkey_set + == 1 && info->cipher.aescbc.aes->keylen == 16) { XMEMCPY(&info->cipher.aescbc.aes->ctx.sce_wrapped_key, &cbInfo->sce_wrapped_key_aes128, sizeof(sce_aes_wrapped_key_t)); @@ -454,7 +456,8 @@ int wc_CryptoCb_CryptInitRenesasCmn(WOLFSSL* ssl, void* ctx) #if defined(WOLFSSL_RENESAS_TSIP_TLS) TsipUserCtx* cbInfo = (TsipUserCtx*)ctx; - #elif defined(WOLFSSL_RENESAS_SCEPROTECT) || defined(WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY) + #elif defined(WOLFSSL_RENESAS_SCEPROTECT) || \ + defined(WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY) User_SCEPKCbInfo* cbInfo = (User_SCEPKCbInfo*)ctx; #endif diff --git a/wolfcrypt/src/port/Renesas/renesas_sce_util.c b/wolfcrypt/src/port/Renesas/renesas_sce_util.c index ed7f2a323..f861826cc 100644 --- a/wolfcrypt/src/port/Renesas/renesas_sce_util.c +++ b/wolfcrypt/src/port/Renesas/renesas_sce_util.c @@ -20,7 +20,8 @@ */ #include -#if defined(WOLFSSL_RENESAS_SCEPROTECT) || defined(WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY) +#if defined(WOLFSSL_RENESAS_SCEPROTECT) || \ + defined(WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY) #include #include diff --git a/wolfcrypt/src/rsa.c b/wolfcrypt/src/rsa.c index 4a8faaf2f..38d002b5c 100644 --- a/wolfcrypt/src/rsa.c +++ b/wolfcrypt/src/rsa.c @@ -3374,20 +3374,21 @@ static int RsaPublicEncryptEx(const byte* in, word32 inLen, byte* out, labelSz, sz); } #elif defined(WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY) - /* SCE needs warpped key which is passed via + /* SCE needs warpped key which is passed via * user ctx object of crypt-call back. */ #ifdef WOLF_CRYPTO_CB if (key->devId != INVALID_DEVID) { /* SCE supports 1024 and 2048 bits */ - ret = wc_CryptoCb_Rsa(in, inLen, out, outLen, rsa_type, key, rng); + ret = wc_CryptoCb_Rsa(in, inLen, out, + outLen, rsa_type, key, rng); if (ret != CRYPTOCB_UNAVAILABLE) return ret; /* fall-through when unavailable */ ret = 0; /* reset error code and try using software */ } #endif - + #endif /* WOLFSSL_SE050 */ key->state = RSA_STATE_ENCRYPT_PAD; @@ -3535,14 +3536,15 @@ static int RsaPrivateDecryptEx(const byte* in, word32 inLen, byte* out, #elif defined(WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY) #ifdef WOLF_CRYPTO_CB if (key->devId != INVALID_DEVID) { - ret = wc_CryptoCb_Rsa(in, inLen, out, outLen, rsa_type, key, rng); + ret = wc_CryptoCb_Rsa(in, inLen, out, + outLen, rsa_type, key, rng); if (ret != CRYPTOCB_UNAVAILABLE) return ret; /* fall-through when unavailable */ ret = 0; /* reset error code and try using software */ } #endif - + #endif /* WOLFSSL_CRYPTOCELL */ diff --git a/wolfcrypt/src/sha256.c b/wolfcrypt/src/sha256.c index 804b10fb8..a5567b192 100644 --- a/wolfcrypt/src/sha256.c +++ b/wolfcrypt/src/sha256.c @@ -214,7 +214,8 @@ on the specific device platform. (!defined(WOLFSSL_RENESAS_TSIP_CRYPT) || defined(NO_WOLFSSL_RENESAS_TSIP_CRYPT_HASH)) && \ !defined(WOLFSSL_PSOC6_CRYPTO) && !defined(WOLFSSL_IMXRT_DCP) && !defined(WOLFSSL_SILABS_SE_ACCEL) && \ !defined(WOLFSSL_KCAPI_HASH) && !defined(WOLFSSL_SE050_HASH) && \ - ((!defined(WOLFSSL_RENESAS_SCEPROTECT) && !defined(WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY)) \ + ((!defined(WOLFSSL_RENESAS_SCEPROTECT) && \ + !defined(WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY)) \ || defined(NO_WOLFSSL_RENESAS_SCEPROTECT_HASH)) && \ (!defined(WOLFSSL_HAVE_PSA) || defined(WOLFSSL_PSA_NO_HASH)) && \ !defined(WOLFSSL_RENESAS_RX64_HASH) @@ -797,7 +798,8 @@ static int InitSha256(wc_Sha256* sha256) /* implemented in wolfcrypt/src/port/Renesas/renesas_tsip_sha.c */ -#elif (defined(WOLFSSL_RENESAS_SCEPROTECT) || defined(WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY)) && \ +#elif (defined(WOLFSSL_RENESAS_SCEPROTECT) || \ + defined(WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY)) && \ !defined(NO_WOLFSSL_RENESAS_SCEPROTECT_HASH) /* implemented in wolfcrypt/src/port/Renesas/renesas_sce_sha.c */ @@ -1753,7 +1755,8 @@ void wc_Sha256Free(wc_Sha256* sha256) (defined(WOLFSSL_DEVCRYPTO_HASH) && defined(WOLFSSL_DEVCRYPTO_HASH_KEEP)) || \ (defined(WOLFSSL_RENESAS_TSIP_CRYPT) && \ !defined(NO_WOLFSSL_RENESAS_TSIP_CRYPT_HASH)) || \ - ((defined(WOLFSSL_RENESAS_SCEPROTECT) || defined(WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY)) && \ + ((defined(WOLFSSL_RENESAS_SCEPROTECT) || \ + defined(WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY)) && \ !defined(NO_WOLFSSL_RENESAS_SCEPROTECT_HASH)) || \ defined(WOLFSSL_RENESAS_RX64_HASH) || \ defined(WOLFSSL_HASH_KEEP) @@ -1933,7 +1936,8 @@ int wc_Sha224_Grow(wc_Sha224* sha224, const byte* in, int inSz) /* implemented in wolfcrypt/src/port/Renesas/renesas_tsip_sha.c */ -#elif (defined(WOLFSSL_RENESAS_SCEPROTECT) || defined(WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY)) && \ +#elif (defined(WOLFSSL_RENESAS_SCEPROTECT) || \ + defined(WOLFSSL_RENESAS_SCEPROTECT_CRYPTONLY)) && \ !defined(NO_WOLFSSL_RENESAS_SCEPROTECT_HASH) /* implemented in wolfcrypt/src/port/Renesas/renesas_sce_sha.c */ diff --git a/wolfcrypt/test/test.c b/wolfcrypt/test/test.c index a276e8684..a8da96a02 100644 --- a/wolfcrypt/test/test.c +++ b/wolfcrypt/test/test.c @@ -2960,13 +2960,13 @@ WOLFSSL_TEST_SUBROUTINE int sha256_test(void) ret = wc_Sha256Update(&sha, (byte*)large_input, (word32)sizeof(large_input)); if (ret != 0) - ERROR_OUT(WC_TEST_RET_ENC_EC(ret), exit); + ERROR_OUT(WC_TEST_RET_ENC_EC(ret), exit); } ret = wc_Sha256Final(&sha, hash); if (ret != 0) ERROR_OUT(WC_TEST_RET_ENC_EC(ret), exit); if (XMEMCMP(hash, large_digest, WC_SHA256_DIGEST_SIZE) != 0) - ERROR_OUT(WC_TEST_RET_ENC_NC, exit); + ERROR_OUT(WC_TEST_RET_ENC_NC, exit); } /* END LARGE HASH TEST */ #endif /* NO_LARGE_HASH_TEST */