60 lines
1.7 KiB
Diff
60 lines
1.7 KiB
Diff
|
diff --git a/lib/freebl/chacha20poly1305.c b/lib/freebl/chacha20poly1305.c
|
||
|
|
--- a/lib/freebl/chacha20poly1305.c
|
||
|
|
+++ b/lib/freebl/chacha20poly1305.c
|
||
|
|
@@ -213,27 +213,31 @@
|
||
|
|
{
|
||
|
|
#ifdef NSS_X64
|
||
|
|
#ifndef NSS_DISABLE_AVX2
|
||
|
|
if (avx2_support()) {
|
||
|
|
Hacl_Chacha20_Vec256_chacha20_encrypt_256(len, output, block, k, nonce, ctr);
|
||
|
|
+ return;
|
||
|
|
}
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#ifndef NSS_DISABLE_SSE3
|
||
|
|
if (ssse3_support() && sse4_1_support() && avx_support()) {
|
||
|
|
Hacl_Chacha20_Vec128_chacha20_encrypt_128(len, output, block, k, nonce, ctr);
|
||
|
|
+ return;
|
||
|
|
}
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#elif defined(__powerpc64__) && defined(__LITTLE_ENDIAN__) && \
|
||
|
|
!defined(NSS_DISABLE_ALTIVEC) && !defined(NSS_DISABLE_CRYPTO_VSX)
|
||
|
|
if (ppc_crypto_support()) {
|
||
|
|
chacha20vsx(len, output, block, k, nonce, ctr);
|
||
|
|
- } else
|
||
|
|
+ return;
|
||
|
|
+ }
|
||
|
|
#endif
|
||
|
|
{
|
||
|
|
Hacl_Chacha20_chacha20_encrypt(len, output, block, k, nonce, ctr);
|
||
|
|
+ return;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
#endif /* NSS_DISABLE_CHACHAPOLY */
|
||
|
|
|
||
|
|
SECStatus
|
||
|
|
@@ -449,20 +453,18 @@
|
||
|
|
(uint8_t *)ctx->key, (uint8_t *)nonce, adLen, (uint8_t *)ad, inputLen,
|
||
|
|
(uint8_t *)input, output, outTag);
|
||
|
|
goto finish;
|
||
|
|
}
|
||
|
|
#endif
|
||
|
|
-
|
||
|
|
- else
|
||
|
|
#elif defined(__powerpc64__) && defined(__LITTLE_ENDIAN__) && \
|
||
|
|
!defined(NSS_DISABLE_ALTIVEC) && !defined(NSS_DISABLE_CRYPTO_VSX)
|
||
|
|
if (ppc_crypto_support()) {
|
||
|
|
Chacha20Poly1305_vsx_aead_encrypt(
|
||
|
|
(uint8_t *)ctx->key, (uint8_t *)nonce, adLen, (uint8_t *)ad, inputLen,
|
||
|
|
(uint8_t *)input, output, outTag);
|
||
|
|
goto finish;
|
||
|
|
- } else
|
||
|
|
+ }
|
||
|
|
#endif
|
||
|
|
{
|
||
|
|
Hacl_Chacha20Poly1305_32_aead_encrypt(
|
||
|
|
(uint8_t *)ctx->key, (uint8_t *)nonce, adLen, (uint8_t *)ad, inputLen,
|
||
|
|
(uint8_t *)input, output, outTag);
|
||
|
|
|