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/encryptor_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/encryptor_nss.cc')
| -rw-r--r-- | base/crypto/encryptor_nss.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/base/crypto/encryptor_nss.cc b/base/crypto/encryptor_nss.cc index 78ddb64..eac6779 100644 --- a/base/crypto/encryptor_nss.cc +++ b/base/crypto/encryptor_nss.cc @@ -23,7 +23,9 @@ bool Encryptor::Init(SymmetricKey* key, Mode mode, const std::string& iv) { DCHECK(key); DCHECK_EQ(CBC, mode); + key_ = key; mode_ = mode; + if (iv.size() != AES_BLOCK_SIZE) return false; @@ -41,7 +43,6 @@ bool Encryptor::Init(SymmetricKey* key, Mode mode, const std::string& iv) { if (!param_.get()) return false; - key_.reset(key); return true; } |