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

Unified Diff: crypto/symmetric_key_nss.cc

Issue 36593002: crypto/nss_util: Get TPM slot id, do lookup by id instead of by name. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sandbox debugging crap Created 7 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: crypto/symmetric_key_nss.cc
diff --git a/crypto/symmetric_key_nss.cc b/crypto/symmetric_key_nss.cc
index 7fd0c320d888e3d7bcdfa21337c1c44db0224f13..1735ce8fe5827ff3ef2654420e7617682e366196 100644
--- a/crypto/symmetric_key_nss.cc
+++ b/crypto/symmetric_key_nss.cc
@@ -19,6 +19,7 @@ SymmetricKey* SymmetricKey::GenerateRandomKey(Algorithm algorithm,
size_t key_size_in_bits) {
DCHECK_EQ(AES, algorithm);
+ LOG(ERROR) << "HIIIIIIIIIIIIIIIIIIIIIIIIIII";
EnsureNSSInit();
if (key_size_in_bits == 0)
return NULL;
@@ -41,6 +42,7 @@ SymmetricKey* SymmetricKey::DeriveKeyFromPassword(Algorithm algorithm,
const std::string& salt,
size_t iterations,
size_t key_size_in_bits) {
+ LOG(ERROR) << "HIIIIIIIIIIIIIIIIIIIIIIIIIII";
EnsureNSSInit();
if (salt.empty() || iterations == 0 || key_size_in_bits == 0)
return NULL;
@@ -83,6 +85,7 @@ SymmetricKey* SymmetricKey::DeriveKeyFromPassword(Algorithm algorithm,
// static
SymmetricKey* SymmetricKey::Import(Algorithm algorithm,
const std::string& raw_key) {
+ LOG(ERROR) << "HIIIIIIIIIIIIIIIIIIIIIIIIIII";
EnsureNSSInit();
CK_MECHANISM_TYPE cipher =
algorithm == AES ? CKM_AES_CBC : CKM_SHA_1_HMAC;

Powered by Google App Engine
This is Rietveld 408576698