summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFranziskus Kiefer <franziskuskiefer@gmail.com>2017-12-08 16:26:51 -0800
committerFranziskus Kiefer <franziskuskiefer@gmail.com>2017-12-08 16:26:51 -0800
commit2148e15bad1c9961a580e24d9f7146ef4e3cde4f (patch)
tree7705a933df8030b166459a4ec10189419e06d7f8
parent2aa1fccc6b2d564c2401d7abab9651033d2d03d8 (diff)
downloadnss-hg-2148e15bad1c9961a580e24d9f7146ef4e3cde4f.tar.gz
Bug 1399763 - follow-up to fix non-intel poly1305, r=me
-rw-r--r--lib/freebl/chacha20poly1305.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/freebl/chacha20poly1305.c b/lib/freebl/chacha20poly1305.c
index f6aa76de7..991fa0ca3 100644
--- a/lib/freebl/chacha20poly1305.c
+++ b/lib/freebl/chacha20poly1305.c
@@ -14,7 +14,7 @@
#include "blapit.h"
#ifndef NSS_DISABLE_CHACHAPOLY
-#ifdef HAVE_INT128_SUPPORT
+#if defined(HAVE_INT128_SUPPORT) && (defined(NSS_X86_OR_X64) || defined(__aarch64__))
#include "verified/Hacl_Poly1305_64.h"
#else
#include "poly1305.h"
@@ -27,7 +27,7 @@
* and ciphertext to |out|. */
#ifndef NSS_DISABLE_CHACHAPOLY
-#ifdef HAVE_INT128_SUPPORT
+#if defined(HAVE_INT128_SUPPORT) && (defined(NSS_X86_OR_X64) || defined(__aarch64__))
static void
Poly1305PadUpdate(Hacl_Impl_Poly1305_64_State_poly1305_state state, unsigned char *block, const unsigned char *p, const unsigned int pLen)