Add secure sockets to dart:io

runtime/bin/bin.gypi

 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 {
   'variables': {
+    'use_chromium_nss': 1,

[Søren Gjesse, 2012/09/28 09:17:31]

Please add a comment here on the different NSSes that can be used.

     'crypto_cc_file': '<(SHARED_INTERMEDIATE_DIR)/crypto_gen.cc',
     'io_cc_file': '<(SHARED_INTERMEDIATE_DIR)/io_gen.cc',
     'json_cc_file': '<(SHARED_INTERMEDIATE_DIR)/json_gen.cc',
     'uri_cc_file': '<(SHARED_INTERMEDIATE_DIR)/uri_gen.cc',
     'utf_cc_file': '<(SHARED_INTERMEDIATE_DIR)/utf_gen.cc',
     'builtin_in_cc_file': 'builtin_in.cc',
     'builtin_cc_file': '<(SHARED_INTERMEDIATE_DIR)/builtin_gen.cc',
     'snapshot_in_cc_file': 'snapshot_in.cc',
     'snapshot_bin_file': '<(SHARED_INTERMEDIATE_DIR)/snapshot_gen.bin',
     'snapshot_cc_file': '<(SHARED_INTERMEDIATE_DIR)/snapshot_gen.cc',
@@ skipping 204 matching lines @@
       'dependencies': [
         'generate_builtin_cc_file',
         'generate_crypto_cc_file',
         'generate_io_cc_file',
         'generate_json_cc_file',
         'generate_uri_cc_file',
         'generate_utf_cc_file',
       ],
       'include_dirs': [
         '..',
+        '/usr/include/nss',
+        '/usr/include/nspr',

[Søren Gjesse, 2012/09/28 09:17:31]

Shouldn't the /usr/include/... paths only be there if use_chromium_nss is 0?

+        '../nss',
+        '../nspr',

[Søren Gjesse, 2012/09/28 09:17:31]

Shouldn't the ../... paths be ../third_party/...?

[Bill Hesse, 2012/10/31 16:33:29]

All removed.  Replaced by direct-dependent includes in nss.gyp.

On 2012/09/28 09:17:31, Søren Gjesse wrote:

       ],
       'sources': [
         'builtin_natives.cc',
         'builtin.h',
       ],
       'includes': [
         'builtin_impl_sources.gypi',
         '../platform/platform_sources.gypi',
       ],
       'sources/': [
         ['exclude', '_test\\.(cc|h)$'],
       ],
       'conditions': [
         ['OS=="win"', {
-          'sources/' : [
+          'sources/': [
             ['exclude', 'fdutils.h'],
           ],
+          'defines': [
+            'NSS_USE_STATIC_LIBS=1',

[Søren Gjesse, 2012/09/28 09:17:31]

Should this define go with the rest of the NSS configuration?

[Bill Hesse, 2012/10/31 16:33:29]

Yes.  Done.

On 2012/09/28 09:17:31, Søren Gjesse wrote:

+          ],
+
           # TODO(antonm): fix the implementation.
           # Current implementation accepts char* strings
           # and therefore fails to compile once _UNICODE is
           # enabled.  That should be addressed using -A
           # versions of functions and adding necessary conversions.
           'configurations': {
             'Common_Base': {
               'msvs_configuration_attributes': {
                 'CharacterSet': '0',
               },
             },
           },
         }],
         ['OS=="linux"', {
           'link_settings': {
             'libraries': [
               '-ldl',
-            ],
-          },
+        ]}}]
+        ['use_chromium_nss==1', {
+          'defines': [
+            'CHROMIUM_NSS=1',
+          ],
+          'dependencies': [
+            '../third_party/nss/nss.gyp:nss',
+            '../third_party/nss/nss.gyp:nspr',
+            '../third_party/nss/nss.gyp:nssckbi',
+            '../third_party/nss/nss.gyp:nss_static',
+            '../net/third_party/nss/ssl.gyp:libssl',
+            '../third_party/zlib/zlib.gyp:zlib',
+          ],
+        }, { # Else using an unmodified NSS distribution or libraries.
+          'conditions': [
+            ['OS=="win"', {
+              'include_dirs': [
+                # Should be NSS Distribution include directory.

[Søren Gjesse, 2012/09/28 09:17:31]

Should we use a GYP variable to specify the NSS distribution location? That goes
for all platforms.

[Bill Hesse, 2012/10/31 16:33:29]

Removed.

On 2012/09/28 09:17:31, Søren Gjesse wrote:

+                '/src/nss-3.13.6/mozilla/dist/WINNT6.1_DBG.OBJ/include',
+              ],
+              'link_settings': {
+                'libraries': [
+                  '-lnss_static.lib', '-llibssl.lib', '-lcrnspr.lib',
+                  '-lcrnss.lib', '-lcrnssckbi.lib', '-lsqlite3.lib',
+                  '-lzlib.lib',
+              ]},
+              'msvs_sttings': {
+                'VSLinkerTool': {
+                  'AdditionalDependencies': [
+                    'nss_static.lib', 'libssl.lib', 'crnspr.lib', 'crnss.lib',
+                    'crnssckbi.lib', 'sqlite3.lib', 'zlib.lib',
+                  ],
+                  'AdditionalLibraryDirectories': [
+                    # Should be NSS Distribution library directory.
+                    '/src/dart-all/dart/DebugIA32/lib'
+              ]}},
+            }],
+            ['OS=="mac"', {
+              'include_dirs': [
+                # Add paths to NSS build include directories.
+              ],
+              'link_settings': {
+                'libraries': [
+                  # Make relative to a NSS build.
+                  '/Users/whesse/dart/nsslib/libnss3.dylib',
+                  '/Users/whesse/dart/nsslib/libnspr4.dylib',
+                  '/Users/whesse/dart/nsslib/libssl3.dylib',
+                ],
+                'ldflags': [
+                  '-lnss3',
+                  '-lnspr4',
+                  '-lssl3',
+                ],
+              },
+            }],
+            ['OS=="linux"', {
+              'include_dirs': [
+                '/usr/include/nss',
+                '/usr/include/nspr',
+              ],
+              'link_settings': {
+                'libraries': [
+                  '-lnspr4',
+                  '-lnss3',
+                  '-lssl3',
+                ]},
+            }],
+          ],
         }],
       ],
     },
     {
       'target_name': 'libdart_withcore',
       'type': 'static_library',
       'dependencies': [
         'libdart_lib_withcore',
         'libdart_vm',
         'libjscre',
@@ skipping 240 matching lines @@
         ['OS=="mac"', {
           'xcode_settings': {
             'OTHER_LDFLAGS': [ '-undefined', 'dynamic_lookup' ],
           },
         }],
       ],
     },
   ],
 }