Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(364)

Issue 2322008: Use SSLClientSocketNSS on Mac OS X. ... (Closed)

Created:
10 years, 7 months ago by wtc
Modified:
9 years, 7 months ago
Reviewers:
Mark Mentovai
CC:
chromium-reviews, cbentzel+watch_chromium.org, ben+cc_chromium.org, darin-cc_chromium.org, brettw-cc_chromium.org
Visibility:
Public.

Description

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. Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=48650

Patch Set 1 #

Patch Set 2 : Remove ssl_client_socket_nss_factory.cc from the CL. #

Patch Set 3 : Add build/linux/system.gyp to the CL. #

Total comments: 3
Unified diffs Side-by-side diffs Delta from patch set Stats (+121 lines, -259 lines) Patch
M base/base.gypi View 2 chunks +4 lines, -10 lines 0 comments Download
M base/nss_util.cc View 1 chunk +1 line, -1 line 0 comments Download
M build/all.gyp View 3 chunks +6 lines, -1 line 3 comments Download
M build/linux/system.gyp View 1 chunk +1 line, -1 line 0 comments Download
M chrome/browser/browser_main.cc View 4 chunks +11 lines, -3 lines 0 comments Download
M chrome/common/chrome_switches.h View 1 chunk +1 line, -0 lines 0 comments Download
M chrome/common/chrome_switches.cc View 1 chunk +4 lines, -0 lines 0 comments Download
M net/base/x509_certificate.h View 2 chunks +10 lines, -11 lines 0 comments Download
M net/net.gyp View 5 chunks +38 lines, -44 lines 0 comments Download
M net/socket/ssl_client_socket_nss.h View 1 chunk +2 lines, -4 lines 0 comments Download
M net/socket/ssl_client_socket_nss.cc View 1 6 chunks +25 lines, -27 lines 0 comments Download
D net/third_party/nss/nss.gyp View 1 chunk +0 lines, -144 lines 0 comments Download
A + net/third_party/nss/ssl.gyp View 3 chunks +18 lines, -13 lines 0 comments Download

Messages

Total messages: 3 (0 generated)
wtc
Mark, Please make sure I added the dependencies to the "All" target in all.gyp correctly. ...
10 years, 7 months ago (2010-05-28 23:59:05 UTC) #1
Mark Mentovai
LGTM http://codereview.chromium.org/2322008/diff/19001/20003 File build/all.gyp (right): http://codereview.chromium.org/2322008/diff/19001/20003#newcode1 build/all.gyp:1: # Copyright (c) 2009 The Chromium Authors. All ...
10 years, 6 months ago (2010-06-01 19:28:37 UTC) #2
wtc
10 years, 6 months ago (2010-06-01 22:02:20 UTC) #3
Mark, thanks for the review.

http://codereview.chromium.org/2322008/diff/19001/20003
File build/all.gyp (right):

http://codereview.chromium.org/2322008/diff/19001/20003#newcode1
build/all.gyp:1: # Copyright (c) 2009 The Chromium Authors. All rights reserved.
On 2010/06/01 19:28:37, Mark Mentovai wrote:
> Can you explain (to me) the difference between net/third_party/nss and
> third_party/nss?

The README.chromium files in those two directories describe
what each copy of "nss" is.

third_party/nss contains NSPR and base NSS, without the
SSL and S/MIME libraries.

net/third_party/nss contains the SSL library of NSS.

The reason for separating NSS into two pieces
is that we use our own NSS SSL library on all platforms,
whereas we use the system NSPR and base NSS libraries
on Linux/FreeBSD/OpenBSD.  So we only need the source code
for NSPR and base NSS on Mac and Windows.

Powered by Google App Engine
This is Rietveld 408576698