diff options
| author | albertb@chromium.org <albertb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-31 16:18:30 +0000 |
|---|---|---|
| committer | albertb@chromium.org <albertb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-31 16:18:30 +0000 |
| commit | 1b47ce2e8d25023f531f4afa8f05b044c4cef111 (patch) | |
| tree | 7b4875711b3b1aea46b06ad0d2bb84194d0301c7 /base/crypto/symmetric_key_nss.cc | |
| parent | 61ee6287a14aed0235a40488394fb700e9c5c43c (diff) | |
| download | chromium_src-1b47ce2e8d25023f531f4afa8f05b044c4cef111.zip chromium_src-1b47ce2e8d25023f531f4afa8f05b044c4cef111.tar.gz chromium_src-1b47ce2e8d25023f531f4afa8f05b044c4cef111.tar.bz2 | |
First pass of a Nigori implementation for Chrome. Only unassisted key
derivation is supported and there is no support for server authentication.
BUG=37363
TEST=unit tests
Review URL: http://codereview.chromium.org/1357003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43220 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/crypto/symmetric_key_nss.cc')
| -rw-r--r-- | base/crypto/symmetric_key_nss.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/base/crypto/symmetric_key_nss.cc b/base/crypto/symmetric_key_nss.cc index 0fb8cfa..5af7cde 100644 --- a/base/crypto/symmetric_key_nss.cc +++ b/base/crypto/symmetric_key_nss.cc @@ -55,7 +55,6 @@ SymmetricKey* SymmetricKey::DeriveKeyFromPassword(Algorithm algorithm, const_cast<char *>(salt.data())); salt_item.len = salt.size(); - SECOidTag cipher_algorithm = algorithm == AES ? SEC_OID_AES_256_CBC : SEC_OID_HMAC_SHA1; ScopedSECAlgorithmID alg_id(PK11_CreatePBEV2AlgorithmID(SEC_OID_PKCS5_PBKDF2, |