summaryrefslogtreecommitdiffstats
path: root/security/nss/lib/freebl/freebl_base.gypi
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@gmail.com>2018-04-25 21:33:33 +0200
committerwolfbeast <mcwerewolf@gmail.com>2018-04-25 21:33:33 +0200
commitfba28f19754f62b5227650143d5441fc86d4c7d7 (patch)
tree26629d73f83543ff92a060fd7b310bb748b13173 /security/nss/lib/freebl/freebl_base.gypi
parentb4154e043bfc0d2f301d88304efc896989d650bf (diff)
downloadUXP-fba28f19754f62b5227650143d5441fc86d4c7d7.tar
UXP-fba28f19754f62b5227650143d5441fc86d4c7d7.tar.gz
UXP-fba28f19754f62b5227650143d5441fc86d4c7d7.tar.lz
UXP-fba28f19754f62b5227650143d5441fc86d4c7d7.tar.xz
UXP-fba28f19754f62b5227650143d5441fc86d4c7d7.zip
Revert "Update NSS to 3.35-RTM"
This reverts commit f1a0f0a56fdd0fc39f255174ce08c06b91c66c94.
Diffstat (limited to 'security/nss/lib/freebl/freebl_base.gypi')
-rw-r--r--security/nss/lib/freebl/freebl_base.gypi48
1 files changed, 13 insertions, 35 deletions
diff --git a/security/nss/lib/freebl/freebl_base.gypi b/security/nss/lib/freebl/freebl_base.gypi
index 44e28963b..027aa2702 100644
--- a/security/nss/lib/freebl/freebl_base.gypi
+++ b/security/nss/lib/freebl/freebl_base.gypi
@@ -8,10 +8,8 @@
'alghmac.c',
'arcfive.c',
'arcfour.c',
- 'blake2b.c',
'camellia.c',
'chacha20poly1305.c',
- 'crypto_primitives.c',
'ctr.c',
'cts.c',
'des.c',
@@ -100,6 +98,10 @@
],
}],
[ 'OS=="win"', {
+ 'sources': [
+ #TODO: building with mingw should not need this.
+ 'ecl/uint128.c',
+ ],
'libraries': [
'advapi32.lib',
],
@@ -130,53 +132,29 @@
}],
],
}],
- ['target_arch=="ia32" or target_arch=="x64" or target_arch=="arm64" or target_arch=="aarch64"', {
+ ['target_arch=="ia32" or target_arch=="x64"', {
'sources': [
- # All intel and 64-bit ARM architectures get the 64 bit version.
+ # All intel architectures get the 64 bit version
'ecl/curve25519_64.c',
- 'verified/Hacl_Curve25519.c',
- 'verified/FStar.c',
],
}, {
'sources': [
- # All other architectures get the generic 32 bit implementation (slow!)
+ # All non intel architectures get the generic 32 bit implementation (slow!)
'ecl/curve25519_32.c',
],
}],
+ #TODO uint128.c
[ 'disable_chachapoly==0', {
'conditions': [
- [ 'OS!="win"', {
- 'conditions': [
- [ 'target_arch=="x64"', {
- 'sources': [
- 'chacha20_vec.c',
- 'verified/Hacl_Poly1305_64.c',
- ],
- }, {
- # !Windows & !x64
- 'conditions': [
- [ 'target_arch=="arm64" or target_arch=="aarch64"', {
- 'sources': [
- 'chacha20.c',
- 'verified/Hacl_Chacha20.c',
- 'verified/Hacl_Poly1305_64.c',
- ],
- }, {
- # !Windows & !x64 & !arm64 & !aarch64
- 'sources': [
- 'chacha20.c',
- 'verified/Hacl_Chacha20.c',
- 'poly1305.c',
- ],
- }],
- ],
- }],
+ [ 'OS!="win" and target_arch=="x64"', {
+ 'sources': [
+ 'chacha20_vec.c',
+ 'poly1305-donna-x64-sse2-incremental-source.c',
],
}, {
- # Windows
+ # not x64
'sources': [
'chacha20.c',
- 'verified/Hacl_Chacha20.c',
'poly1305.c',
],
}],