Switch linux OpenSSL build to use custom openssl version

This allows us to test experimental library features, and to track a known openssl version.
Also bumps OpenSSL 65717:68738, to fix up the default CA root path in the reference library.

BUG=None
TEST=Still builds & runs!

Review URL: http://codereview.chromium.org/5625012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68749 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 9 insertions, 31 deletions

diff --git a/DEPS b/DEPS
index d3258d7..dd2259c 100644
--- a/DEPS
+++ b/DEPS
@@ -268,7 +268,7 @@ deps_os = {
       (Var("googlecode_url") % "linux-syscall-support") + "/trunk/lss@3",
 
     "src/third_party/openssl":
-      "/trunk/deps/third_party/openssl@65717",
+      "/trunk/deps/third_party/openssl@68738",
   },
 }
 
diff --git a/base/base.gypi b/base/base.gypi
index c71f28a..3b38a0d 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -446,7 +446,7 @@
             ],
             [ 'use_openssl==1', {
                 'dependencies': [
-                  '../build/linux/system.gyp:openssl',
+                  '../third_party/openssl/openssl.gyp:openssl',
                 ],
               }, {  # use_openssl==0
                 'dependencies': [
diff --git a/build/common.gypi b/build/common.gypi
index 718c2e5..fb1a70d 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -320,7 +320,7 @@
     # Use GConf, the GNOME configuration system.
     'use_gconf%': 1,
 
-    # Use OpenSSL instead of NSS. Currently in development.
+    # Use OpenSSL instead of NSS. Under development: see http://crbug.com/62803
     'use_openssl%': 0,
 
     'conditions': [
diff --git a/build/linux/system.gyp b/build/linux/system.gyp
index 905f14e..39b3a11 100644
--- a/build/linux/system.gyp
+++ b/build/linux/system.gyp
@@ -346,29 +346,6 @@
         ],
       },
     },
-    {
-      'target_name': 'openssl',
-      'type': 'settings',
-      'conditions': [
-        ['use_openssl==1', {
-          'direct_dependent_settings': {
-            'defines': [
-              # OpenSSL support is incomplete: http://crbug.com/62803.
-              # Defining USE_OPENSSL disables USE_NSS.
-              'USE_OPENSSL',
-            ],
-            'include_dirs': [
-              '<!@(<(pkg-config) --cflags openssl)',
-            ],
-          },
-          'link_settings': {
-            'libraries': [
-              '<!@(<(pkg-config) --libs-only-l openssl)',
-            ],
-          },
-        },],
-      ],
-    },
   ],
 }
 
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index b3b26ec..88e4ebc 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -489,7 +489,7 @@
             'conditions': [
               ['use_openssl==1', {
                  'dependencies': [
-                   '../build/linux/system.gyp:openssl',
+                   '../third_party/openssl/openssl.gyp:openssl',
                  ],
                },
                { # else !use_openssl
diff --git a/net/net.gyp b/net/net.gyp
index 065a39d..cb589ea 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -237,7 +237,7 @@
             'conditions': [
               ['use_openssl==1', {
                 'dependencies': [
-                  '../build/linux/system.gyp:openssl',
+                  '../third_party/openssl/openssl.gyp:openssl',
                 ],
               }, {  # else: not using openssl. Use NSS.
                 'dependencies': [
@@ -755,7 +755,7 @@
             'conditions': [
               ['use_openssl==1', {
                 'dependencies': [
-                  '../build/linux/system.gyp:openssl',
+                  '../third_party/openssl/openssl.gyp:openssl',
                 ],
               },
               {  # else use_openssl==0, use NSS
@@ -1198,7 +1198,7 @@
           'conditions': [
             ['use_openssl==1', {
               'dependencies': [
-                '../build/linux/system.gyp:openssl',
+                '../third_party/openssl/openssl.gyp:openssl',
               ]
             }, {
               'dependencies': [
diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc
index 62e0e72..b3690a9 100644
--- a/net/socket/ssl_client_socket_openssl.cc
+++ b/net/socket/ssl_client_socket_openssl.cc
@@ -764,7 +764,7 @@ int SSLClientSocketOpenSSL::SelectNextProtoCallback(unsigned char** out,
                                                     unsigned int inlen) {
 #if defined(OPENSSL_NPN_NEGOTIATED)
   if (ssl_config_.next_protos.empty()) {
-    *out = "http/1.1";
+    *out = reinterpret_cast<uint8*>(const_cast<char*>("http/1.1"));
     *outlen = 8;
     npn_status_ = SSLClientSocket::kNextProtoUnsupported;
     return SSL_TLSEXT_ERR_OK;
@@ -790,6 +790,7 @@ int SSLClientSocketOpenSSL::SelectNextProtoCallback(unsigned char** out,
       NOTREACHED() << status;
       break;
   }
+  DVLOG(2) << "next protocol: '" << npn_proto_ << "' status: " << npn_status_;
 #endif
   return SSL_TLSEXT_ERR_OK;
 }