Prototype OpenSSL client socket implementation.

build/linux/system.gyp

 # 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': [
     ['sysroot!=""', {
       'variables': {
         'pkg-config': './pkg-config-wrapper "<(sysroot)"',
       },
     }, {
       'variables': {
         'pkg-config': 'pkg-config'
       },
     }],
     [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
       'variables': {
-        # We use our own copy of libssl, although we still need to link against
+        # We use our own copy of libssl3, although we still need to link against
         # the rest of NSS.
         'use_system_ssl%': 0,
       },
     }, {  # OS!="linux"
       'variables': {
         'use_system_ssl%': 1,
       },
     }],
   ],
 
@@ skipping 45 matching lines @@
       'conditions': [
         ['_toolset=="target"', {
           'conditions': [
             ['use_system_ssl==0', {
               'dependencies': [
                 '../../net/third_party/nss/ssl.gyp:ssl',
                 '../../third_party/zlib/zlib.gyp:zlib',
               ],
               'direct_dependent_settings': {
                 'cflags': [
-                  # We need for our local copies of the libssl headers to come
+                  # We need for our local copies of the libssl3 headers to come
                   # first, otherwise the code will build, but will fallback to
                   # the set of features advertised in the system headers.
                   # Unfortunately, there's no include path that we can filter
                   # out of $(pkg-config --cflags nss) and GYP include paths
                   # come after cflags on the command line. So we have these
                   # bodges:
                   '-I../net/third_party/nss/ssl',               # for scons
                   '-Inet/third_party/nss/ssl',                  # for make
                   '-IWebKit/chromium/net/third_party/nss/ssl',  # for make in webkit
                   '<!@(<(pkg-config) --cflags nss)',
                 ],
               },
               'link_settings': {
                 'ldflags': [
                   '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)',
                 ],
                 'libraries': [
                   '<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")',
                 ],
               },
-          }, {
+            }, {
               'direct_dependent_settings': {
                 'cflags': [
                   '<!@(<(pkg-config) --cflags nss)',
                 ],
                 'defines': [
                   'USE_SYSTEM_SSL',
                 ],
               },
               'link_settings': {
                 'ldflags': [
                   '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)',
                 ],
                 'libraries': [
                   '<!@(<(pkg-config) --libs-only-l nss)',
                 ],
               },
-          }]]
+            }
+          ]]
         }],
       ],
     },
     {
       'target_name': 'freetype2',
       'type': 'settings',
       'conditions': [
         ['_toolset=="target"', {
           'direct_dependent_settings': {
             'cflags': [
@@ skipping 180 matching lines @@
     },
     {
       'target_name': 'libresolv',
       'type': 'settings',
       'link_settings': {
         'libraries': [
           '-lresolv',
         ],
       },
     },
+    {
+      'target_name': 'openssl',
+      'type': 'settings',
+      'conditions': [
+        ['use_openssl==1', {
+          'direct_dependent_settings': {
+            'defines': [
+              'USE_OPENSSL',

[wtc, 2010/09/28 18:08:35]

You should document that eventually USE_OPENSSL and USE_NSS
will be mutually exclusive (only one of the macros should be
defined).  During the transitional period, a use_openssl=1
build still needs to define USE_NSS, so it is necessary to
test the USE_OPENSSL macro before testing USE_NSS.
(net/socket/client_socket_factory.cc is an example.)

[joth, 2010/09/29 11:58:54]

Done.

+            ],
+            'include_dirs': [
+              '<!@(<(pkg-config) --cflags openssl)',
+            ],
+          },
+          'link_settings': {
+            'libraries': [
+              '<!@(<(pkg-config) --libs-only-l openssl)',
+            ],
+          },
+        },],
+      ],
+    },
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: