diff options
| author | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-05 11:34:47 +0000 |
|---|---|---|
| committer | bulach@chromium.org <bulach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-05 11:34:47 +0000 |
| commit | 1e71d3071d7fbe324fb9ede296441aaf884f8d66 (patch) | |
| tree | a6770338efa2b4b4c0872ef0a1e3fee40a1300ae /crypto | |
| parent | b63efe1d971ef90da5b674adbbd08b5907b8934e (diff) | |
| download | chromium_src-1e71d3071d7fbe324fb9ede296441aaf884f8d66.zip chromium_src-1e71d3071d7fbe324fb9ede296441aaf884f8d66.tar.gz chromium_src-1e71d3071d7fbe324fb9ede296441aaf884f8d66.tar.bz2 | |
Fixes for OpenSSL
A couple of nit fixes following:
+ http://codereview.chromium.org/7247005
+ http://codereview.chromium.org/6990036
+ Fixes a typo (ctx / context)
+ Adds new abstract methods from stream_socket.h
BUG=
TEST=
Review URL: http://codereview.chromium.org/7253038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91498 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/openpgp_symmetric_encryption_openssl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/openpgp_symmetric_encryption_openssl.cc b/crypto/openpgp_symmetric_encryption_openssl.cc index bebf095..a1685be 100644 --- a/crypto/openpgp_symmetric_encryption_openssl.cc +++ b/crypto/openpgp_symmetric_encryption_openssl.cc @@ -107,7 +107,7 @@ void SaltedIteratedS2K(uint32 cipher_key_length, uint8 zero[1] = {0}; EVP_MD_CTX ctx; - EVP_MD_CTX_init(&context); + EVP_MD_CTX_init(&ctx); for (uint32 i = 0; done < cipher_key_length; i++) { CHECK_EQ(EVP_DigestInit_ex(&ctx, hash_function, NULL), 1); @@ -138,7 +138,7 @@ void SaltedIteratedS2K(uint32 cipher_key_length, done += todo; } - EVP_MD_CTX_cleanup(&context); + EVP_MD_CTX_cleanup(&ctx); } // These constants are the tag numbers for the various packet types that we |