diff options
author | nduca@google.com <nduca@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-27 00:59:39 +0000 |
---|---|---|
committer | nduca@google.com <nduca@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-27 00:59:39 +0000 |
commit | d29b3a8948b3ae214d3fefcb61ecfb000762a282 (patch) | |
tree | 945fdff2ab8b501f01fde0d63984f0d55f43b5ab /crypto/hmac_win.cc | |
parent | 42f06f9ca2fe07018a88994569f87373a7c6c578 (diff) | |
download | chromium_src-d29b3a8948b3ae214d3fefcb61ecfb000762a282.zip chromium_src-d29b3a8948b3ae214d3fefcb61ecfb000762a282.tar.gz chromium_src-d29b3a8948b3ae214d3fefcb61ecfb000762a282.tar.bz2 |
Revert 129061 - Create a database for NaCl validation caching that is shared between processes.
Reverted due to perf regression, see
http://chromegw.corp.google.com/i/chromium/builders/Linux%20x64/builds/25780
This change primarily entails creating a SyncChannel between sel_ldr and the
browser. Queries to the database could be made from any thread inside sel_ldr,
so the query mechanism needs to be thread safe.
This feature is currently disabled by default, and requires an environment
variable to enable. A few changes need to be made before this features is safe
and can be enabled, such as making sure each installation has a unique,
crypographically secure key.
BUG= http://code.google.com/p/nativeclient/issues/detail?id=2515
TEST= Run NaCl w/ NACL_VALIDATION_CACHE=1
Review URL: http://codereview.chromium.org/9796006
TBR=ncbray@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9808113
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129077 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto/hmac_win.cc')
-rw-r--r-- | crypto/hmac_win.cc | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/crypto/hmac_win.cc b/crypto/hmac_win.cc index ef3e261..ffd08ce8 100644 --- a/crypto/hmac_win.cc +++ b/crypto/hmac_win.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -28,19 +28,6 @@ enum { SHA256_BLOCK_SIZE = 64 // Block size (in bytes) of the input to SHA-256. }; -// NSS doesn't accept size_t for text size, divide the data into smaller -// chunks as needed. -void Wrapped_SHA256_Update(SHA256Context* ctx, const unsigned char* text, - size_t text_len) { - const unsigned int kChunkSize = 1 << 30; - while (text_len > kChunkSize) { - SHA256_Update(ctx, text, kChunkSize); - text += kChunkSize; - text_len -= kChunkSize; - } - SHA256_Update(ctx, text, (unsigned int)text_len); -} - // See FIPS 198: The Keyed-Hash Message Authentication Code (HMAC). void ComputeHMACSHA256(const unsigned char* key, size_t key_len, const unsigned char* text, size_t text_len, @@ -51,7 +38,7 @@ void ComputeHMACSHA256(const unsigned char* key, size_t key_len, unsigned char key0[SHA256_BLOCK_SIZE]; if (key_len > SHA256_BLOCK_SIZE) { SHA256_Begin(&ctx); - Wrapped_SHA256_Update(&ctx, key, key_len); + SHA256_Update(&ctx, key, key_len); SHA256_End(&ctx, key0, NULL, SHA256_LENGTH); memset(key0 + SHA256_LENGTH, 0, SHA256_BLOCK_SIZE - SHA256_LENGTH); } else { @@ -70,7 +57,7 @@ void ComputeHMACSHA256(const unsigned char* key, size_t key_len, // Compute the inner hash. SHA256_Begin(&ctx); SHA256_Update(&ctx, padded_key, SHA256_BLOCK_SIZE); - Wrapped_SHA256_Update(&ctx, text, text_len); + SHA256_Update(&ctx, text, text_len); SHA256_End(&ctx, inner_hash, NULL, SHA256_LENGTH); // XOR key0 with opad. @@ -81,7 +68,7 @@ void ComputeHMACSHA256(const unsigned char* key, size_t key_len, SHA256_Begin(&ctx); SHA256_Update(&ctx, padded_key, SHA256_BLOCK_SIZE); SHA256_Update(&ctx, inner_hash, SHA256_LENGTH); - SHA256_End(&ctx, output, NULL, (unsigned int) output_len); + SHA256_End(&ctx, output, NULL, output_len); } } // namespace @@ -151,8 +138,8 @@ bool HMAC::Init(const unsigned char* key, int key_length) { memcpy(key_blob->key_data, key, key_length); if (!CryptImportKey(plat_->provider_, &key_blob_storage[0], - (DWORD)key_blob_storage.size(), 0, - CRYPT_IPSEC_HMAC_KEY, plat_->key_.receive())) { + key_blob_storage.size(), 0, CRYPT_IPSEC_HMAC_KEY, + plat_->key_.receive())) { NOTREACHED(); return false; } |