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

Side by Side Diff: net/third_party/nss/ssl.gyp

Issue 6804032: Add TLS-SRP (RFC 5054) support Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: remove "httpsv" scheme, minor NSS/OpenSSL changes Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/third_party/nss/patches/tls-srp.patch ('k') | net/third_party/nss/ssl/ssl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'conditions': [ 6 'conditions': [
7 [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', { 7 [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
8 'conditions': [ 8 'conditions': [
9 ['sysroot!=""', { 9 ['sysroot!=""', {
10 'variables': { 10 'variables': {
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
117 'ssl/bodge', 117 'ssl/bodge',
118 ], 118 ],
119 'cflags': [ 119 'cflags': [
120 '<!@(<(pkg-config) --cflags nss)', 120 '<!@(<(pkg-config) --cflags nss)',
121 ], 121 ],
122 'ldflags': [ 122 'ldflags': [
123 '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)', 123 '<!@(<(pkg-config) --libs-only-L --libs-only-other nss)',
124 ], 124 ],
125 'libraries': [ 125 'libraries': [
126 '<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")', 126 '<!@(<(pkg-config) --libs-only-l nss | sed -e "s/-lssl3//")',
127 # TODO(sqs): -lsoftokn3 is necessary because SRP_ClientDerive,
128 # etc., are called from the NSS SSL code. When I separate the
129 # SRP additions to NSS softokn from the additions to NSS ssl,
130 # this should no longer be necessary.
131 '-lsoftokn3'
127 ], 132 ],
128 }], 133 }],
129 [ 'OS == "mac" or OS == "win"', { 134 [ 'OS == "mac" or OS == "win"', {
130 'sources/': [ 135 'sources/': [
131 ['exclude', 'ssl/bodge/'], 136 ['exclude', 'ssl/bodge/'],
132 ], 137 ],
133 'defines': [ 138 'defines': [
134 'NSS_PLATFORM_CLIENT_AUTH', 139 'NSS_PLATFORM_CLIENT_AUTH',
135 ], 140 ],
136 'dependencies': [ 141 'dependencies': [
(...skipping 19 matching lines...) Expand all
156 }, 161 },
157 }, 162 },
158 ], 163 ],
159 } 164 }
160 165
161 # Local Variables: 166 # Local Variables:
162 # tab-width:2 167 # tab-width:2
163 # indent-tabs-mode:nil 168 # indent-tabs-mode:nil
164 # End: 169 # End:
165 # vim: set expandtab tabstop=2 shiftwidth=2: 170 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « net/third_party/nss/patches/tls-srp.patch ('k') | net/third_party/nss/ssl/ssl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698