diff options
author | Benjamin Beurdouche <bbeurdouche@mozilla.com> | 2021-03-10 10:42:34 +0000 |
---|---|---|
committer | Benjamin Beurdouche <bbeurdouche@mozilla.com> | 2021-03-10 10:42:34 +0000 |
commit | 0e243256eae5c41609f49f7c502c8ece4d002eba (patch) | |
tree | 4ab9d0b6104cd62f83c7d333f1890ee05dde7f35 /lib/freebl | |
parent | 45c7b75d5d2d873b117b06c0a551666e7ccc46d2 (diff) | |
download | nss-hg-0e243256eae5c41609f49f7c502c8ece4d002eba.tar.gz |
Bug 1613235 - Clang-format for: POWER ChaCha20 stream cipher vector acceleration r=beurdoucheNSS_3_63_BETA1
Depends on D107221
Differential Revision: https://phabricator.services.mozilla.com/D107788
Diffstat (limited to 'lib/freebl')
-rw-r--r-- | lib/freebl/blapi.h | 1 | ||||
-rw-r--r-- | lib/freebl/chacha20poly1305-ppc.c | 2 | ||||
-rw-r--r-- | lib/freebl/chacha20poly1305.c | 22 | ||||
-rw-r--r-- | lib/freebl/loader.c | 8 |
4 files changed, 16 insertions, 17 deletions
diff --git a/lib/freebl/blapi.h b/lib/freebl/blapi.h index 3d1ff7269..569bd461f 100644 --- a/lib/freebl/blapi.h +++ b/lib/freebl/blapi.h @@ -1061,7 +1061,6 @@ extern ChaCha20Context *ChaCha20_CreateContext(const unsigned char *key, extern void ChaCha20_DestroyContext(ChaCha20Context *ctx, PRBool freeit); - /******************************************/ /* ** ChaCha20+Poly1305 AEAD diff --git a/lib/freebl/chacha20poly1305-ppc.c b/lib/freebl/chacha20poly1305-ppc.c index 55101ceb2..c9766cd40 100644 --- a/lib/freebl/chacha20poly1305-ppc.c +++ b/lib/freebl/chacha20poly1305-ppc.c @@ -25,7 +25,7 @@ /* Forward declaration from chacha20-ppc64le.S */ void chacha20vsx(uint32_t len, uint8_t *output, uint8_t *block, uint8_t *k, - uint8_t *nonce, uint32_t ctr); + uint8_t *nonce, uint32_t ctr); static inline void poly1305_padded_32(uint64_t *ctx, uint32_t len, uint8_t *text) diff --git a/lib/freebl/chacha20poly1305.c b/lib/freebl/chacha20poly1305.c index 746fdb7a2..da3d4c572 100644 --- a/lib/freebl/chacha20poly1305.c +++ b/lib/freebl/chacha20poly1305.c @@ -71,7 +71,7 @@ Hacl_Chacha20Poly1305_32_aead_decrypt(uint8_t *k, uint8_t *n1, uint32_t aadlen, // Forward declaration from chacha20-ppc64le.S void chacha20vsx(uint32_t len, uint8_t *output, uint8_t *block, uint8_t *k, - uint8_t *nonce, uint32_t ctr); + uint8_t *nonce, uint32_t ctr); // Forward declaration from chacha20poly1305-ppc.c extern void @@ -219,8 +219,8 @@ ChaCha20Xor(uint8_t *output, uint8_t *block, uint32_t len, uint8_t *k, #endif } else #elif defined(__powerpc64__) && defined(__LITTLE_ENDIAN__) && \ - !defined(NSS_DISABLE_ALTIVEC) && !defined(NSS_DISABLE_CRYPTO_VSX) - if (__builtin_cpu_supports ("vsx")) { + !defined(NSS_DISABLE_ALTIVEC) && !defined(NSS_DISABLE_CRYPTO_VSX) + if (__builtin_cpu_supports("vsx")) { chacha20vsx(len, output, block, k, nonce, ctr); } else #endif @@ -292,8 +292,8 @@ ChaCha20Poly1305_Seal(const ChaCha20Poly1305Context *ctx, unsigned char *output, #endif } else #elif defined(__powerpc64__) && defined(__LITTLE_ENDIAN__) && \ - !defined(NSS_DISABLE_ALTIVEC) && !defined(NSS_DISABLE_CRYPTO_VSX) - if (__builtin_cpu_supports ("vsx")) { + !defined(NSS_DISABLE_ALTIVEC) && !defined(NSS_DISABLE_CRYPTO_VSX) + if (__builtin_cpu_supports("vsx")) { Chacha20Poly1305_vsx_aead_encrypt( (uint8_t *)ctx->key, (uint8_t *)nonce, adLen, (uint8_t *)ad, inputLen, (uint8_t *)input, output, output + inputLen); @@ -361,8 +361,8 @@ ChaCha20Poly1305_Open(const ChaCha20Poly1305Context *ctx, unsigned char *output, #endif } else #elif defined(__powerpc64__) && defined(__LITTLE_ENDIAN__) && \ - !defined(NSS_DISABLE_ALTIVEC) && !defined(NSS_DISABLE_CRYPTO_VSX) - if (__builtin_cpu_supports ("vsx")) { + !defined(NSS_DISABLE_ALTIVEC) && !defined(NSS_DISABLE_CRYPTO_VSX) + if (__builtin_cpu_supports("vsx")) { res = Chacha20Poly1305_vsx_aead_decrypt( (uint8_t *)ctx->key, (uint8_t *)nonce, adLen, (uint8_t *)ad, ciphertextLen, (uint8_t *)output, (uint8_t *)input, (uint8_t *)input + ciphertextLen); @@ -417,8 +417,8 @@ ChaCha20Poly1305_Encrypt(const ChaCha20Poly1305Context *ctx, (uint8_t *)input, output, outTag); } else #elif defined(__powerpc64__) && defined(__LITTLE_ENDIAN__) && \ - !defined(NSS_DISABLE_ALTIVEC) && !defined(NSS_DISABLE_CRYPTO_VSX) - if (__builtin_cpu_supports ("vsx")) { + !defined(NSS_DISABLE_ALTIVEC) && !defined(NSS_DISABLE_CRYPTO_VSX) + if (__builtin_cpu_supports("vsx")) { Chacha20Poly1305_vsx_aead_encrypt( (uint8_t *)ctx->key, (uint8_t *)nonce, adLen, (uint8_t *)ad, inputLen, (uint8_t *)input, output, outTag); @@ -471,8 +471,8 @@ ChaCha20Poly1305_Decrypt(const ChaCha20Poly1305Context *ctx, (uint8_t *)output, (uint8_t *)input, (uint8_t *)tagIn); } else #elif defined(__powerpc64__) && defined(__LITTLE_ENDIAN__) && \ - !defined(NSS_DISABLE_ALTIVEC) && !defined(NSS_DISABLE_CRYPTO_VSX) - if (__builtin_cpu_supports ("vsx")) { + !defined(NSS_DISABLE_ALTIVEC) && !defined(NSS_DISABLE_CRYPTO_VSX) + if (__builtin_cpu_supports("vsx")) { res = Chacha20Poly1305_vsx_aead_decrypt( (uint8_t *)ctx->key, (uint8_t *)nonce, adLen, (uint8_t *)ad, ciphertextLen, (uint8_t *)output, (uint8_t *)input, (uint8_t *)tagIn); diff --git a/lib/freebl/loader.c b/lib/freebl/loader.c index 3c61471de..692a8831b 100644 --- a/lib/freebl/loader.c +++ b/lib/freebl/loader.c @@ -2160,10 +2160,10 @@ ChaCha20_Xor(unsigned char *output, const unsigned char *block, unsigned int len SECStatus ChaCha20_InitContext(ChaCha20Context *ctx, const unsigned char *key, - unsigned int keyLen, - const unsigned char *nonce, - unsigned int nonceLen, - PRUint32 ctr) + unsigned int keyLen, + const unsigned char *nonce, + unsigned int nonceLen, + PRUint32 ctr) { if (!vector && PR_SUCCESS != freebl_RunLoaderOnce()) return SECFailure; |