Support ChaCha20+Poly1305 cipher suites.

nss.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'conditions': [
       ['OS=="ios"', {
         'exclude_nss_root_certs%': 0,
         'exclude_nss_libpkix%': 0,
@@ skipping 525 matching lines @@
         'nss/lib/freebl/alghmac.c',
         'nss/lib/freebl/alghmac.h',
         'nss/lib/freebl/arcfive.c',
         'nss/lib/freebl/arcfour.c',
         'nss/lib/freebl/blapi.h',
         'nss/lib/freebl/blapii.h',
         'nss/lib/freebl/blapit.h',
         'nss/lib/freebl/build_config_mac.h',
         'nss/lib/freebl/camellia.c',
         'nss/lib/freebl/camellia.h',
+        'nss/lib/freebl/chacha20/chacha20.c',
+        'nss/lib/freebl/chacha20/chacha20.h',
+        'nss/lib/freebl/chacha20/chacha20_vec.c',
+        'nss/lib/freebl/chacha20poly1305.c',
         'nss/lib/freebl/ctr.c',
         'nss/lib/freebl/ctr.h',
         'nss/lib/freebl/cts.c',
         'nss/lib/freebl/cts.h',
         'nss/lib/freebl/des.c',
         'nss/lib/freebl/des.h',
         'nss/lib/freebl/desblapi.c',
         'nss/lib/freebl/dh.c',
         'nss/lib/freebl/drbg.c',
         'nss/lib/freebl/dsa.c',
@@ skipping 37 matching lines @@
         'nss/lib/freebl/mpi/mpi_x86_asm.c',
         'nss/lib/freebl/mpi/mplogic.c',
         'nss/lib/freebl/mpi/mplogic.h',
         'nss/lib/freebl/mpi/mpmontg.c',
         'nss/lib/freebl/mpi/mpprime.c',
         'nss/lib/freebl/mpi/mpprime.h',
         'nss/lib/freebl/mpi/mp_gf2m-priv.h',
         'nss/lib/freebl/mpi/mp_gf2m.c',
         'nss/lib/freebl/mpi/mp_gf2m.h',
         'nss/lib/freebl/mpi/primes.c',
+        'nss/lib/freebl/poly1305/poly1305-donna-x64-sse2-incremental-source.c',
+        'nss/lib/freebl/poly1305/poly1305.c',
+        'nss/lib/freebl/poly1305/poly1305.h',
         'nss/lib/freebl/pqg.c',
         'nss/lib/freebl/pqg.h',
         'nss/lib/freebl/rawhash.c',
         'nss/lib/freebl/rijndael.c',
         'nss/lib/freebl/rijndael.h',
         'nss/lib/freebl/rijndael32.tab',
         'nss/lib/freebl/rsa.c',
         'nss/lib/freebl/secmpi.h',
         'nss/lib/freebl/secrng.h',
         'nss/lib/freebl/seed.c',
@@ skipping 449 matching lines @@
           ],
           'include_dirs/': [
             ['exclude', '^nss/lib/libpkix/'],
           ],
         }],
         ['target_arch=="ia32"', {
           'sources!': [
             'nss/lib/freebl/mpi/mpi_amd64.c',
           ],
         }],
+        ['target_arch=="x64" and OS!="win"', {

[agl, 2013/10/21 21:53:39]

That's a shame :(

What was the issue? I was hoping that, by avoiding asm code, that it would build
on Windows. If it's just a question of debugging-via-trybot then I think we
should disable the ciphersuites until we have this.

[wtc, 2013/10/22 22:36:42]

I described the issue in another file. In short, chacha20_vec.c uses the GCC
__attribute__ vector_size extension, and
poly1305-donna-x64-sse2-incremental-source.c uses the __int128 type. Both of
them are unavailable in Visual C++.

+          'sources!': [
+            'nss/lib/freebl/chacha20/chacha20.c',
+            'nss/lib/freebl/poly1305/poly1305.c',
+            ],
+        }, { # else: target_arch!="x64" or OS=="win"
+          'sources!': [
+            'nss/lib/freebl/chacha20/chacha20_vec.c',
+            'nss/lib/freebl/poly1305/poly1305-donna-x64-sse2-incremental-source.c',
+            ],
+        }],
         ['OS=="mac" or OS=="ios"', {
           'defines': [
             'XP_UNIX',
             'DARWIN',
             'HAVE_STRERROR',
             'HAVE_BSD_FLOCK',
             'SHLIB_SUFFIX=\"dylib\"',
             'SHLIB_PREFIX=\"lib\"',
             'SOFTOKEN_LIB_NAME=\"libsoftokn3.dylib\"',
           ],
@@ skipping 90 matching lines @@
             '-Wno-incompatible-pointer-types',
             '-Wno-logical-op-parentheses',
             '-Wno-switch',
             '-Wno-tautological-compare',
           ],
         }],
       ],
     },
   ],
 }