From 3dd6f5e0807447194b12c7adc9a730d81738a0a6 Mon Sep 17 00:00:00 2001
From: "wtc@chromium.org"
 <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 1 Jun 2010 20:28:03 +0000
Subject: Use SSLClientSocketNSS on Mac OS X. By default, chrome still uses
 SSLClientSocketMac. Specify the --use-nss-for-ssl command-line option to use
 SSLClientSocketNSS.

The nss.gyp in src/net/third_party/nss is renamed ssl.gyp to avoid
a naming conflict with the nss.gyp in src/third_party/nss. The
GYP generator for Xcode project files disallows same-named .gyp files.

SSL client authentication doesn't work yet.

R=mark
BUG=30689
TEST=No build and test failures on Mac and Windows.
Review URL: http://codereview.chromium.org/2322008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48650 0039d316-1c4b-4281-b951-d872f2087c98
---
 net/third_party/nss/nss.gyp | 144 ------------------------------------------
 net/third_party/nss/ssl.gyp | 149 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 149 insertions(+), 144 deletions(-)
 delete mode 100644 net/third_party/nss/nss.gyp
 create mode 100644 net/third_party/nss/ssl.gyp

(limited to 'net/third_party')

diff --git a/net/third_party/nss/nss.gyp b/net/third_party/nss/nss.gyp
deleted file mode 100644
index a3610f5..0000000
--- a/net/third_party/nss/nss.gyp
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright (c) 2009 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.
-
-{
-  'conditions': [
-    [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
-      'conditions': [
-        ['sysroot!=""', {
-          'variables': {
-            'pkg-config': '../../../build/linux/pkg-config-wrapper "<(sysroot)"',
-          },
-        }, {
-          'variables': {
-            'pkg-config': 'pkg-config'
-          },
-        }],
-      ],
-    }],
-  ],
-
-  'targets': [
-    {
-      'target_name': 'ssl',
-      'product_name': 'ssl',
-      'type': '<(library)',
-      'sources': [
-        'ssl/authcert.c',
-        'ssl/cmpcert.c',
-        'ssl/derive.c',
-        'ssl/nsskea.c',
-        'ssl/os2_err.c',
-        'ssl/os2_err.h',
-        'ssl/preenc.h',
-        'ssl/prelib.c',
-        'ssl/ssl.h',
-        'ssl/ssl3con.c',
-        'ssl/ssl3ecc.c',
-        'ssl/ssl3ext.c',
-        'ssl/ssl3gthr.c',
-        'ssl/ssl3prot.h',
-        'ssl/sslauth.c',
-        'ssl/sslcon.c',
-        'ssl/ssldef.c',
-        'ssl/sslenum.c',
-        'ssl/sslerr.c',
-        'ssl/sslerr.h',
-        'ssl/sslgathr.c',
-        'ssl/sslimpl.h',
-        'ssl/sslinfo.c',
-        'ssl/sslmutex.c',
-        'ssl/sslmutex.h',
-        'ssl/sslnonce.c',
-        'ssl/sslproto.h',
-        'ssl/sslreveal.c',
-        'ssl/sslsecur.c',
-        'ssl/sslsnce.c',
-        'ssl/sslsock.c',
-        'ssl/sslt.h',
-        'ssl/ssltrace.c',
-        'ssl/sslver.c',
-        'ssl/unix_err.c',
-        'ssl/unix_err.h',
-        'ssl/win32err.c',
-        'ssl/win32err.h',
-        'ssl/bodge/loader.c',
-        'ssl/bodge/loader.h',
-        'ssl/bodge/secure_memcmp.c',
-      ],
-      'defines': [
-        'NSS_ENABLE_ECC',
-        'NSS_ENABLE_ZLIB',
-        'USE_UTIL_DIRECTLY',
-      ],
-      'defines!': [
-        # Regrettably, NSS can't be compiled with NO_NSPR_10_SUPPORT yet.
-        'NO_NSPR_10_SUPPORT',
-      ],
-      'conditions': [
-        [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
-          'sources!': [
-            'ssl/os2_err.c',
-            'ssl/os2_err.h',
-            'ssl/win32err.c',
-            'ssl/win32err.h',
-          ],
-          'defines': [
-            # These macros are needed only for compiling the files in
-            # ssl/bodge.
-            'SHLIB_PREFIX="lib"',
-            'SHLIB_SUFFIX="so"',
-            'SHLIB_VERSION="3"',
-            'SOFTOKEN_SHLIB_VERSION="3"',
-          ],
-          'include_dirs': [
-            'ssl/bodge',
-          ],
-          'cflags': [
-            '<!@(<(pkg-config) --cflags nss)',
-          ],
-          'ldflags': [
-            '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)',
-          ],
-          'libraries': [
-            '<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")',
-          ],
-        }],
-        [ 'OS == "win"', {
-          'sources/': [
-            ['exclude', 'ssl/bodge/'],
-          ],
-          'sources!': [
-            'ssl/os2_err.c',
-            'ssl/os2_err.h',
-            'ssl/unix_err.c',
-            'ssl/unix_err.h',
-          ],
-          'dependencies': [
-            '../../../third_party/zlib/zlib.gyp:zlib',
-            '../../../third_party/nss/nss.gyp:nss',
-          ],
-          'direct_dependent_settings': {
-            'include_dirs': [
-              'ssl',
-            ],
-          },
-        }],
-      ],
-      'configurations': {
-        'Debug_Base': {
-          'defines': [
-            'DEBUG',
-          ],
-        },
-      },
-    },
-  ],
-}
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:
diff --git a/net/third_party/nss/ssl.gyp b/net/third_party/nss/ssl.gyp
new file mode 100644
index 0000000..3166be8
--- /dev/null
+++ b/net/third_party/nss/ssl.gyp
@@ -0,0 +1,149 @@
+# Copyright (c) 2009 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.
+
+{
+  'conditions': [
+    [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
+      'conditions': [
+        ['sysroot!=""', {
+          'variables': {
+            'pkg-config': '../../../build/linux/pkg-config-wrapper "<(sysroot)"',
+          },
+        }, {
+          'variables': {
+            'pkg-config': 'pkg-config'
+          },
+        }],
+      ],
+    }],
+  ],
+
+  'targets': [
+    {
+      'target_name': 'ssl',
+      'product_name': 'ssl',
+      'type': '<(library)',
+      'sources': [
+        'ssl/authcert.c',
+        'ssl/cmpcert.c',
+        'ssl/derive.c',
+        'ssl/nsskea.c',
+        'ssl/os2_err.c',
+        'ssl/os2_err.h',
+        'ssl/preenc.h',
+        'ssl/prelib.c',
+        'ssl/ssl.h',
+        'ssl/ssl3con.c',
+        'ssl/ssl3ecc.c',
+        'ssl/ssl3ext.c',
+        'ssl/ssl3gthr.c',
+        'ssl/ssl3prot.h',
+        'ssl/sslauth.c',
+        'ssl/sslcon.c',
+        'ssl/ssldef.c',
+        'ssl/sslenum.c',
+        'ssl/sslerr.c',
+        'ssl/sslerr.h',
+        'ssl/sslgathr.c',
+        'ssl/sslimpl.h',
+        'ssl/sslinfo.c',
+        'ssl/sslmutex.c',
+        'ssl/sslmutex.h',
+        'ssl/sslnonce.c',
+        'ssl/sslproto.h',
+        'ssl/sslreveal.c',
+        'ssl/sslsecur.c',
+        'ssl/sslsnce.c',
+        'ssl/sslsock.c',
+        'ssl/sslt.h',
+        'ssl/ssltrace.c',
+        'ssl/sslver.c',
+        'ssl/unix_err.c',
+        'ssl/unix_err.h',
+        'ssl/win32err.c',
+        'ssl/win32err.h',
+        'ssl/bodge/loader.c',
+        'ssl/bodge/loader.h',
+        'ssl/bodge/secure_memcmp.c',
+      ],
+      'sources!': [
+        'ssl/os2_err.c',
+        'ssl/os2_err.h',
+      ],
+      'defines': [
+        'NSS_ENABLE_ECC',
+        'NSS_ENABLE_ZLIB',
+        'USE_UTIL_DIRECTLY',
+      ],
+      'defines!': [
+        # Regrettably, NSS can't be compiled with NO_NSPR_10_SUPPORT yet.
+        'NO_NSPR_10_SUPPORT',
+      ],
+      'conditions': [
+        [ 'OS == "win"', {
+            'sources!': [
+              'ssl/unix_err.c',
+              'ssl/unix_err.h',
+            ],
+          },
+          {  # else: OS != "win"
+            'sources!': [
+              'ssl/win32err.c',
+              'ssl/win32err.h',
+            ],
+          },
+        ],
+        [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
+          'defines': [
+            # These macros are needed only for compiling the files in
+            # ssl/bodge.
+            'SHLIB_PREFIX="lib"',
+            'SHLIB_SUFFIX="so"',
+            'SHLIB_VERSION="3"',
+            'SOFTOKEN_SHLIB_VERSION="3"',
+          ],
+          'include_dirs': [
+            'ssl/bodge',
+          ],
+          'cflags': [
+            '<!@(<(pkg-config) --cflags nss)',
+          ],
+          'ldflags': [
+            '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)',
+          ],
+          'libraries': [
+            '<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")',
+          ],
+        }],
+        [ 'OS == "mac" or OS == "win"', {
+          'sources/': [
+            ['exclude', 'ssl/bodge/'],
+          ],
+          'dependencies': [
+            '../../../third_party/zlib/zlib.gyp:zlib',
+            '../../../third_party/nss/nss.gyp:nss',
+          ],
+          'direct_dependent_settings': {
+            'include_dirs': [
+              'ssl',
+            ],
+          },
+        }],
+      ],
+      'configurations': {
+        'Debug_Base': {
+          'defines': [
+            'DEBUG',
+          ],
+        },
+      },
+    },
+  ],
+}
+
+# Local Variables:
+# tab-width:2
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=2 shiftwidth=2:
-- 
cgit v1.1