Roll BoringSSL.

third_party/boringssl/update_gypi_and_asm.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can b
 # found in the LICENSE file.
 
 """Enumerates the BoringSSL source in src/ and generates two gypi files:
   boringssl.gypi and boringssl_tests.gypi."""
 
 import os
 import subprocess
 import sys
 
 
 # OS_ARCH_COMBOS maps from OS and platform to the OpenSSL assembly "style" for
 # that platform and the extension used by asm files.
 OS_ARCH_COMBOS = [
     ('linux', 'arm', 'elf', [''], 'S'),
     ('linux', 'x86', 'elf', ['-fPIC'], 'S'),
     ('linux', 'x86_64', 'elf', [''], 'S'),
     ('mac', 'x86', 'macosx', ['-fPIC'], 'S'),
     ('mac', 'x86_64', 'macosx', [''], 'S'),
     ('win', 'x86', 'win32n', [''], 'asm'),
-    ('win', 'x86_64', 'masm', [''], 'asm'),
+    ('win', 'x86_64', 'nasm', [''], 'asm'),
 ]
 
 # NON_PERL_FILES enumerates assembly files that are not processed by the
 # perlasm system.
 NON_PERL_FILES = {
     ('linux', 'arm'): [
         'src/crypto/poly1305/poly1305_arm_asm.S',
         'src/crypto/chacha/chacha_vec_arm.S',
     ],
 }
@@ skipping 202 matching lines @@
     for test in test_names:
       test_gypi.write("""      '%s',\n""" % test)
 
     test_gypi.write('    ],\n  }\n}\n')
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())