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

Unified Diff: crypto/openpgp_symmetric_encryption_openssl.cc

Issue 7253038: Fixes for OpenSSL (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comments Created 9 years, 6 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
« no previous file with comments | « no previous file | net/socket/ssl_client_socket_openssl.h » ('j') | net/socket/ssl_client_socket_openssl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: crypto/openpgp_symmetric_encryption_openssl.cc
diff --git a/crypto/openpgp_symmetric_encryption_openssl.cc b/crypto/openpgp_symmetric_encryption_openssl.cc
index bebf095deda65473deff30dc8102a1419a7bfc36..a1685be55dbbcb51a75c895fa0130be7fa25eb75 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);
wtc 2011/07/01 16:41:17 I think this file has been removed.
bulach 2011/07/05 10:06:55 looks like the deletion was reverted.. :)
}
// These constants are the tag numbers for the various packet types that we
« no previous file with comments | « no previous file | net/socket/ssl_client_socket_openssl.h » ('j') | net/socket/ssl_client_socket_openssl.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698