Attachment 903189 Details for Bug 1099619 – Additional changes needed due the rebase

[patch] Additional changes needed due the rebase

rebaseChanges.patch (text/plain), 4.32 KB, created by Elio Maldonado Batiz on 2014-06-07 22:44:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Elio Maldonado Batiz

Created: 2014-06-07 22:44:30 UTC

Size: 4.32 KB

patch

obsolete

>diff --git a/disable_hw_gcm.patch b/disable_hw_gcm.patch
>deleted file mode 100644
>index 6e81729..0000000
>--- a/disable_hw_gcm.patch
>+++ /dev/null
>@@ -1,55 +0,0 @@
>-diff -up ./nss/lib/freebl/Makefile.gcm_comp ./nss/lib/freebl/Makefile
>---- ./nss/lib/freebl/Makefile.gcm_comp	2013-07-26 12:19:14.000000000 -0700
>-+++ ./nss/lib/freebl/Makefile	2013-07-26 12:21:28.000000000 -0700
>-@@ -186,7 +186,12 @@ ifeq ($(CPU_ARCH),x86_64)
>-     DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
>- #   DEFINES += -DMPI_AMD64_ADD
>-     # comment the next two lines to turn off intel HW accelleration
>-+    ifndef DISABLE_HW_AES
>-     DEFINES += -DUSE_HW_AES
>-+    ifndef NSS_DISABLE_HW_GCM
>-+    DEFINES += -DUSE_HW_GCM
>-+    endif
>-+    endif
>-     ASFILES += intel-aes.s intel-gcm.s
>-     EXTRA_SRCS += intel-gcm-wrap.c
>-     INTEL_GCM = 1
>-@@ -443,7 +448,7 @@ else
>- 	DEFINES += -DNSS_BEVAND_ARCFOUR -DMPI_AMD64 -DMP_ASSEMBLY_MULTIPLY
>- 	DEFINES += -DNSS_USE_COMBA -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
>- 	# comment the next two lines to turn off intel HW accelleration
>--	DEFINES += -DUSE_HW_AES
>-+	DEFINES += -DUSE_HW_AES -DUSE_HW_GCM
>- 	ASFILES += intel-aes.s intel-gcm.s
>-         EXTRA_SRCS += intel-gcm-wrap.c
>-         INTEL_GCM = 1
>-diff -up ./nss/lib/freebl/rijndael.c.gcm_comp ./nss/lib/freebl/rijndael.c
>---- ./nss/lib/freebl/rijndael.c.gcm_comp	2013-07-26 12:14:03.000000000 -0700
>-+++ ./nss/lib/freebl/rijndael.c	2013-07-26 12:18:46.000000000 -0700
>-@@ -1009,16 +1009,22 @@ aes_InitContext(AESContext *cx, const un
>-     if (has_intel_aes == 0) {
>- 	unsigned long eax, ebx, ecx, edx;
>- 	char *disable_hw_aes = getenv("NSS_DISABLE_HW_AES");
>-+	char *disable_hw_gcm = NULL;
>- 
>-+	has_intel_clmul = -1;
>-+	has_intel_avx = -1;
>- 	if (disable_hw_aes == NULL) {
>- 	    freebl_cpuid(1, &eax, &ebx, &ecx, &edx);
>- 	    has_intel_aes = (ecx & (1 << 25)) != 0 ? 1 : -1;
>--	    has_intel_clmul = (ecx & (1 << 1)) != 0 ? 1 : -1;
>--	    has_intel_avx = (ecx & (1 << 28)) != 0 ? 1 : -1;
>-+#ifdef USE_HW_GCM
>-+	    disable_hw_gcm = getenv("NSS_DISABLE_HW_GCM");
>-+	    if (disable_hw_gcm == NULL) {
>-+		has_intel_clmul = (ecx & (1 << 1)) != 0 ? 1 : -1;
>-+		has_intel_avx = (ecx & (1 << 28)) != 0 ? 1 : -1;
>-+	    }
>-+#endif
>- 	} else {
>- 	    has_intel_aes = -1;
>--	    has_intel_avx = -1;
>--	    has_intel_clmul = -1;
>- 	}
>-     }
>-     use_hw_aes = (PRBool)
>diff --git a/nss.spec b/nss.spec
>index 038b843..94957db 100644
>--- a/nss.spec
>+++ b/nss.spec
>@@ -16,7 +16,7 @@
> Summary:          Network Security Services
> Name:             nss
> Version:          3.16.1
>-Release:          4%{?dist}
>+Release:          5%{?dist}
> License:          MPLv2.0
> URL:              http://www.mozilla.org/projects/security/pki/nss/
> Group:            System Environment/Libraries
>@@ -95,8 +95,6 @@ Patch51: Bug-702083-dont-require-unique-file-basenames.patch
> Patch60: Bug-961659-dont-hold-issuer-cert-handles-in-crl-cache.patch
> # Upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=943144
> Patch62: nss-fix-deadlock-squash.patch
>-# Disable hw gcm on RHEL5-based build environments where older OS lacks support
>-Patch63: disable_hw_gcm.patch
> Patch59: 0001-RHBZ-895339.patch
> Patch64: 0001-pinst-make-derEncodingsMatch-work-with-encrypted-key.patch
> 
>@@ -202,7 +200,6 @@ low level services.
> %patch51 -p1 -b .702083
> %patch60 -p0 -b .961659
> %patch62 -p1 -b .deadlock
>-#%patch63 -p0 -b .hw_comp
> %patch59 -p3 -b .895339
> %patch64 -p1 -b .895339
> %patch69 -p0 -b .uint32
>@@ -294,8 +291,8 @@ NSS_ENABLE_ECC=1
> export NSS_ENABLE_ECC
> 
> # On some RHEL-5.x based build machines the kernel lacks support for hardware GCM
>-NSS_DISABLE_HW_GCM=1
>-export NSS_DISABLE_HW_GCM
>+NSS_DISABLE_HW_AES=1
>+export NSS_DISABLE_HW_AES
> 
> ##### phase 1: remove util/freebl/softoken and low level tools
> ######## Remove freebl, softoken and util
>@@ -396,7 +393,7 @@ export NSS_BLTEST_NOT_AVAILABLE=1
> export SOFTOKEN_LIB_DIR=%{_libdir}
> 
> # On RHEL-5.x based build machines the kernel lacks support for hardware GCM
>-export NSS_DISABLE_HW_GCM=1
>+export NSS_DISABLE_HW_AES=1
> 
> # End -- copied from the build section
> 
>@@ -732,6 +729,10 @@ fi
> 
> 
> %changelog
>+* Sat Jun 07 2014 Elio Maldonado <emaldona@redhat.com> - 3.16.1-5
>+- Using NSS_DISABLE_HW_AES=1 instead of NSS_DISABLE_HW_GCM=1
>+- Remove disable_hw_gcm.patch obsoleted by the rebase to 3.16.1
>+
> * Fri Jun 06 2014 Elio Maldonado <emaldona@redhat.com> - 3.16.1-4
> - Remove unused patches rendered obsolete
>

Flags:

rrelyea: review-

Actions: View | Diff

Attachments on bug 1099619: 898508 | 898509 | 898716 | 903189 | 913569 | 928882 | 928886 | 928887