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

Side by Side Diff: runtime/bin/net/nss.gyp

Issue 21716004: dart:io | Add SecureSocket.importPrivateCertificates, that reads a PKCS#12 file. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Add more API functions, tests Created 7 years, 4 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 # Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file 5 # Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
6 # for details. All rights reserved. Use of this source code is governed by a 6 # for details. All rights reserved. Use of this source code is governed by a
7 # BSD-style license that can be found in the LICENSE file. 7 # BSD-style license that can be found in the LICENSE file.
8 8
9 # This file is a modified copy of Chromium's deps/third_party/nss/nss.gyp. 9 # This file is a modified copy of Chromium's deps/third_party/nss/nss.gyp.
10 # Revision 199075 (this should agree with "nss_rev" in DEPS). 10 # Revision 199075 (this should agree with "nss_rev" in DEPS).
11 { 11 {
12 # Added by Dart. All Dart comments refer to the following block or line. 12 # Added by Dart. All Dart comments refer to the following block or line.
13 'includes': [ 13 'includes': [
14 '../../tools/gyp/runtime-configurations.gypi', 14 '../../tools/gyp/runtime-configurations.gypi',
15 '../../tools/gyp/nss_configurations.gypi', 15 '../../tools/gyp/nss_configurations.gypi',
16 ], 16 ],
17 'variables': { 17 'variables': {
18 # Added by Dart. 18 # Added by Dart.
19 'nss_directory': '../../../third_party/nss', 19 'nss_directory': '../../../third_party/nss',
20 'pkcs12_directory': '../../../third_party/pkcs12',
20 'conditions': [ 21 'conditions': [
21 ['OS=="ios"', { 22 ['OS=="ios"', {
22 'exclude_nss_root_certs%': 0, 23 'exclude_nss_root_certs%': 0,
23 'exclude_nss_libpkix%': 0, 24 'exclude_nss_libpkix%': 0,
24 }, { 25 }, {
25 'exclude_nss_root_certs%': 1, 26 'exclude_nss_root_certs%': 1,
26 'exclude_nss_libpkix%': 1, 27 'exclude_nss_libpkix%': 1,
27 }], 28 }],
28 ], 29 ],
29 }, 30 },
30 'target_defaults': { 31 'target_defaults': {
31 'configurations': { 32 'configurations': {
32 'Debug': { 33 'Debug': {
33 'defines': [ 34 'defines': [
34 'DEBUG', 35 'DEBUG',
35 '_DEBUG', 36 '_DEBUG',
37 # 'DEBUG_ASN1D_STATES',
36 ], 38 ],
37 }, 39 },
38 'Release': { 40 'Release': {
39 'defines': [ 41 'defines': [
40 'NDEBUG', 42 'NDEBUG',
41 ], 43 ],
42 }, 44 },
43 # Added by Dart. 45 # Added by Dart.
44 'Dart_ia32_Base': { 46 'Dart_ia32_Base': {
45 'defines': [ 47 'defines': [
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 'defines!': [ 83 'defines!': [
82 'WIN32_LEAN_AND_MEAN', 84 'WIN32_LEAN_AND_MEAN',
83 ], 85 ],
84 }], 86 }],
85 ], 87 ],
86 }, 88 },
87 # Added by Dart. We do not indent, so diffs with the original are clearer. 89 # Added by Dart. We do not indent, so diffs with the original are clearer.
88 'conditions': [[ 'dart_io_support==1', { 90 'conditions': [[ 'dart_io_support==1', {
89 'targets': [ 91 'targets': [
90 { 92 {
93 'target_name': 'pk12util', # Added by Dart (the _dart postfix)
94 'type': 'executable',
95 'toolsets':['host','target'],
96 'dependencies': [
97 'nss_dart', # Added by Dart (the _dart postfix)
98 ],
99 'sources': [
100 # Ensure at least one object file is produced, so that MSVC does not
101 # warn when creating the static/shared library. See the note for
102 # the 'nssckbi' target for why the 'nss' target was split as such.
103 '<(pkcs12_directory)/pk12util.c',
104 '<(pkcs12_directory)/pk12util.h',
105 '<(pkcs12_directory)/basicutil.c',
106 '<(pkcs12_directory)/basicutil.h',
107 '<(pkcs12_directory)/secutil.c',
108 '<(pkcs12_directory)/secutil.h',
109 '<(pkcs12_directory)/secpwd.c',
110
111 ],
112 'include_dirs': [
113 '<(nss_directory)/nspr/pr/include',
114 '<(nss_directory)/nspr/lib/ds',
115 '<(nss_directory)/nspr/lib/libc/include',
116 '<(nss_directory)/nss/lib/base',
117 '<(nss_directory)/nss/lib/certdb',
118 '<(nss_directory)/nss/lib/certhigh',
119 '<(nss_directory)/nss/lib/cryptohi',
120 '<(nss_directory)/nss/lib/dev',
121 '<(nss_directory)/nss/lib/freebl',
122 '<(nss_directory)/nss/lib/freebl/ecl',
123 '<(nss_directory)/nss/lib/nss',
124 '<(nss_directory)/nss/lib/pk11wrap',
125 '<(nss_directory)/nss/lib/pkcs7',
126 '<(nss_directory)/nss/lib/pki',
127 '<(nss_directory)/nss/lib/smime',
128 '<(nss_directory)/nss/lib/softoken',
129 '<(nss_directory)/nss/lib/util',
130 '<(pkcs12_directory)',
131 '<(nss_directory)/../net_nss/ssl',
132 ],
133 'link_settings': {
134 'libraries': [
135 '-lrt',
136 ]}
137
138 },
139
140 {
91 'target_name': 'nspr_dart', # Added by Dart (the _dart postfix) 141 'target_name': 'nspr_dart', # Added by Dart (the _dart postfix)
92 'product_name': 'crnspr', 142 'product_name': 'crnspr',
93 'type': '<(component)', 143 'type': '<(component)',
94 'toolsets':['host','target'], 144 'toolsets':['host','target'],
95 # Changed by Dart: '<(nss_directory)/' added to all paths. 145 # Changed by Dart: '<(nss_directory)/' added to all paths.
96 'sources': [ 146 'sources': [
97 # Added by Dart. 147 # Added by Dart.
98 'os_linux.S', 148 'os_linux.S',
99 '<(nss_directory)/nspr/lib/ds/plarena.c', 149 '<(nss_directory)/nspr/lib/ds/plarena.c',
100 '<(nss_directory)/nspr/lib/ds/plarena.h', 150 '<(nss_directory)/nspr/lib/ds/plarena.h',
(...skipping 960 matching lines...) Expand 10 before | Expand all | Expand 10 after
1061 '<(nss_directory)/nss/lib/util/secport.h', 1111 '<(nss_directory)/nss/lib/util/secport.h',
1062 '<(nss_directory)/nss/lib/util/sectime.c', 1112 '<(nss_directory)/nss/lib/util/sectime.c',
1063 '<(nss_directory)/nss/lib/util/templates.c', 1113 '<(nss_directory)/nss/lib/util/templates.c',
1064 '<(nss_directory)/nss/lib/util/utf8.c', 1114 '<(nss_directory)/nss/lib/util/utf8.c',
1065 '<(nss_directory)/nss/lib/util/utilmod.c', 1115 '<(nss_directory)/nss/lib/util/utilmod.c',
1066 '<(nss_directory)/nss/lib/util/utilmodt.h', 1116 '<(nss_directory)/nss/lib/util/utilmodt.h',
1067 '<(nss_directory)/nss/lib/util/utilpars.c', 1117 '<(nss_directory)/nss/lib/util/utilpars.c',
1068 '<(nss_directory)/nss/lib/util/utilpars.h', 1118 '<(nss_directory)/nss/lib/util/utilpars.h',
1069 '<(nss_directory)/nss/lib/util/utilparst.h', 1119 '<(nss_directory)/nss/lib/util/utilparst.h',
1070 '<(nss_directory)/nss/lib/util/utilrename.h', 1120 '<(nss_directory)/nss/lib/util/utilrename.h',
1121 '<(pkcs12_directory)/p12creat.c',
1122 '<(pkcs12_directory)/p12d.c',
1123 '<(pkcs12_directory)/p12dec.c',
1124 '<(pkcs12_directory)/p12e.c',
1125 '<(pkcs12_directory)/p12.h',
1126 '<(pkcs12_directory)/p12local.c',
1127 '<(pkcs12_directory)/p12local.h',
1128 '<(pkcs12_directory)/p12plcy.c',
1129 '<(pkcs12_directory)/p12plcy.h',
1130 '<(pkcs12_directory)/p12t.h',
1131 '<(pkcs12_directory)/p12tmpl.c',
1132 '<(pkcs12_directory)/pkcs12.h',
1133 '<(pkcs12_directory)/pkcs12t.h',
1071 ], 1134 ],
1072 'sources!': [ 1135 'sources!': [
1073 # mpi_arm.c is included by mpi_arm_mac.c. 1136 # mpi_arm.c is included by mpi_arm_mac.c.
1074 # NOTE: mpi_arm.c can be used directly on Linux. mpi_arm.c will need 1137 # NOTE: mpi_arm.c can be used directly on Linux. mpi_arm.c will need
1075 # to be excluded conditionally if we start to build NSS on Linux. 1138 # to be excluded conditionally if we start to build NSS on Linux.
1076 '<(nss_directory)/nss/lib/freebl/mpi/mpi_arm.c', 1139 '<(nss_directory)/nss/lib/freebl/mpi/mpi_arm.c',
1077 # primes.c is included by mpprime.c. 1140 # primes.c is included by mpprime.c.
1078 '<(nss_directory)/nss/lib/freebl/mpi/primes.c', 1141 '<(nss_directory)/nss/lib/freebl/mpi/primes.c',
1079 # unix_rand.c and win_rand.c are included by sysrand.c. 1142 # unix_rand.c and win_rand.c are included by sysrand.c.
1080 '<(nss_directory)/nss/lib/freebl/unix_rand.c', 1143 '<(nss_directory)/nss/lib/freebl/unix_rand.c',
(...skipping 11 matching lines...) Expand all
1092 'defines': [ 1155 'defines': [
1093 'MP_API_COMPATIBLE', 1156 'MP_API_COMPATIBLE',
1094 'NSS_DISABLE_DBM', 1157 'NSS_DISABLE_DBM',
1095 'NSS_ENABLE_ECC', 1158 'NSS_ENABLE_ECC',
1096 'NSS_STATIC', 1159 'NSS_STATIC',
1097 'NSS_USE_STATIC_LIBS', 1160 'NSS_USE_STATIC_LIBS',
1098 'RIJNDAEL_INCLUDE_TABLES', 1161 'RIJNDAEL_INCLUDE_TABLES',
1099 'SHLIB_VERSION=\"3\"', 1162 'SHLIB_VERSION=\"3\"',
1100 'SOFTOKEN_SHLIB_VERSION=\"3\"', 1163 'SOFTOKEN_SHLIB_VERSION=\"3\"',
1101 'USE_UTIL_DIRECTLY', 1164 'USE_UTIL_DIRECTLY',
1165 # 'DEBUG_ASN1D_STATES',
1102 ], 1166 ],
1103 'defines!': [ 1167 'defines!': [
1104 # Regrettably, NSS can't be compiled with NO_NSPR_10_SUPPORT yet. 1168 # Regrettably, NSS can't be compiled with NO_NSPR_10_SUPPORT yet.
1105 'NO_NSPR_10_SUPPORT', 1169 'NO_NSPR_10_SUPPORT',
1106 ], 1170 ],
1107 'include_dirs': [ 1171 'include_dirs': [
1108 '<(nss_directory)/nss/lib/base', 1172 '<(nss_directory)/nss/lib/base',
1109 '<(nss_directory)/nss/lib/certdb', 1173 '<(nss_directory)/nss/lib/certdb',
1110 '<(nss_directory)/nss/lib/certhigh', 1174 '<(nss_directory)/nss/lib/certhigh',
1111 '<(nss_directory)/nss/lib/cryptohi', 1175 '<(nss_directory)/nss/lib/cryptohi',
(...skipping 14 matching lines...) Expand all
1126 '<(nss_directory)/nss/lib/libpkix/pkix_pl_nss/pki', 1190 '<(nss_directory)/nss/lib/libpkix/pkix_pl_nss/pki',
1127 '<(nss_directory)/nss/lib/libpkix/pkix_pl_nss/system', 1191 '<(nss_directory)/nss/lib/libpkix/pkix_pl_nss/system',
1128 '<(nss_directory)/nss/lib/nss', 1192 '<(nss_directory)/nss/lib/nss',
1129 '<(nss_directory)/nss/lib/pk11wrap', 1193 '<(nss_directory)/nss/lib/pk11wrap',
1130 '<(nss_directory)/nss/lib/pkcs7', 1194 '<(nss_directory)/nss/lib/pkcs7',
1131 '<(nss_directory)/nss/lib/pki', 1195 '<(nss_directory)/nss/lib/pki',
1132 '<(nss_directory)/nss/lib/smime', 1196 '<(nss_directory)/nss/lib/smime',
1133 '<(nss_directory)/nss/lib/softoken', 1197 '<(nss_directory)/nss/lib/softoken',
1134 '<(nss_directory)/nss/lib/ssl', 1198 '<(nss_directory)/nss/lib/ssl',
1135 '<(nss_directory)/nss/lib/util', 1199 '<(nss_directory)/nss/lib/util',
1200 '<(pkcs12_directory)',
1136 ], 1201 ],
1137 'direct_dependent_settings': { 1202 'direct_dependent_settings': {
1138 'defines': [ 1203 'defines': [
1139 'NSS_ENABLE_ECC', 1204 'NSS_ENABLE_ECC',
1140 'NSS_STATIC', 1205 'NSS_STATIC',
1141 'NSS_USE_STATIC_LIBS', 1206 'NSS_USE_STATIC_LIBS',
1142 'USE_UTIL_DIRECTLY', 1207 'USE_UTIL_DIRECTLY',
1143 ], 1208 ],
1144 'include_dirs': [ 1209 'include_dirs': [
1145 '<(nss_directory)/nspr/pr/include', 1210 '<(nss_directory)/nspr/pr/include',
1146 '<(nss_directory)/nspr/lib/ds', 1211 '<(nss_directory)/nspr/lib/ds',
1147 '<(nss_directory)/nspr/lib/libc/include', 1212 '<(nss_directory)/nspr/lib/libc/include',
1148 '<(nss_directory)/nss/lib/base', 1213 '<(nss_directory)/nss/lib/base',
1149 '<(nss_directory)/nss/lib/certdb', 1214 '<(nss_directory)/nss/lib/certdb',
1150 '<(nss_directory)/nss/lib/certhigh', 1215 '<(nss_directory)/nss/lib/certhigh',
1151 '<(nss_directory)/nss/lib/cryptohi', 1216 '<(nss_directory)/nss/lib/cryptohi',
1152 '<(nss_directory)/nss/lib/dev', 1217 '<(nss_directory)/nss/lib/dev',
1153 '<(nss_directory)/nss/lib/freebl', 1218 '<(nss_directory)/nss/lib/freebl',
1154 '<(nss_directory)/nss/lib/freebl/ecl', 1219 '<(nss_directory)/nss/lib/freebl/ecl',
1155 '<(nss_directory)/nss/lib/nss', 1220 '<(nss_directory)/nss/lib/nss',
1156 '<(nss_directory)/nss/lib/pk11wrap', 1221 '<(nss_directory)/nss/lib/pk11wrap',
1157 '<(nss_directory)/nss/lib/pkcs7', 1222 '<(nss_directory)/nss/lib/pkcs7',
1158 '<(nss_directory)/nss/lib/pki', 1223 '<(nss_directory)/nss/lib/pki',
1159 '<(nss_directory)/nss/lib/smime', 1224 '<(nss_directory)/nss/lib/smime',
1160 '<(nss_directory)/nss/lib/softoken', 1225 '<(nss_directory)/nss/lib/softoken',
1161 '<(nss_directory)/nss/lib/util', 1226 '<(nss_directory)/nss/lib/util',
1227 '<(pkcs12_directory)',
1162 ], 1228 ],
1163 }, 1229 },
1164 'msvs_disabled_warnings': [4018, 4101, 4267, ], 1230 'msvs_disabled_warnings': [4018, 4101, 4267, ],
1165 'conditions': [ 1231 'conditions': [
1166 ['exclude_nss_root_certs==1', { 1232 ['exclude_nss_root_certs==1', {
1167 'defines': [ 1233 'defines': [
1168 'NSS_DISABLE_ROOT_CERTS', 1234 'NSS_DISABLE_ROOT_CERTS',
1169 ], 1235 ],
1170 }], 1236 }],
1171 ['exclude_nss_libpkix==1', { 1237 ['exclude_nss_libpkix==1', {
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
1317 '-Wno-logical-op-parentheses', 1383 '-Wno-logical-op-parentheses',
1318 '-Wno-switch', 1384 '-Wno-switch',
1319 '-Wno-tautological-compare', 1385 '-Wno-tautological-compare',
1320 ], 1386 ],
1321 }], 1387 }],
1322 ], 1388 ],
1323 }, 1389 },
1324 ], 1390 ],
1325 }]], 1391 }]],
1326 } 1392 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698