1 files changed, 40 insertions, 38 deletions
diff --git a/security/nss/lib/freebl/freebl_base.gypi b/security/nss/lib/freebl/freebl_base.gypi
index 7661bf2401..f2d1304fd4 100644
--- a/security/nss/lib/freebl/freebl_base.gypi
+++ b/security/nss/lib/freebl/freebl_base.gypi
@@ -4,6 +4,7 @@
 {
   'sources': [
     'aeskeywrap.c',
+    'alg2268.c',
     'cmac.c',
     'alghmac.c',
     'arcfive.c',
@@ -34,8 +35,6 @@
     'ecl/ecp_jac.c',
     'ecl/ecp_jm.c',
     'ecl/ecp_mont.c',
-    'ecl/ecp_secp384r1.c',
-    'ecl/ecp_secp521r1.c',
     'fipsfreebl.c',
     'blinit.c',
     'freeblver.c',
@@ -56,6 +55,7 @@
     'rijndael.c',
     'rsa.c',
     'rsapkcs.c',
+    'seed.c',
     'sha512.c',
     'sha_fast.c',
     'shvfy.c',
@@ -69,11 +69,11 @@
           'sources': [
             'arcfour-amd64-gas.s',
             'mpi/mpi_amd64.c',
-            'mpi/mpi_amd64_common.S',
+            'mpi/mpi_amd64_gas.s',
             'mpi/mp_comba.c',
           ],
           'conditions': [
-            [ 'cc_is_clang==1 and fuzz!=1 and coverage!=1', {
+            [ 'cc_is_clang==1 and fuzz!=1', {
               'cflags': [
                 '-no-integrated-as',
               ],
@@ -133,43 +133,54 @@
         }],
       ],
     }],
-    ['have_int128_support==1', {
+    ['target_arch=="ia32" or target_arch=="x64" or target_arch=="arm64" or target_arch=="aarch64"', {
       'sources': [
-        # All intel x64 and 64-bit ARM architectures get the 64 bit version.
+        # All intel and 64-bit ARM architectures get the 64 bit version.
         'ecl/curve25519_64.c',
-        'verified/Hacl_Curve25519_51.c',
+        'verified/Hacl_Curve25519.c',
       ],
     }, {
       'sources': [
-        # All other architectures get the generic 32 bit implementation.
+        # All other architectures get the generic 32 bit implementation (slow!)
         'ecl/curve25519_32.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.
-        # ppc performance greatly benefits from specific flags.
-        'sha512.c',
-      ],
-    }],
     [ 'disable_chachapoly==0', {
       # The ChaCha20 code is linked in through the static ssse3-crypto lib on
       # all platforms that support SSSE3. There are runtime checks in place to
       # choose the correct ChaCha implementation at runtime.
       'sources': [
         'verified/Hacl_Chacha20.c',
-        'verified/Hacl_Chacha20Poly1305_32.c',
-        'verified/Hacl_Poly1305_32.c',
       ],
-    }],
-    [ 'disable_deprecated_seed==0', {
-      'sources': [
-        'deprecated/seed.c',
-      ],
-    }],
-    [ 'disable_deprecated_rc2==0', {
-      'sources': [
-        'deprecated/alg2268.c',
+      'conditions': [
+        [ 'OS!="win"', {
+          'conditions': [
+            [ 'target_arch=="x64"', {
+              'sources': [
+                'verified/Hacl_Poly1305_64.c',
+              ],
+            }, {
+              # !Windows & !x64
+              'conditions': [
+                [ 'target_arch=="arm64" or target_arch=="aarch64"', {
+                  'sources': [
+                    'verified/Hacl_Poly1305_64.c',
+                  ],
+                }, {
+                  # !Windows & !x64 & !arm64 & !aarch64
+                  'sources': [
+                    'verified/Hacl_Poly1305_32.c',
+                  ],
+                }],
+              ],
+            }],
+          ],
+        }, {
+          # Windows
+          'sources': [
+            'verified/Hacl_Poly1305_32.c',
+          ],
+        }],
       ],
     }],
     [ 'fuzz==1', {
@@ -203,21 +214,12 @@
             'MP_ASSEMBLY_SQUARE',
             'MP_ASSEMBLY_DIV_2DX1D',
           ],
-        }, 'target_arch=="x64"', {
-          'sources': [
-            'mpi/mpi_amd64.c',
-            'mpi/mpi_amd64_common.S',
-            'mpi/mp_comba.c',
-          ],
-          'defines': [
-            'MP_IS_LITTLE_ENDIAN',
-            'MPI_AMD64',
-            'MP_ASSEMBLY_MULTIPLY',
-            'NSS_USE_COMBA',
-          ],
         }],
       ],
     }],
+    [ 'have_int128_support==0', {
+        'sources': [ 'verified/FStar.c' ],
+    }],
   ],
  'ldflags': [
    '-Wl,-Bsymbolic'