Fix bugs in intel-gcm-x86-masm.asm and re-enable the Intel AES assembly

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 1153 matching lines @@
             ['target_arch=="ia32"', {
               'defines': [
                 'NSS_X86_OR_X64',
                 'NSS_X86',
                 '_X86_',
                 'MP_ASSEMBLY_MULTIPLY',
                 'MP_ASSEMBLY_SQUARE',
                 'MP_ASSEMBLY_DIV_2DX1D',
                 'MP_USE_UINT_DIGIT',
                 'MP_NO_MP_WORD',
-              ],
-              # intel-gcm-x86-masm.asm seems to corrupt memory, so disable all
-              # Intel AES assembly code. (http://crbug.com/367515)
-              'sources!': [
-                'nss/lib/freebl/intel-aes-x86-masm.asm',
-                'nss/lib/freebl/intel-gcm-wrap.c',
-                'nss/lib/freebl/intel-gcm-x86-masm.asm',
+                'USE_HW_AES',
               ],
               'msvs_settings': {
                 'MASM': {
                   'UseSafeExceptionHandlers': 'true',
                 },
               },
             }],
             ['target_arch=="x64"', {
               'defines': [
                 'NSS_USE_64',
@@ skipping 46 matching lines @@
             '-Wno-incompatible-pointer-types',
             '-Wno-logical-op-parentheses',
             '-Wno-switch',
             '-Wno-tautological-compare',
           ],
         }],
       ],
     },
   ],
 }