summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--base/crypto/rsa_private_key_win.cc4
-rw-r--r--chrome/chrome.gyp4
2 files changed, 2 insertions, 6 deletions
diff --git a/base/crypto/rsa_private_key_win.cc b/base/crypto/rsa_private_key_win.cc
index e963f7f..c29c5ce 100644
--- a/base/crypto/rsa_private_key_win.cc
+++ b/base/crypto/rsa_private_key_win.cc
@@ -83,8 +83,8 @@ static void PrependTypeHeaderAndLength(uint8 type, uint32 length,
// Helper to prepend an ASN.1 integer.
static void PrependInteger(uint8* val, int num_bytes, std::list<uint8>* data) {
- // If the MSB is set, we need an extra null byte at the front.
- bool needs_null_byte = !(val[num_bytes - 1] & 0x80);
+ // If the MSB is set, we are supposed to add an extra null byte at the front.
+ bool needs_null_byte = (val[num_bytes - 1] & 0x80) != 0;
int length = needs_null_byte ? num_bytes + 1 : num_bytes;
PrependBytesInReverseOrder(val, num_bytes, data);
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index c2c4199..9a9f236 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -3638,12 +3638,8 @@
'browser/gtk/tabs/tab_renderer_gtk_unittest.cc',
'common/file_descriptor_set_unittest.cc',
'common/net/url_util_unittest.cc',
- # TODO(ben): http://crbug.com/14640
- 'browser/extensions/extensions_service_unittest.cc',
# TODO(ben): http://crbug.com/14641
'browser/password_manager/login_database_unittest.cc',
- # TODO(ben): http://crbug.com/14642
- 'common/extensions/extension_unittest.cc',
],
'link_settings': {
'libraries': [