View | Details | Raw Unified | Return to bug 225326 | Differences between
and this patch

Collapse All | Expand All

(-)security/nss/patch-lib-freebl-Makefile (+25 lines)
Line 0 Link Here
1
--- lib/freebl/Makefile.orig	2018-01-18 15:19:59 UTC
2
+++ lib/freebl/Makefile
3
@@ -215,7 +215,7 @@ ifeq ($(CPU_ARCH),x86)
4
 endif
5
 endif # Darwin
6
 
7
-ifeq ($(OS_TARGET),Linux)
8
+ifeq (,$(filter-out Linux FreeBSD, $(OS_TARGET)))
9
 ifeq ($(CPU_ARCH),x86_64)
10
     ASFILES  = arcfour-amd64-gas.s mpi_amd64_gas.s
11
     ASFLAGS += -fPIC -Wa,--noexecstack
12
@@ -527,7 +527,12 @@ ifndef NSS_DISABLE_CHACHAPOLY
13
             EXTRA_SRCS += chacha20_vec.c
14
         endif
15
     else
16
-        EXTRA_SRCS += poly1305.c
17
+        ifeq ($(CPU_ARCH),aarch64)
18
+            EXTRA_SRCS += Hacl_Poly1305_64.c
19
+        else
20
+            EXTRA_SRCS += poly1305.c
21
+        endif
22
+
23
         EXTRA_SRCS += chacha20.c
24
         VERIFIED_SRCS += Hacl_Chacha20.c
25
     endif # x86_64

Return to bug 225326