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

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: pneubeck comments 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 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 'openssl_util.cc', 136 'openssl_util.cc',
137 'openssl_util.h', 137 'openssl_util.h',
138 'rsa_private_key_openssl.cc', 138 'rsa_private_key_openssl.cc',
139 'secure_hash_openssl.cc', 139 'secure_hash_openssl.cc',
140 'signature_creator_openssl.cc', 140 'signature_creator_openssl.cc',
141 'signature_verifier_openssl.cc', 141 'signature_verifier_openssl.cc',
142 'symmetric_key_openssl.cc', 142 'symmetric_key_openssl.cc',
143 ], 143 ],
144 },], 144 },],
145 [ 'use_openssl==1 and use_nss_certs==0', { 145 [ 'use_openssl==1 and use_nss_certs==0', {
146 # NSS is used for neither the internal crypto library nor the 146 # Some files are built when NSS is used at all, either for the
147 # platform certificate library. 147 # internal crypto library or the platform certificate library.
148 'sources!': [ 148 'sources!': [
149 'nss_key_util.cc',
150 'nss_key_util.h',
149 'nss_util.cc', 151 'nss_util.cc',
150 'nss_util.h', 152 'nss_util.h',
151 'nss_util_internal.h', 153 'nss_util_internal.h',
152 ], 154 ],
153 },], 155 },],
154 ], 156 ],
155 'sources': [ 157 'sources': [
156 '<@(crypto_sources)', 158 '<@(crypto_sources)',
157 ], 159 ],
158 }, 160 },
159 { 161 {
160 'target_name': 'crypto_unittests', 162 'target_name': 'crypto_unittests',
161 'type': 'executable', 163 'type': 'executable',
162 'sources': [ 164 'sources': [
163 'aead_openssl_unittest.cc', 165 'aead_openssl_unittest.cc',
164 'curve25519_unittest.cc', 166 'curve25519_unittest.cc',
165 'ec_private_key_unittest.cc', 167 'ec_private_key_unittest.cc',
166 'ec_signature_creator_unittest.cc', 168 'ec_signature_creator_unittest.cc',
167 'encryptor_unittest.cc', 169 'encryptor_unittest.cc',
168 'ghash_unittest.cc', 170 'ghash_unittest.cc',
169 'hkdf_unittest.cc', 171 'hkdf_unittest.cc',
170 'hmac_unittest.cc', 172 'hmac_unittest.cc',
173 'nss_key_util_unittest.cc',
171 'nss_util_unittest.cc', 174 'nss_util_unittest.cc',
172 'openssl_bio_string_unittest.cc', 175 'openssl_bio_string_unittest.cc',
173 'p224_unittest.cc', 176 'p224_unittest.cc',
174 'p224_spake_unittest.cc', 177 'p224_spake_unittest.cc',
175 'random_unittest.cc', 178 'random_unittest.cc',
176 'rsa_private_key_unittest.cc', 179 'rsa_private_key_unittest.cc',
177 'rsa_private_key_nss_unittest.cc',
178 'secure_hash_unittest.cc', 180 'secure_hash_unittest.cc',
179 'sha2_unittest.cc', 181 'sha2_unittest.cc',
180 'signature_creator_unittest.cc', 182 'signature_creator_unittest.cc',
181 'signature_verifier_unittest.cc', 183 'signature_verifier_unittest.cc',
182 'symmetric_key_unittest.cc', 184 'symmetric_key_unittest.cc',
183 ], 185 ],
184 'dependencies': [ 186 'dependencies': [
185 'crypto', 187 'crypto',
186 'crypto_test_support', 188 'crypto_test_support',
187 '../base/base.gyp:base', 189 '../base/base.gyp:base',
(...skipping 10 matching lines...) Expand all
198 '../base/allocator/allocator.gyp:allocator', 200 '../base/allocator/allocator.gyp:allocator',
199 ], 201 ],
200 }, 202 },
201 ], 203 ],
202 ], 204 ],
203 'dependencies': [ 205 'dependencies': [
204 '../build/linux/system.gyp:ssl', 206 '../build/linux/system.gyp:ssl',
205 ], 207 ],
206 }], 208 }],
207 [ 'use_openssl == 1 and use_nss_certs == 0', { 209 [ 'use_openssl == 1 and use_nss_certs == 0', {
208 # nss_util is built if NSS is used for either the internal crypto 210 # Some files are built when NSS is used at all, either for the
209 # library or the platform certificate library. 211 # internal crypto library or the platform certificate library.
210 'sources!': [ 212 'sources!': [
213 'nss_key_util_unittest.cc',
211 'nss_util_unittest.cc', 214 'nss_util_unittest.cc',
212 ], 215 ],
213 }], 216 }],
214 [ 'use_openssl == 0 and (OS == "mac" or OS == "ios" or OS == "win")', { 217 [ 'use_openssl == 0 and (OS == "mac" or OS == "ios" or OS == "win")', {
215 'dependencies': [ 218 'dependencies': [
216 '../third_party/nss/nss.gyp:nspr', 219 '../third_party/nss/nss.gyp:nspr',
217 ], 220 ],
218 }], 221 }],
219 [ 'OS == "win"', { 222 [ 'OS == "win"', {
220 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 223 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
221 'msvs_disabled_warnings': [4267, ], 224 'msvs_disabled_warnings': [4267, ],
222 }], 225 }],
223 [ 'use_openssl==1', { 226 [ 'use_openssl==1', {
224 'dependencies': [ 227 'dependencies': [
225 '../third_party/boringssl/boringssl.gyp:boringssl', 228 '../third_party/boringssl/boringssl.gyp:boringssl',
226 ], 229 ],
227 'sources!': [
228 'rsa_private_key_nss_unittest.cc',
229 ],
230 }, { 230 }, {
231 'sources!': [ 231 'sources!': [
232 'openssl_bio_string_unittest.cc', 232 'openssl_bio_string_unittest.cc',
233 ], 233 ],
234 }], 234 }],
235 ], 235 ],
236 }, 236 },
237 ], 237 ],
238 'conditions': [ 238 'conditions': [
239 ['OS == "win" and target_arch=="ia32"', { 239 ['OS == "win" and target_arch=="ia32"', {
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 '../build/isolate.gypi', 320 '../build/isolate.gypi',
321 ], 321 ],
322 'sources': [ 322 'sources': [
323 'crypto_unittests.isolate', 323 'crypto_unittests.isolate',
324 ], 324 ],
325 }, 325 },
326 ], 326 ],
327 }], 327 }],
328 ], 328 ],
329 } 329 }
OLDNEW
« components/ownership.gypi ('K') | « crypto/BUILD.gn ('k') | crypto/crypto.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698