Fixes for OpenSSL

crypto/openpgp_symmetric_encryption_openssl.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "crypto/openpgp_symmetric_encryption.h"
 
 #include <vector>
 #include <stdlib.h>
 
 #include <openssl/evp.h>
@@ skipping 89 matching lines @@
                        base::StringPiece salt,
                        uint32 count,
                        uint8 *out_key) {
   const std::string combined = salt.as_string() + passphrase.as_string();
   const size_t combined_len = combined.size();
 
   uint32 done = 0;
   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);
 
     for (uint32 j = 0; j < i; j++)
       EVP_DigestUpdate(&ctx, zero, sizeof(zero));
 
     uint32 written = 0;
     while (written < count) {
       if (written + combined_len > count) {
@@ skipping 10 matching lines @@
     uint8 hash[EVP_MAX_MD_SIZE];
     CHECK_EQ(EVP_DigestFinal_ex(&ctx, hash, &num_hash_bytes), 1);
 
     uint32 todo = cipher_key_length - done;
     if (todo > num_hash_bytes)
       todo = num_hash_bytes;
     memcpy(out_key + done, hash, todo);
     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
 // use.
 static const uint32 kSymmetricKeyEncryptedTag = 3;
 static const uint32 kSymmetricallyEncryptedTag = 18;
 static const uint32 kCompressedTag = 8;
 static const uint32 kLiteralDataTag = 11;
 
 class Decrypter {
@@ skipping 546 matching lines @@
 // static
 std::string OpenPGPSymmetricEncrytion::Encrypt(
     base::StringPiece plaintext,
     base::StringPiece passphrase) {
   Encrypter::ByteString b =
       Encrypter::Encrypt(plaintext, passphrase);
   return std::string(reinterpret_cast<const char*>(b.data()), b.size());
 }
 
 }  // namespace crypto