Refactor EnsureOpenSSLInit and openssl_util into base

base/crypto/encryptor_openssl.cc

 // Copyright (c) 2010 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 "base/crypto/encryptor.h"
 
 #include <openssl/aes.h>
 #include <openssl/evp.h>
 
 #include "base/crypto/symmetric_key.h"
@@ skipping 26 matching lines @@
     ClearOpenSSLERRStack();
   }
   EVP_CIPHER_CTX* get() { return &ctx_; }
 
  private:
   EVP_CIPHER_CTX ctx_;
 };
 
 }  // namespace
 
-Encryptor::Encryptor() {
+Encryptor::Encryptor()
+    : key_(NULL) {
 }
 
 Encryptor::~Encryptor() {
 }
 
 bool Encryptor::Init(SymmetricKey* key, Mode mode, const std::string& iv) {
   DCHECK(key);
   DCHECK_EQ(CBC, mode);
 
+  EnsureOpenSSLInit();
   if (iv.size() != AES_BLOCK_SIZE)
     return false;
 
   if (GetCipherForKey(key) == NULL)
     return false;
 
   key_ = key;
   mode_ = mode;
   iv_ = iv;
   return true;
 }
 
 bool Encryptor::Encrypt(const std::string& plaintext, std::string* ciphertext) {
   return Crypt(true, plaintext, ciphertext);
 }
 
 bool Encryptor::Decrypt(const std::string& ciphertext, std::string* plaintext) {
   return Crypt(false, ciphertext, plaintext);
 }
 
 bool Encryptor::Crypt(bool do_encrypt,
                       const std::string& input,
                       std::string* output) {
+  DCHECK(key_);  // Must call Init() before En/De-crypt.
   // Work on the result in a local variable, and then only transfer it to
   // |output| on success to ensure no partial data is returned.
   std::string result;
   output->swap(result);
 
   const EVP_CIPHER* cipher = GetCipherForKey(key_);
   DCHECK(cipher);  // Already handled in Init();
 
   const std::string& key = key_->key();
   DCHECK_EQ(EVP_CIPHER_iv_length(cipher), static_cast<int>(iv_.length()));
@@ skipping 24 matching lines @@
 
   out_len += tail_len;
   DCHECK_LE(out_len, static_cast<int>(output_size));
   result.resize(out_len);
 
   output->swap(result);
   return true;
 }
 
 }  // namespace base