summaryrefslogtreecommitdiffstats
path: root/base/base.gyp
diff options
context:
space:
mode:
authorrafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-24 01:21:12 +0000
committerrafaelw@chromium.org <rafaelw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-24 01:21:12 +0000
commit71a9f84a47ed556ecaa23b26a0b0adfee0ae51ce (patch)
treeea44ee948ea6239dd5a92367e24136acca41c51e /base/base.gyp
parentbe5ad89174eeff113654a42f775fbbe8d3402e50 (diff)
downloadchromium_src-71a9f84a47ed556ecaa23b26a0b0adfee0ae51ce.zip
chromium_src-71a9f84a47ed556ecaa23b26a0b0adfee0ae51ce.tar.gz
chromium_src-71a9f84a47ed556ecaa23b26a0b0adfee0ae51ce.tar.bz2
Reland: Linux (nss) implementations of RSAPrivateKey and SignatureCreator.
This relands: http://codereview.chromium.org/208032. Additionally, it fixes a memleak unconvered by valgrind, and adds a valgrind supression for a memleak discovered in the nss library. https://bugzilla.mozilla.org/show_bug.cgi?id=518443 BUG=20669 Review URL: http://codereview.chromium.org/218010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27033 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gyp')
-rw-r--r--base/base.gyp13
1 files changed, 10 insertions, 3 deletions
diff --git a/base/base.gyp b/base/base.gyp
index c35f8fa..0619789 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -20,8 +20,10 @@
'crypto/cssm_init.cc',
'crypto/cssm_init.h',
'crypto/rsa_private_key.h',
+ 'crypto/rsa_private_key_nss.cc',
'crypto/rsa_private_key_win.cc',
'crypto/signature_creator.h',
+ 'crypto/signature_creator_nss.cc',
'crypto/signature_creator_win.cc',
'crypto/signature_verifier.h',
'crypto/signature_verifier_mac.cc',
@@ -413,6 +415,8 @@
['exclude', '/xdg_mime/'],
],
'sources!': [
+ 'crypto/rsa_private_key_nss.cc',
+ 'crypto/signature_creator_nss.cc',
'crypto/signature_verifier_nss.cc',
'atomicops_internals_x86_gcc.cc',
'directory_watcher_inotify.cc',
@@ -703,7 +707,12 @@
'message_pump_glib_unittest.cc',
]
}],
- ['OS != "mac"', {
+ ['OS == "mac"', {
+ 'sources!': [
+ 'crypto/rsa_private_key_unittest.cc',
+ 'crypto/signature_creator_unittest.cc',
+ ],
+ }, { # OS != "mac"
'sources!': [
'mac_util_unittest.cc',
],
@@ -720,8 +729,6 @@
],
}, { # OS != "win"
'sources!': [
- 'crypto/rsa_private_key_unittest.cc',
- 'crypto/signature_creator_unittest.cc',
'gfx/native_theme_unittest.cc',
'object_watcher_unittest.cc',
'pe_image_unittest.cc',