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

Side by Side Diff: crypto/crypto.gyp

Issue 1459783002: Roll src/third_party/boringssl/src d7421ebf6..3ac32b1ed (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix build, estark comments Created 5 years, 1 month 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
« no previous file with comments | « crypto/BUILD.gn ('k') | crypto/crypto.gypi » ('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) 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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 4267, # TODO(jschuh): crbug.com/167187 fix size_t to int truncation s. 96 4267, # TODO(jschuh): crbug.com/167187 fix size_t to int truncation s.
97 ], 97 ],
98 }], 98 }],
99 [ 'use_openssl==1', { 99 [ 'use_openssl==1', {
100 'dependencies': [ 100 'dependencies': [
101 '../third_party/boringssl/boringssl.gyp:boringssl', 101 '../third_party/boringssl/boringssl.gyp:boringssl',
102 ], 102 ],
103 # TODO(joth): Use a glob to match exclude patterns once the 103 # TODO(joth): Use a glob to match exclude patterns once the
104 # OpenSSL file set is complete. 104 # OpenSSL file set is complete.
105 'sources!': [ 105 'sources!': [
106 'curve25519-donna.c',
107 'curve25519_nss.cc',
106 'ec_private_key_nss.cc', 108 'ec_private_key_nss.cc',
107 'ec_signature_creator_nss.cc', 109 'ec_signature_creator_nss.cc',
108 'encryptor_nss.cc', 110 'encryptor_nss.cc',
109 'hmac_nss.cc', 111 'hmac_nss.cc',
110 'rsa_private_key_nss.cc', 112 'rsa_private_key_nss.cc',
111 'secure_hash_default.cc', 113 'secure_hash_default.cc',
112 'signature_creator_nss.cc', 114 'signature_creator_nss.cc',
113 'signature_verifier_nss.cc', 115 'signature_verifier_nss.cc',
114 'symmetric_key_nss.cc', 116 'symmetric_key_nss.cc',
115 'third_party/nss/chromium-blapi.h', 117 'third_party/nss/chromium-blapi.h',
116 'third_party/nss/chromium-blapit.h', 118 'third_party/nss/chromium-blapit.h',
117 'third_party/nss/chromium-nss.h', 119 'third_party/nss/chromium-nss.h',
118 'third_party/nss/chromium-prtypes.h', 120 'third_party/nss/chromium-prtypes.h',
119 'third_party/nss/chromium-sha256.h', 121 'third_party/nss/chromium-sha256.h',
120 'third_party/nss/pk11akey.cc', 122 'third_party/nss/pk11akey.cc',
121 'third_party/nss/rsawrapr.c', 123 'third_party/nss/rsawrapr.c',
122 'third_party/nss/secsign.cc', 124 'third_party/nss/secsign.cc',
123 'third_party/nss/sha512.cc', 125 'third_party/nss/sha512.cc',
124 ], 126 ],
125 }, { 127 }, {
126 'sources!': [ 128 'sources!': [
127 'aead_openssl.cc', 129 'aead_openssl.cc',
128 'aead_openssl.h', 130 'aead_openssl.h',
131 'curve25519_openssl.cc',
129 'ec_private_key_openssl.cc', 132 'ec_private_key_openssl.cc',
130 'ec_signature_creator_openssl.cc', 133 'ec_signature_creator_openssl.cc',
131 'encryptor_openssl.cc', 134 'encryptor_openssl.cc',
132 'hmac_openssl.cc', 135 'hmac_openssl.cc',
133 'openssl_bio_string.cc', 136 'openssl_bio_string.cc',
134 'openssl_bio_string.h', 137 'openssl_bio_string.h',
135 'openssl_util.cc', 138 'openssl_util.cc',
136 'openssl_util.h', 139 'openssl_util.h',
137 'rsa_private_key_openssl.cc', 140 'rsa_private_key_openssl.cc',
138 'secure_hash_openssl.cc', 141 'secure_hash_openssl.cc',
(...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
316 '../build/isolate.gypi', 319 '../build/isolate.gypi',
317 ], 320 ],
318 'sources': [ 321 'sources': [
319 'crypto_unittests.isolate', 322 'crypto_unittests.isolate',
320 ], 323 ],
321 }, 324 },
322 ], 325 ],
323 }], 326 }],
324 ], 327 ],
325 } 328 }
OLDNEW
« no previous file with comments | « crypto/BUILD.gn ('k') | crypto/crypto.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698