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

Side by Side Diff: crypto/crypto.gyp

Issue 1106103003: Don't use RSAPrivateKey in NSS integration code. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ocsp-refactor
Patch Set: avoid exposing NSS through net headers (unnecessary) Created 5 years, 7 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
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'crypto.gypi', 10 'crypto.gypi',
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 'openssl_util.cc', 134 'openssl_util.cc',
135 'openssl_util.h', 135 'openssl_util.h',
136 'rsa_private_key_openssl.cc', 136 'rsa_private_key_openssl.cc',
137 'secure_hash_openssl.cc', 137 'secure_hash_openssl.cc',
138 'signature_creator_openssl.cc', 138 'signature_creator_openssl.cc',
139 'signature_verifier_openssl.cc', 139 'signature_verifier_openssl.cc',
140 'symmetric_key_openssl.cc', 140 'symmetric_key_openssl.cc',
141 ], 141 ],
142 },], 142 },],
143 [ 'use_openssl==1 and use_nss_certs==0', { 143 [ 'use_openssl==1 and use_nss_certs==0', {
144 # NSS is used for neither the internal crypto library nor the 144 # Some files are built when NSS is used at all, either for the
145 # platform certificate library. 145 # internal crypto library or the platform certificate library.
146 'sources!': [ 146 'sources!': [
147 'nss_key_util.cc',
148 'nss_key_util.h',
147 'nss_util.cc', 149 'nss_util.cc',
148 'nss_util.h', 150 'nss_util.h',
149 'nss_util_internal.h', 151 'nss_util_internal.h',
150 ], 152 ],
151 },], 153 },],
152 ], 154 ],
153 'sources': [ 155 'sources': [
154 '<@(crypto_sources)', 156 '<@(crypto_sources)',
155 ], 157 ],
156 }, 158 },
157 { 159 {
158 'target_name': 'crypto_unittests', 160 'target_name': 'crypto_unittests',
159 'type': 'executable', 161 'type': 'executable',
160 'sources': [ 162 'sources': [
161 'curve25519_unittest.cc', 163 'curve25519_unittest.cc',
162 'ec_private_key_unittest.cc', 164 'ec_private_key_unittest.cc',
163 'ec_signature_creator_unittest.cc', 165 'ec_signature_creator_unittest.cc',
164 'encryptor_unittest.cc', 166 'encryptor_unittest.cc',
165 'ghash_unittest.cc', 167 'ghash_unittest.cc',
166 'hkdf_unittest.cc', 168 'hkdf_unittest.cc',
167 'hmac_unittest.cc', 169 'hmac_unittest.cc',
170 'nss_key_util_unittest.cc',
168 'nss_util_unittest.cc', 171 'nss_util_unittest.cc',
169 'openssl_bio_string_unittest.cc', 172 'openssl_bio_string_unittest.cc',
170 'p224_unittest.cc', 173 'p224_unittest.cc',
171 'p224_spake_unittest.cc', 174 'p224_spake_unittest.cc',
172 'random_unittest.cc', 175 'random_unittest.cc',
173 'rsa_private_key_unittest.cc', 176 'rsa_private_key_unittest.cc',
174 'rsa_private_key_nss_unittest.cc',
175 'secure_hash_unittest.cc', 177 'secure_hash_unittest.cc',
176 'sha2_unittest.cc', 178 'sha2_unittest.cc',
177 'signature_creator_unittest.cc', 179 'signature_creator_unittest.cc',
178 'signature_verifier_unittest.cc', 180 'signature_verifier_unittest.cc',
179 'symmetric_key_unittest.cc', 181 'symmetric_key_unittest.cc',
180 ], 182 ],
181 'dependencies': [ 183 'dependencies': [
182 'crypto', 184 'crypto',
183 'crypto_test_support', 185 'crypto_test_support',
184 '../base/base.gyp:base', 186 '../base/base.gyp:base',
(...skipping 10 matching lines...) Expand all
195 '../base/allocator/allocator.gyp:allocator', 197 '../base/allocator/allocator.gyp:allocator',
196 ], 198 ],
197 }, 199 },
198 ], 200 ],
199 ], 201 ],
200 'dependencies': [ 202 'dependencies': [
201 '../build/linux/system.gyp:ssl', 203 '../build/linux/system.gyp:ssl',
202 ], 204 ],
203 }], 205 }],
204 [ 'use_openssl == 1 and use_nss_certs == 0', { 206 [ 'use_openssl == 1 and use_nss_certs == 0', {
205 # nss_util is built if NSS is used for either the internal crypto 207 # Some files are built when NSS is used at all, either for the
206 # library or the platform certificate library. 208 # internal crypto library or the platform certificate library.
207 'sources!': [ 209 'sources!': [
210 'nss_key_util_unittest.cc',
208 'nss_util_unittest.cc', 211 'nss_util_unittest.cc',
209 ], 212 ],
210 }], 213 }],
211 [ 'use_openssl == 0 and (OS == "mac" or OS == "ios" or OS == "win")', { 214 [ 'use_openssl == 0 and (OS == "mac" or OS == "ios" or OS == "win")', {
212 'dependencies': [ 215 'dependencies': [
213 '../third_party/nss/nss.gyp:nspr', 216 '../third_party/nss/nss.gyp:nspr',
214 ], 217 ],
215 }], 218 }],
216 [ 'OS == "win"', { 219 [ 'OS == "win"', {
217 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 220 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
218 'msvs_disabled_warnings': [4267, ], 221 'msvs_disabled_warnings': [4267, ],
219 }], 222 }],
220 [ 'use_openssl==1', { 223 [ 'use_openssl==1', {
221 'dependencies': [ 224 'dependencies': [
222 '../third_party/boringssl/boringssl.gyp:boringssl', 225 '../third_party/boringssl/boringssl.gyp:boringssl',
223 ], 226 ],
224 'sources!': [
225 'rsa_private_key_nss_unittest.cc',
226 ],
227 }, { 227 }, {
228 'sources!': [ 228 'sources!': [
229 'openssl_bio_string_unittest.cc', 229 'openssl_bio_string_unittest.cc',
230 ], 230 ],
231 }], 231 }],
232 ], 232 ],
233 }, 233 },
234 ], 234 ],
235 'conditions': [ 235 'conditions': [
236 ['OS == "win" and target_arch=="ia32"', { 236 ['OS == "win" and target_arch=="ia32"', {
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 '../build/isolate.gypi', 317 '../build/isolate.gypi',
318 ], 318 ],
319 'sources': [ 319 'sources': [
320 'crypto_unittests.isolate', 320 'crypto_unittests.isolate',
321 ], 321 ],
322 }, 322 },
323 ], 323 ],
324 }], 324 }],
325 ], 325 ],
326 } 326 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698