summaryrefslogtreecommitdiffstats
path: root/base/SConscript
diff options
context:
space:
mode:
authordeanm@google.com <deanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-16 14:32:44 +0000
committerdeanm@google.com <deanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-09-16 14:32:44 +0000
commitbc1e07c777d31055c22cc4a498a0267097063a97 (patch)
tree409ae29dd00141b225766b23a235dcb10c4d426c /base/SConscript
parent8aa777462e5b19f936e82a33d3438100857499da (diff)
downloadchromium_src-bc1e07c777d31055c22cc4a498a0267097063a97.zip
chromium_src-bc1e07c777d31055c22cc4a498a0267097063a97.tar.gz
chromium_src-bc1e07c777d31055c22cc4a498a0267097063a97.tar.bz2
Add an HMAC implementation using NSS. Include centralized NSS initialization, based on code from phajdan.jr.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2260 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/SConscript')
-rw-r--r--base/SConscript4
1 files changed, 3 insertions, 1 deletions
diff --git a/base/SConscript b/base/SConscript
index 2fbc815..5705702 100644
--- a/base/SConscript
+++ b/base/SConscript
@@ -158,6 +158,8 @@ if env['PLATFORM'] == 'posix':
'atomicops_internals_x86_gcc.cc',
'base_paths_linux.cc',
'file_util_linux.cc',
+ 'hmac_nss.cc',
+ 'nss_init.cc',
'sys_string_conversions_linux.cc',
'worker_pool.cc',
])
@@ -235,6 +237,7 @@ test_files = [
'command_line_unittest.cc',
'condition_variable_unittest.cc',
'file_util_unittest.cc',
+ 'hmac_unittest.cc',
'histogram_unittest.cc',
'json_reader_unittest.cc',
'json_writer_unittest.cc',
@@ -281,7 +284,6 @@ if env['PLATFORM'] == 'win32':
test_files.extend([
'clipboard_unittest.cc',
- 'hmac_unittest.cc',
'idletimer_unittest.cc',
'process_util_unittest.cc',
'run_all_unittests.cc',