846be6085c
* bmo#1623338 - ride along: remove a duplicated doc page
* bmo#1623338 - remove a reference to IRC
* bmo#1831983 - clang-format lib/freebl/stubs.c
* bmo#1831983 - Add a constant time select function
* bmo#1774657 - Updating an old dbm with lots of certs with keys to
sql results in a database that is slow to access.
* bmo#1830973 - output early build errors by default
* bmo#1804505 - Update the technical constraints for KamuSM
* bmo#1822921 - Add BJCA Global Root CA1 and CA2 root certificates
* bmo#1790763 - Enable default UBSan Checks
* bmo#1786018 - Add explicit handling of zero length records
* bmo#1829391 - Tidy up DTLS ACK Error Handling Path
* bmo#1786018 - Refactor zero length record tests
* bmo#1829112 - Fix compiler warning via correct assert
* bmo#1755267 - run linux tests on nss-t/t-linux-xlarge-gcp
* bmo#1806496 - In FIPS mode, nss should reject RSASSA-PSS salt lengths
larger than the output size of the hash function used,
or provide an indicator
* bmo#1784163 - Fix reading raw negative numbers
* bmo#1748237 - Repairing unreachable code in clang built with gyp
* bmo#1783647 - Integrate Vale Curve25519
* bmo#1799468 - Removing unused flags for Hacl*
* bmo#1748237 - Adding a better error message
* bmo#1727555 - Update HACL* till 51a72a953a4ee6f91e63b2816ae5c4e62edf35d6
* bmo#1782980 - Fall back to the softokn when writing certificate trust
* bmo#1806010 - FIPS-104-3 requires we restart post programmatically
* bmo#1826650 - cmd/ecperf: fix dangling pointer warning on gcc 13
* bmo#1818766 - Update ACVP dockerfile for compatibility with debian
package changes
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/mozilla-nss?expand=0&rev=418
70 lines
2.3 KiB
Diff
70 lines
2.3 KiB
Diff
Index: nss/lib/freebl/Makefile
|
|
===================================================================
|
|
--- nss.orig/lib/freebl/Makefile
|
|
+++ nss/lib/freebl/Makefile
|
|
@@ -568,7 +568,6 @@ ifneq ($(shell $(CC) -? 2>&1 >/dev/null
|
|
HAVE_INT128_SUPPORT = 1
|
|
DEFINES += -DHAVE_INT128_SUPPORT
|
|
else ifeq (1,$(CC_IS_GCC))
|
|
- SUPPORTS_VALE_CURVE25519 = 1
|
|
ifneq (,$(filter 4.6 4.7 4.8 4.9,$(word 1,$(GCC_VERSION)).$(word 2,$(GCC_VERSION))))
|
|
HAVE_INT128_SUPPORT = 1
|
|
DEFINES += -DHAVE_INT128_SUPPORT
|
|
@@ -593,11 +592,6 @@ ifndef HAVE_INT128_SUPPORT
|
|
DEFINES += -DKRML_VERIFIED_UINT128
|
|
endif
|
|
|
|
-ifdef SUPPORTS_VALE_CURVE25519
|
|
- VERIFIED_SRCS += Hacl_Curve25519_64.c
|
|
- DEFINES += -DHACL_CAN_COMPILE_INLINE_ASM
|
|
-endif
|
|
-
|
|
ifndef NSS_DISABLE_CHACHAPOLY
|
|
ifeq ($(CPU_ARCH),x86_64)
|
|
ifndef NSS_DISABLE_AVX2
|
|
Index: nss/lib/freebl/freebl.gyp
|
|
===================================================================
|
|
--- nss.orig/lib/freebl/freebl.gyp
|
|
+++ nss/lib/freebl/freebl.gyp
|
|
@@ -866,12 +866,6 @@
|
|
}],
|
|
],
|
|
}],
|
|
- [ 'supports_vale_curve25519==1', {
|
|
- 'defines': [
|
|
- # The Makefile does version-tests on GCC, but we're not doing that here.
|
|
- 'HACL_CAN_COMPILE_INLINE_ASM',
|
|
- ],
|
|
- }],
|
|
[ 'OS=="linux" or OS=="android"', {
|
|
'conditions': [
|
|
[ 'target_arch=="x64"', {
|
|
@@ -934,11 +928,6 @@
|
|
'variables': {
|
|
'module': 'nss',
|
|
'conditions': [
|
|
- [ 'target_arch=="x64" and cc_is_gcc==1', {
|
|
- 'supports_vale_curve25519%': 1,
|
|
- }, {
|
|
- 'supports_vale_curve25519%': 0,
|
|
- }],
|
|
[ 'target_arch=="x64" or target_arch=="arm64" or target_arch=="aarch64"', {
|
|
'have_int128_support%': 1,
|
|
}, {
|
|
Index: nss/lib/freebl/freebl_base.gypi
|
|
===================================================================
|
|
--- nss.orig/lib/freebl/freebl_base.gypi
|
|
+++ nss/lib/freebl/freebl_base.gypi
|
|
@@ -151,11 +151,6 @@
|
|
'ecl/curve25519_32.c',
|
|
],
|
|
}],
|
|
- ['supports_vale_curve25519==1', {
|
|
- 'sources': [
|
|
- 'verified/Hacl_Curve25519_64.c',
|
|
- ],
|
|
- }],
|
|
['(target_arch!="ppc64" and target_arch!="ppc64le") or disable_altivec==1', {
|
|
'sources': [
|
|
# Gyp does not support per-file cflags, so working around like this.
|