Support x509 certificate on iOS.

net/net.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': {
     'chromium_code': 1,
 
     'linux_link_kerberos%': 0,
     'conditions': [
@@ skipping 273 matching lines @@
         'base/winsock_init.cc',
         'base/winsock_init.h',
         'base/winsock_util.cc',
         'base/winsock_util.h',
         'base/x509_cert_types.cc',
         'base/x509_cert_types.h',
         'base/x509_cert_types_mac.cc',
         'base/x509_cert_types_win.cc',
         'base/x509_certificate.cc',
         'base/x509_certificate.h',
+        'base/x509_certificate_ios.cc',
         'base/x509_certificate_mac.cc',
         'base/x509_certificate_net_log_param.cc',
         'base/x509_certificate_net_log_param.h',
         'base/x509_certificate_nss.cc',
+        'base/x509_certificate_nss_util.cc',
+        'base/x509_certificate_nss_util.h',
         'base/x509_certificate_openssl.cc',
         'base/x509_certificate_win.cc',
         'base/x509_util.h',
+        'base/x509_util_ios.cc',
+        'base/x509_util_ios.h',
         'base/x509_util_mac.cc',
         'base/x509_util_mac.h',
         'base/x509_util_nss.cc',
         'base/x509_util_nss.h',
         'base/x509_util_openssl.cc',
         'base/x509_util_openssl.h',
         'base/zap.cc',
         'base/zap.h',
         'cookies/canonical_cookie.cc',
         'cookies/canonical_cookie.h',
@@ skipping 589 matching lines @@
               'base/cert_verify_proc_nss.cc',
               'base/cert_verify_proc_nss.h',
               'base/crypto_module_nss.cc',
               'base/dnssec_keyset.cc',
               'base/dnssec_keyset.h',
               'base/keygen_handler_nss.cc',
               'base/nss_memio.c',
               'base/nss_memio.h',
               'base/test_root_certs_nss.cc',
               'base/x509_certificate_nss.cc',
+              'base/x509_certificate_nss_util.cc',
+              'base/x509_certificate_nss_util.h',
               'base/x509_util_nss.cc',
               'base/x509_util_nss.h',
               'ocsp/nss_ocsp.cc',
               'ocsp/nss_ocsp.h',
               'socket/nss_ssl_util.cc',
               'socket/nss_ssl_util.h',
               'socket/ssl_client_socket_nss.cc',
               'socket/ssl_client_socket_nss.h',
               'socket/ssl_server_socket_nss.cc',
               'socket/ssl_server_socket_nss.h',
@@ skipping 61 matching lines @@
               }],
             ],
           },
           {  # else: OS is not in the above list
             'sources!': [
               'base/cert_database_nss.cc',
               'base/crypto_module_nss.cc',
               'base/keygen_handler_nss.cc',
               'base/test_root_certs_nss.cc',
               'base/x509_certificate_nss.cc',
+              'base/x509_certificate_nss_util.cc',
+              'base/x509_certificate_nss_util.h',

[droger, 2012/09/11 17:26:49]

x509_util_nss does not show here.

[Ryan Sleevi, 2012/09/11 18:39:27]

And that's ok.

The exclusion of these files is about excluding functionality specifically
related to NSS-managed trust. The proposed additions to x509_util_nss have
nothing to do with trust, and only with parsing certificates.

It won't cause any compile issues for Win/Mac, it's excluded for Android builds
on line 917/918, and it's needed for iOS.  It should be fine.

               'ocsp/nss_ocsp.cc',
               'ocsp/nss_ocsp.h',
               'third_party/mozilla_security_manager/nsKeygenHandler.cpp',
               'third_party/mozilla_security_manager/nsKeygenHandler.h',
               'third_party/mozilla_security_manager/nsNSSCertificateDB.cpp',
               'third_party/mozilla_security_manager/nsNSSCertificateDB.h',
               'third_party/mozilla_security_manager/nsPKCS12Blob.cpp',
               'third_party/mozilla_security_manager/nsPKCS12Blob.h',
             ],
           },
@@ skipping 56 matching lines @@
               'libraries': [
                 '$(SDKROOT)/System/Library/Frameworks/Foundation.framework',
                 '$(SDKROOT)/System/Library/Frameworks/Security.framework',
                 '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framework',
                 '$(SDKROOT)/usr/lib/libresolv.dylib',
               ]
             },
           },
         ],
         [ 'OS == "ios"', {
+            'dependencies': [
+              '../third_party/nss/nss.gyp:nss',
+              'third_party/nss/ssl.gyp:libssl',
+            ],
             'link_settings': {
               'libraries': [
                 '$(SDKROOT)/System/Library/Frameworks/CFNetwork.framework',
                 '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framework',
+                '$(SDKROOT)/System/Library/Frameworks/Security.framework',
                 '$(SDKROOT)/System/Library/Frameworks/SystemConfiguration.framework',
                 '$(SDKROOT)/usr/lib/libresolv.dylib',
               ],
             },
             'sources/': [
               # TODO(ios): Right now there is only a very limited subset of net
               # compiled on iOS, just enough to bring up the dependencies needed
               # by the ui target.
               ['exclude', '.*'],
+              ['include', '^base/asn1_util\\.'],
               ['include', '^base/dns_util\\.'],
               ['include', '^base/escape\\.'],
+              ['include', '^base/ev_root_ca_metadata\\.'],
               ['include', '^base/ip_endpoint\\.'],
               ['include', '^base/mime_util\\.'],
               ['include', '^base/net_errors\\.'],
               ['include', '^base/network_change_notifier\\.'],
               ['include', '^base/net_errors_posix\\.cc$'],
               ['include', '^base/net_export\\.h$'],
               ['include', '^base/net_log\\.'],
               ['include', '^base/net_module\\.'],
               ['include', '^base/net_util\\.'],
               ['include', '^base/net_util_posix\\.cc$'],
               ['include', '^base/platform_mime_util\\.h$'],
+              ['include', '^base/pem_tokenizer\\.cc$'],
+              ['include', '^base/pem_tokenizer\\.h$'],
               ['include', '^base/registry_controlled_domains/registry_controlled_domain\\.'],
+              ['include', '^base/x509_certificate\\.'],
+              ['include', '^base/x509_certificate_ios\\.'],
+              ['include', '^base/x509_cert_types\\.'],
+              ['include', '^base/x509_util_ios\\.'],
               ['include', '^http/http_byte_range\\.'],
               ['include', '^http/http_content_disposition\\.'],
               ['include', '^http/http_util\\.'],
               ['include', '^http/http_util_icu\\.cc$'],
               ['include', '^http/http_version\\.h$'],
               ['include', '^url_request/url_request_job_manager\\.'],
               ['include', '^proxy/dhcp_proxy_script_fetcher\\.'],
               ['include', '^proxy/polling_proxy_config_service\\.'],
               ['include', '^proxy/proxy_config\\.'],
               ['include', '^proxy/proxy_config_service_ios\\.'],
@@ skipping 34 matching lines @@
           'sources/': [
             ['include', '^base/platform_mime_util_linux\\.cc$'],
           ],
         }],
         ['OS == "ios"', {
           'sources/': [
             ['include', 'base/network_change_notifier_mac\\.cc$'],
             ['include', 'base/network_config_watcher_mac\\.cc$'],
             ['include', 'base/platform_mime_util_mac\\.mm$'],
             ['include', 'proxy/proxy_resolver_mac\\.cc$'],
+            # The iOS implementation only partially uses NSS and thus does not
+            # defines |use_nss|. In particular the |USE_NSS| preprocessor
+            # definition is not used. The following files are needed though:
+            ['include', 'base/x509_certificate_nss_util\\.cc$'],
+            ['include', 'base/x509_certificate_nss_util\\.h$'],
           ],
         }],
       ],
     },
     {
       'target_name': 'net_unittests',
       'type': '<(gtest_target_type)',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:base_i18n',
@@ skipping 346 matching lines @@
           },
         ],
         [ 'OS == "mac"', {
             'dependencies': [
               '../third_party/nss/nss.gyp:nspr',
               '../third_party/nss/nss.gyp:nss',
               'third_party/nss/ssl.gyp:libssl',
             ],
           },
         ],
-        ['OS == "ios"', {
-          # TODO: For now this only tests the subset of code that is enabled in
-          # the net target.
-          'dependencies': [
-            '../testing/gtest.gyp:gtest_main',
-          ],
-          'sources/': [
-            ['exclude', '.*'],
-            ['include', '^base/dns_util_unittest\\.cc$'],
-            ['include', '^base/escape_unittest\\.cc$'],
-            ['include', '^base/ip_endpoint_unittest\\.cc$'],
-            ['include', '^base/mime_util_unittest\\.cc$'],
-            ['include', '^base/net_log_unittest\\.cc$'],
-            ['include', '^base/registry_controlled_domains/registry_controlled_domain_unittest\\.cc$'],
-            ['include', '^http/http_byte_range_unittest\\.cc$'],
-            ['include', '^http/http_content_disposition_unittest\\.cc$'],
-            ['include', '^http/http_util_unittest\\.cc$'],
-            ['include', '^proxy/proxy_config_service_common_unittest\\.cc$'],
-          ],
+        [ 'OS == "ios"', {
+            # TODO: For now this only tests the subset of code that is enabled
+            # in the net target.
+            'dependencies': [
+              '../third_party/nss/nss.gyp:nss',
+              '../testing/gtest.gyp:gtest_main',
+            ],
+            'sources/': [
+              ['exclude', '.*'],
+              ['include', '^base/dns_util_unittest\\.cc$'],
+              ['include', '^base/escape_unittest\\.cc$'],
+              ['include', '^base/ip_endpoint_unittest\\.cc$'],
+              ['include', '^base/mime_util_unittest\\.cc$'],
+              ['include', '^base/net_log_unittest\\.cc$'],
+              ['include', '^base/pem_tokenizer_unittest\\.cc$'],
+              ['include', '^base/registry_controlled_domains/registry_controlled_domain_unittest\\.cc$'],
+              ['include', '^base/x509_certificate_unittest\\.cc$'],
+              ['include', '^http/http_byte_range_unittest\\.cc$'],
+              ['include', '^http/http_content_disposition_unittest\\.cc$'],
+              ['include', '^http/http_util_unittest\\.cc$'],
+              ['include', '^proxy/proxy_config_service_common_unittest\\.cc$'],
+            ],
         }],
         [ 'OS == "linux"', {
             'dependencies': [
               '../build/linux/system.gyp:dbus',
               '../dbus/dbus.gyp:dbus_test_support',
             ],
           },
         ],
         [ 'OS == "android"', {
             'dependencies': [
@@ skipping 165 matching lines @@
           ],
         }],
         ['OS != "android"', {
           'sources!': [
             'test/remote_test_server.cc',
             'test/remote_test_server.h',
             'test/spawner_communicator.cc',
             'test/spawner_communicator.h',
           ],
         }],
+        ['OS == "ios"', {
+          'dependencies': [
+            '../third_party/nss/nss.gyp:nss',
+          ],
+        }],
         [ 'use_v8_in_net==1', {
             'dependencies': [
               'net_with_v8',
             ],
           },
         ],
       ],
     },
     {
       'target_name': 'net_resources',
@@ skipping 470 matching lines @@
                 '--result', '<@(_outputs)',
                 '--isolate', 'net_unittests.isolate',
               ],
             },
           ],
         },
       ],
     }],
   ],
 }