third_party/instrumented_libraries/patches/nss.diff - Issue 610643002: Instrumented libraries: update the custom patch for NSS.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/instrumented_libraries/patches/nss.diff

Issue 610643002: Instrumented libraries: update the custom patch for NSS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: third_party/instrumented_libraries/patches/nss.diff

diff --git a/third_party/instrumented_libraries/patches/nss.diff b/third_party/instrumented_libraries/patches/nss.diff

index 24adde7c83b4a5f631db0531ab3457bba06e5091..1275e5afb7977f4acfd88c27011b5e3298fbab70 100644

--- a/third_party/instrumented_libraries/patches/nss.diff

+++ b/third_party/instrumented_libraries/patches/nss.diff

@@ -1,24 +1,24 @@

-diff -rupN ./nss/lib/freebl/Makefile ../nss-3.15.4-patched/nss/lib/freebl/Makefile

---- ./nss/lib/freebl/Makefile 2014-01-03 23:59:10.000000000 +0400

-+++ ../nss-3.15.4-patched/nss/lib/freebl/Makefile 2014-06-27 00:07:28.017558175 +0400

-@@ -179,18 +179,20 @@ endif # Darwin

+diff -rupN ./nss/lib/freebl/Makefile ../nss-3.17.1-patched/nss/lib/freebl/Makefile

+--- ./nss/lib/freebl/Makefile 2014-09-23 23:09:22.000000000 +0400

++++ ../nss-3.17.1-patched/nss/lib/freebl/Makefile 2014-09-26 20:36:05.639317008 +0400

+@@ -196,18 +196,20 @@ endif # Darwin

ifeq ($(OS_TARGET),Linux)

ifeq ($(CPU_ARCH),x86_64)

- ASFILES = arcfour-amd64-gas.s mpi_amd64_gas.s

+# Disable inline asm in instrumented builds.

+# ASFILES = arcfour-amd64-gas.s mpi_amd64_gas.s

- ASFLAGS += -m64 -fPIC -Wa,--noexecstack

+ ASFLAGS += -fPIC -Wa,--noexecstack

- DEFINES += -DNSS_BEVAND_ARCFOUR -DMPI_AMD64 -DMP_ASSEMBLY_MULTIPLY

- DEFINES += -DNSS_USE_COMBA

+# DEFINES += -DNSS_BEVAND_ARCFOUR -DMPI_AMD64 -DMP_ASSEMBLY_MULTIPLY

+# DEFINES += -DNSS_USE_COMBA

DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN

# DEFINES += -DMPI_AMD64_ADD

- # comment the next two lines to turn off intel HW accelleration

-- DEFINES += -DUSE_HW_AES

+ # comment the next four lines to turn off Intel HW acceleration.

+- DEFINES += -DUSE_HW_AES -DINTEL_GCM

- ASFILES += intel-aes.s intel-gcm.s

-+# DEFINES += -DUSE_HW_AES

++# DEFINES += -DUSE_HW_AES -DINTEL_GCM

+# ASFILES += intel-aes.s intel-gcm.s

+# This is just intrinsics and should be fine.

EXTRA_SRCS += intel-gcm-wrap.c

« no previous file with comments | « no previous file | no next file » | no next file with comments »