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

Side by Side Diff: crypto/crypto.gyp

Issue 10543146: Use NSS for symmetric key crypto operations on Windows and Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: review feedback Created 8 years, 6 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
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 # Put all transitive dependencies for Windows HMAC here. 8 # Put all transitive dependencies for Windows HMAC here.
9 # This is required so that we can build them for nacl win64. 9 # This is required so that we can build them for nacl win64.
10 'hmac_win64_related_sources': [ 10 'hmac_win64_related_sources': [
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 [ 'chromeos==1', { 46 [ 'chromeos==1', {
47 'sources/': [ ['include', '_chromeos\\.cc$'] ] 47 'sources/': [ ['include', '_chromeos\\.cc$'] ]
48 }, 48 },
49 ], 49 ],
50 ], 50 ],
51 }, { # os_posix != 1 or OS == "mac" or OS == "android" 51 }, { # os_posix != 1 or OS == "mac" or OS == "android"
52 'sources/': [ 52 'sources/': [
53 ['exclude', '_nss\.cc$'], 53 ['exclude', '_nss\.cc$'],
54 ['include', 'ec_private_key_nss\.cc$'], 54 ['include', 'ec_private_key_nss\.cc$'],
55 ['include', 'ec_signature_creator_nss\.cc$'], 55 ['include', 'ec_signature_creator_nss\.cc$'],
56 ['include', 'encryptor_nss\.cc$'],
57 ['include', 'hmac_nss\.cc$'],
56 ['include', 'signature_verifier_nss\.cc$'], 58 ['include', 'signature_verifier_nss\.cc$'],
59 ['include', 'symmetric_key_nss\.cc$'],
57 ], 60 ],
58 'sources!': [ 61 'sources!': [
62 'hmac_win.cc',
59 'openpgp_symmetric_encryption.cc', 63 'openpgp_symmetric_encryption.cc',
64 'openpgp_symmetric_encryption.h',
65 'symmetric_key_win.cc',
60 ], 66 ],
61 }], 67 }],
62 [ 'OS == "android"', { 68 [ 'OS == "android"', {
63 'dependencies': [ 69 'dependencies': [
64 '../third_party/openssl/openssl.gyp:openssl', 70 '../third_party/openssl/openssl.gyp:openssl',
65 ], 71 ],
66 'sources/': [ 72 'sources/': [
67 ['exclude', 'ec_private_key_nss\.cc$'], 73 ['exclude', 'ec_private_key_nss\.cc$'],
68 ['exclude', 'ec_signature_creator_nss\.cc$'], 74 ['exclude', 'ec_signature_creator_nss\.cc$'],
75 ['exclude', 'encryptor_nss\.cc$'],
76 ['exclude', 'hmac_nss\.cc$'],
69 ['exclude', 'signature_verifier_nss\.cc$'], 77 ['exclude', 'signature_verifier_nss\.cc$'],
78 ['exclude', 'symmetric_key_nss\.cc$'],
70 ], 79 ],
71 }], 80 }],
72 [ 'os_bsd==1', { 81 [ 'os_bsd==1', {
73 'link_settings': { 82 'link_settings': {
74 'libraries': [ 83 'libraries': [
75 '-L/usr/local/lib -lexecinfo', 84 '-L/usr/local/lib -lexecinfo',
76 ], 85 ],
77 }, 86 },
78 }, 87 },
79 ], 88 ],
80 [ 'OS == "mac"', { 89 [ 'OS == "mac"', {
81 'link_settings': { 90 'link_settings': {
82 'libraries': [ 91 'libraries': [
83 '$(SDKROOT)/System/Library/Frameworks/Security.framework', 92 '$(SDKROOT)/System/Library/Frameworks/Security.framework',
84 ], 93 ],
85 }, 94 },
86 }, { # OS != "mac" 95 }, { # OS != "mac"
87 'sources!': [ 96 'sources!': [
88 'cssm_init.cc', 97 'cssm_init.cc',
89 'cssm_init.h', 98 'cssm_init.h',
90 'mac_security_services_lock.cc', 99 'mac_security_services_lock.cc',
91 'mac_security_services_lock.h', 100 'mac_security_services_lock.h',
92 ], 101 ],
93 }], 102 }],
94 [ 'OS == "mac" or OS == "win"', { 103 [ 'OS == "mac" or OS == "win"', {
95 'dependencies': [ 104 'dependencies': [
96 '../third_party/nss/nss.gyp:nspr', 105 '../third_party/nss/nss.gyp:nspr',
97 '../third_party/nss/nss.gyp:nss', 106 '../third_party/nss/nss.gyp:nss',
98 ], 107 ],
108 'export_dependent_settings': [
109 '../third_party/nss/nss.gyp:nspr',
110 '../third_party/nss/nss.gyp:nss',
111 ],
99 }], 112 }],
100 [ 'OS != "win"', { 113 [ 'OS != "win"', {
101 'sources!': [ 114 'sources!': [
102 'capi_util.h', 115 'capi_util.h',
103 'capi_util.cc', 116 'capi_util.cc',
104 ], 117 ],
105 }], 118 }],
106 [ 'use_openssl==1', { 119 [ 'use_openssl==1', {
107 # TODO(joth): Use a glob to match exclude patterns once the 120 # TODO(joth): Use a glob to match exclude patterns once the
108 # OpenSSL file set is complete. 121 # OpenSSL file set is complete.
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 'ec_private_key.h', 169 'ec_private_key.h',
157 'ec_private_key_nss.cc', 170 'ec_private_key_nss.cc',
158 'ec_private_key_openssl.cc', 171 'ec_private_key_openssl.cc',
159 'ec_signature_creator.cc', 172 'ec_signature_creator.cc',
160 'ec_signature_creator.h', 173 'ec_signature_creator.h',
161 'ec_signature_creator_impl.h', 174 'ec_signature_creator_impl.h',
162 'ec_signature_creator_nss.cc', 175 'ec_signature_creator_nss.cc',
163 'ec_signature_creator_openssl.cc', 176 'ec_signature_creator_openssl.cc',
164 'encryptor.cc', 177 'encryptor.cc',
165 'encryptor.h', 178 'encryptor.h',
166 'encryptor_mac.cc',
167 'encryptor_nss.cc', 179 'encryptor_nss.cc',
168 'encryptor_openssl.cc', 180 'encryptor_openssl.cc',
169 'encryptor_win.cc',
170 'hmac_mac.cc',
171 'hmac_nss.cc', 181 'hmac_nss.cc',
172 'hmac_openssl.cc', 182 'hmac_openssl.cc',
173 'keychain_mac.cc', 183 'keychain_mac.cc',
174 'keychain_mac.h', 184 'keychain_mac.h',
175 'mac_security_services_lock.cc', 185 'mac_security_services_lock.cc',
176 'mac_security_services_lock.h', 186 'mac_security_services_lock.h',
177 'mock_keychain_mac.cc', 187 'mock_keychain_mac.cc',
178 'mock_keychain_mac.h', 188 'mock_keychain_mac.h',
179 'p224_spake.cc', 189 'p224_spake.cc',
180 'p224_spake.h', 190 'p224_spake.h',
(...skipping 20 matching lines...) Expand all
201 'sha2.cc', 211 'sha2.cc',
202 'sha2.h', 212 'sha2.h',
203 'signature_creator.h', 213 'signature_creator.h',
204 'signature_creator_mac.cc', 214 'signature_creator_mac.cc',
205 'signature_creator_nss.cc', 215 'signature_creator_nss.cc',
206 'signature_creator_openssl.cc', 216 'signature_creator_openssl.cc',
207 'signature_creator_win.cc', 217 'signature_creator_win.cc',
208 'signature_verifier.h', 218 'signature_verifier.h',
209 'signature_verifier_nss.cc', 219 'signature_verifier_nss.cc',
210 'signature_verifier_openssl.cc', 220 'signature_verifier_openssl.cc',
211 'symmetric_key_mac.cc',
212 'symmetric_key_nss.cc', 221 'symmetric_key_nss.cc',
213 'symmetric_key_openssl.cc', 222 'symmetric_key_openssl.cc',
214 'third_party/nss/chromium-blapi.h', 223 'third_party/nss/chromium-blapi.h',
215 'third_party/nss/chromium-blapit.h', 224 'third_party/nss/chromium-blapit.h',
216 'third_party/nss/chromium-nss.h', 225 'third_party/nss/chromium-nss.h',
217 'third_party/nss/pk11akey.cc', 226 'third_party/nss/pk11akey.cc',
218 'third_party/nss/secsign.cc', 227 'third_party/nss/secsign.cc',
219 ], 228 ],
220 }, 229 },
221 { 230 {
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
296 'type': '<(component)', 305 'type': '<(component)',
297 'dependencies': [ 306 'dependencies': [
298 '../base/base.gyp:base_nacl_win64', 307 '../base/base.gyp:base_nacl_win64',
299 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations_win64', 308 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyn amic_annotations_win64',
300 ], 309 ],
301 'sources': [ 310 'sources': [
302 '<@(hmac_win64_related_sources)', 311 '<@(hmac_win64_related_sources)',
303 ], 312 ],
304 'defines': [ 313 'defines': [
305 'CRYPTO_IMPLEMENTATION', 314 'CRYPTO_IMPLEMENTATION',
315 '<@(nacl_win64_defines)',
306 ], 316 ],
307 'msvs_disabled_warnings': [ 317 'msvs_disabled_warnings': [
308 4018, 318 4018,
309 ], 319 ],
310 'configurations': { 320 'configurations': {
311 'Common_Base': { 321 'Common_Base': {
312 'msvs_target_platform': 'x64', 322 'msvs_target_platform': 'x64',
313 }, 323 },
314 }, 324 },
315 }, 325 },
316 ], 326 ],
317 }], 327 }],
318 ], 328 ],
319 } 329 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698