Eliminate ScopedOpenSSL in favour of scoped_ptr<> specializations.

net/android/keystore_unittest.cc

 // Copyright (c) 2013 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 <openssl/bn.h>
 #include <openssl/dsa.h>
 #include <openssl/ecdsa.h>
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/pem.h>
 #include <openssl/rsa.h>
 #include <openssl/x509.h>
 
 #include "base/android/build_info.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_file.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "crypto/openssl_util.h"
+#include "crypto/scoped_openssl_types.h"
 #include "jni/AndroidKeyStoreTestUtil_jni.h"
 #include "net/android/keystore.h"
 #include "net/android/keystore_openssl.h"
 #include "net/base/test_data_directory.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // Technical note:
 //
 // This source file not only checks that signing with
 // RawSignDigestWithPrivateKey() works correctly, it also verifies that
@@ skipping 11 matching lines @@
 // For more details, read the comments in AndroidKeyStore.java.
 //
 // Finally, it also checks that using the EVP_PKEY generated with
 // GetOpenSSLPrivateKeyWrapper() works correctly.
 
 namespace net {
 namespace android {
 
 namespace {
 
-typedef crypto::ScopedOpenSSL<EVP_PKEY, EVP_PKEY_free> ScopedEVP_PKEY;
-typedef crypto::ScopedOpenSSL<RSA, RSA_free> ScopedRSA;
-typedef crypto::ScopedOpenSSL<DSA, DSA_free> ScopedDSA;
-typedef crypto::ScopedOpenSSL<EC_KEY, EC_KEY_free> ScopedEC_KEY;
-typedef crypto::ScopedOpenSSL<BIGNUM, BN_free> ScopedBIGNUM;
-
-typedef crypto::ScopedOpenSSL<
-    PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_free>
-        ScopedPKCS8_PRIV_KEY_INFO;
+typedef scoped_ptr<PKCS8_PRIV_KEY_INFO,
+                   crypto::OpenSSLDestroyer<PKCS8_PRIV_KEY_INFO,
+                                            PKCS8_PRIV_KEY_INFO_free> >
+    ScopedPKCS8_PRIV_KEY_INFO;
 
 typedef base::android::ScopedJavaLocalRef<jobject> ScopedJava;
 
 JNIEnv* InitEnv() {
   JNIEnv* env = base::android::AttachCurrentThread();
   static bool inited = false;
   if (!inited) {
     RegisterNativesImpl(env);
     inited = true;
   }
@@ skipping 51 matching lines @@
                << ", " << GetOpenSSLErrorString();
     return NULL;
   }
   return pkey;
 }
 
 // Convert a private key into its PKCS#8 encoded representation.
 // |pkey| is the EVP_PKEY handle for the private key.
 // |pkcs8| will receive the PKCS#8 bytes.
 // Returns true on success, false otherwise.
-bool GetPrivateKeyPkcs8Bytes(const ScopedEVP_PKEY& pkey,
+bool GetPrivateKeyPkcs8Bytes(const crypto::ScopedEVP_PKEY& pkey,
                              std::string* pkcs8) {
   // Convert to PKCS#8 object.
   ScopedPKCS8_PRIV_KEY_INFO p8_info(EVP_PKEY2PKCS8(pkey.get()));
   if (!p8_info.get()) {
     LOG(ERROR) << "Can't get PKCS#8 private key from EVP_PKEY: "
                << GetOpenSSLErrorString();
     return false;
   }
 
   // Then convert it
   int len = i2d_PKCS8_PRIV_KEY_INFO(p8_info.get(), NULL);
   unsigned char* p = OpenSSLWriteInto(pkcs8, static_cast<size_t>(len));
   i2d_PKCS8_PRIV_KEY_INFO(p8_info.get(), &p);
   return true;
 }
 
 bool ImportPrivateKeyFileAsPkcs8(const char* filename,
                                  std::string* pkcs8) {
-  ScopedEVP_PKEY pkey(ImportPrivateKeyFile(filename));
+  crypto::ScopedEVP_PKEY pkey(ImportPrivateKeyFile(filename));
   if (!pkey.get())
     return false;
   return GetPrivateKeyPkcs8Bytes(pkey, pkcs8);
 }
 
 // Same as ImportPrivateKey, but for public ones.
 EVP_PKEY* ImportPublicKeyFile(const char* filename) {
   // Load file as PEM data.
   base::FilePath certs_dir = GetTestCertsDirectory();
   base::FilePath file_path = certs_dir.AppendASCII(filename);
@@ skipping 55 matching lines @@
   return GetPKCS8PrivateKeyJava(PRIVATE_KEY_TYPE_DSA, key);
 }
 
 // Call this function to verify that one message signed with our
 // test DSA private key is correct. Since DSA signing introduces
 // random elements in the signature, it is not possible to compare
 // signature bits directly. However, one can use the public key
 // to do the check.
 bool VerifyTestDSASignature(const base::StringPiece& message,
                             const base::StringPiece& signature) {
-  ScopedEVP_PKEY pkey(ImportPublicKeyFile(kTestDsaPublicKeyFile));
+  crypto::ScopedEVP_PKEY pkey(ImportPublicKeyFile(kTestDsaPublicKeyFile));
   if (!pkey.get())
     return false;
 
-  ScopedDSA pub_key(EVP_PKEY_get1_DSA(pkey.get()));
+  crypto::ScopedDSA pub_key(EVP_PKEY_get1_DSA(pkey.get()));
   if (!pub_key.get()) {
     LOG(ERROR) << "Could not get DSA public key: "
                << GetOpenSSLErrorString();
     return false;
   }
 
   const unsigned char* digest =
       reinterpret_cast<const unsigned char*>(message.data());
   int digest_len = static_cast<int>(message.size());
   const unsigned char* sigbuf =
@@ skipping 23 matching lines @@
   return GetPKCS8PrivateKeyJava(PRIVATE_KEY_TYPE_ECDSA, key);
 }
 
 // Call this function to verify that one message signed with our
 // test DSA private key is correct. Since DSA signing introduces
 // random elements in the signature, it is not possible to compare
 // signature bits directly. However, one can use the public key
 // to do the check.
 bool VerifyTestECDSASignature(const base::StringPiece& message,
                               const base::StringPiece& signature) {
-  ScopedEVP_PKEY pkey(ImportPublicKeyFile(kTestEcdsaPublicKeyFile));
+  crypto::ScopedEVP_PKEY pkey(ImportPublicKeyFile(kTestEcdsaPublicKeyFile));
   if (!pkey.get())
     return false;
-  ScopedEC_KEY pub_key(EVP_PKEY_get1_EC_KEY(pkey.get()));
+  crypto::ScopedEC_KEY pub_key(EVP_PKEY_get1_EC_KEY(pkey.get()));
   if (!pub_key.get()) {
     LOG(ERROR) << "Could not get ECDSA public key: "
                << GetOpenSSLErrorString();
     return false;
   }
 
   const unsigned char* digest =
       reinterpret_cast<const unsigned char*>(message.data());
   int digest_len = static_cast<int>(message.size());
   const unsigned char* sigbuf =
@@ skipping 20 matching lines @@
   const unsigned char* digest =
       reinterpret_cast<const unsigned char*>(message.data());
   unsigned int digest_len = static_cast<unsigned int>(message.size());
   std::string signature;
   size_t signature_size;
   size_t max_signature_size;
   int key_type = EVP_PKEY_id(openssl_key);
   switch (key_type) {
     case EVP_PKEY_RSA:
     {
-      ScopedRSA rsa(EVP_PKEY_get1_RSA(openssl_key));
+      crypto::ScopedRSA rsa(EVP_PKEY_get1_RSA(openssl_key));
       if (!rsa.get()) {
         LOG(ERROR) << "Could not get RSA from EVP_PKEY: "
                    << GetOpenSSLErrorString();
         return false;
       }
       // With RSA, the signature will always be RSA_size() bytes.
       max_signature_size = static_cast<size_t>(RSA_size(rsa.get()));
       unsigned char* p = OpenSSLWriteInto(&signature,
                                           max_signature_size);
       unsigned int p_len = 0;
       int ret = RSA_sign(
           NID_md5_sha1, digest, digest_len, p, &p_len, rsa.get());
       if (ret != 1) {
         LOG(ERROR) << "RSA_sign() failed: " << GetOpenSSLErrorString();
         return false;
       }
       signature_size = static_cast<size_t>(p_len);
       break;
     }
     case EVP_PKEY_DSA:
     {
-      ScopedDSA dsa(EVP_PKEY_get1_DSA(openssl_key));
+      crypto::ScopedDSA dsa(EVP_PKEY_get1_DSA(openssl_key));
       if (!dsa.get()) {
         LOG(ERROR) << "Could not get DSA from EVP_PKEY: "
                    << GetOpenSSLErrorString();
         return false;
       }
       // Note, the actual signature can be smaller than DSA_size()
       max_signature_size = static_cast<size_t>(DSA_size(dsa.get()));
       unsigned char* p = OpenSSLWriteInto(&signature,
                                           max_signature_size);
       unsigned int p_len = 0;
       // Note: first parameter is ignored by function.
       int ret = DSA_sign(0, digest, digest_len, p, &p_len, dsa.get());
       if (ret != 1) {
         LOG(ERROR) << "DSA_sign() failed: " << GetOpenSSLErrorString();
         return false;
       }
       signature_size = static_cast<size_t>(p_len);
       break;
     }
     case EVP_PKEY_EC:
     {
-      ScopedEC_KEY ecdsa(EVP_PKEY_get1_EC_KEY(openssl_key));
+      crypto::ScopedEC_KEY ecdsa(EVP_PKEY_get1_EC_KEY(openssl_key));
       if (!ecdsa.get()) {
         LOG(ERROR) << "Could not get EC_KEY from EVP_PKEY: "
                    << GetOpenSSLErrorString();
         return false;
       }
       // Note, the actual signature can be smaller than ECDSA_size()
       max_signature_size = ECDSA_size(ecdsa.get());
       unsigned char* p = OpenSSLWriteInto(&signature,
                                           max_signature_size);
       unsigned int p_len = 0;
@@ skipping 106 matching lines @@
       wrapper_signature.size());
 }
 
 }  // namespace
 
 TEST(AndroidKeyStore,GetRSAKeyModulus) {
   crypto::OpenSSLErrStackTracer err_trace(FROM_HERE);
   InitEnv();
 
   // Load the test RSA key.
-  ScopedEVP_PKEY pkey(ImportPrivateKeyFile(kTestRsaKeyFile));
+  crypto::ScopedEVP_PKEY pkey(ImportPrivateKeyFile(kTestRsaKeyFile));
   ASSERT_TRUE(pkey.get());
 
   // Convert it to encoded PKCS#8 bytes.
   std::string pkcs8_data;
   ASSERT_TRUE(GetPrivateKeyPkcs8Bytes(pkey, &pkcs8_data));
 
   // Create platform PrivateKey object from it.
   ScopedJava key_java = GetPKCS8PrivateKeyJava(PRIVATE_KEY_TYPE_RSA,
                                                 pkcs8_data);
   ASSERT_FALSE(key_java.is_null());
 
   // Retrieve the corresponding modulus through JNI
   std::vector<uint8> modulus_java;
   ASSERT_TRUE(GetRSAKeyModulus(key_java.obj(), &modulus_java));
 
   // Create an OpenSSL BIGNUM from it.
-  ScopedBIGNUM bn(
+  crypto::ScopedBIGNUM bn(
       BN_bin2bn(
           reinterpret_cast<const unsigned char*>(&modulus_java[0]),
           static_cast<int>(modulus_java.size()),
           NULL));
   ASSERT_TRUE(bn.get());
 
   // Compare it to the one in the RSA key, they must be identical.
-  ScopedRSA rsa(EVP_PKEY_get1_RSA(pkey.get()));
+  crypto::ScopedRSA rsa(EVP_PKEY_get1_RSA(pkey.get()));
   ASSERT_TRUE(rsa.get()) << GetOpenSSLErrorString();
 
   ASSERT_EQ(0, BN_cmp(bn.get(), rsa.get()->n));
 }
 
 TEST(AndroidKeyStore,GetDSAKeyParamQ) {
   crypto::OpenSSLErrStackTracer err_trace(FROM_HERE);
   InitEnv();
 
   // Load the test DSA key.
-  ScopedEVP_PKEY pkey(ImportPrivateKeyFile(kTestDsaKeyFile));
+  crypto::ScopedEVP_PKEY pkey(ImportPrivateKeyFile(kTestDsaKeyFile));
   ASSERT_TRUE(pkey.get());
 
   // Convert it to encoded PKCS#8 bytes.
   std::string pkcs8_data;
   ASSERT_TRUE(GetPrivateKeyPkcs8Bytes(pkey, &pkcs8_data));
 
   // Create platform PrivateKey object from it.
   ScopedJava key_java = GetPKCS8PrivateKeyJava(PRIVATE_KEY_TYPE_DSA,
                                                 pkcs8_data);
   ASSERT_FALSE(key_java.is_null());
 
   // Retrieve the corresponding Q parameter through JNI
   std::vector<uint8> q_java;
   ASSERT_TRUE(GetDSAKeyParamQ(key_java.obj(), &q_java));
 
   // Create an OpenSSL BIGNUM from it.
-  ScopedBIGNUM bn(
+  crypto::ScopedBIGNUM bn(
       BN_bin2bn(
           reinterpret_cast<const unsigned char*>(&q_java[0]),
           static_cast<int>(q_java.size()),
           NULL));
   ASSERT_TRUE(bn.get());
 
   // Compare it to the one in the RSA key, they must be identical.
-  ScopedDSA dsa(EVP_PKEY_get1_DSA(pkey.get()));
+  crypto::ScopedDSA dsa(EVP_PKEY_get1_DSA(pkey.get()));
   ASSERT_TRUE(dsa.get()) << GetOpenSSLErrorString();
 
   ASSERT_EQ(0, BN_cmp(bn.get(), dsa.get()->q));
 }
 
 TEST(AndroidKeyStore,GetPrivateKeyTypeRSA) {
   crypto::OpenSSLErrStackTracer err_trace(FROM_HERE);
 
   ScopedJava rsa_key = GetRSATestKeyJava();
   ASSERT_FALSE(rsa_key.is_null());
   EXPECT_EQ(PRIVATE_KEY_TYPE_RSA,
             GetPrivateKeyType(rsa_key.obj()));
 }
 
 TEST(AndroidKeyStore,SignWithPrivateKeyRSA) {
   ScopedJava rsa_key = GetRSATestKeyJava();
   ASSERT_FALSE(rsa_key.is_null());
 
   if (IsOnAndroidOlderThan_4_2()) {
     LOG(INFO) << "This test can't run on Android < 4.2";
     return;
   }
 
-  ScopedEVP_PKEY openssl_key(ImportPrivateKeyFile(kTestRsaKeyFile));
+  crypto::ScopedEVP_PKEY openssl_key(ImportPrivateKeyFile(kTestRsaKeyFile));
   ASSERT_TRUE(openssl_key.get());
 
   std::string message = kTestRsaHash;
   ASSERT_EQ(36U, message.size());
 
   std::string signature;
   DoKeySigning(rsa_key.obj(), openssl_key.get(), message, &signature);
   ASSERT_TRUE(
       CompareSignatureWithOpenSSL(message, signature, openssl_key.get()));
   // All good.
 }
 
 TEST(AndroidKeyStore,SignWithWrapperKeyRSA) {
   crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
 
   ScopedJava rsa_key = GetRSATestKeyJava();
   ASSERT_FALSE(rsa_key.is_null());
 
-  ScopedEVP_PKEY wrapper_key(GetOpenSSLPrivateKeyWrapper(rsa_key.obj()));
+  crypto::ScopedEVP_PKEY wrapper_key(
+      GetOpenSSLPrivateKeyWrapper(rsa_key.obj()));
   ASSERT_TRUE(wrapper_key.get() != NULL);
 
-  ScopedEVP_PKEY openssl_key(ImportPrivateKeyFile(kTestRsaKeyFile));
+  crypto::ScopedEVP_PKEY openssl_key(ImportPrivateKeyFile(kTestRsaKeyFile));
   ASSERT_TRUE(openssl_key.get());
 
   // Check that RSA_size() works properly on the wrapper key.
   EXPECT_EQ(EVP_PKEY_size(openssl_key.get()),
             EVP_PKEY_size(wrapper_key.get()));
 
   // Message size must be 36 for RSA_sign(NID_md5_sha1,...) to return
   // without an error.
   std::string message = kTestRsaHash;
   ASSERT_EQ(36U, message.size());
@@ skipping 13 matching lines @@
   ScopedJava dsa_key = GetDSATestKeyJava();
   ASSERT_FALSE(dsa_key.is_null());
   EXPECT_EQ(PRIVATE_KEY_TYPE_DSA,
             GetPrivateKeyType(dsa_key.obj()));
 }
 
 TEST(AndroidKeyStore,SignWithPrivateKeyDSA) {
   ScopedJava dsa_key = GetDSATestKeyJava();
   ASSERT_FALSE(dsa_key.is_null());
 
-  ScopedEVP_PKEY openssl_key(ImportPrivateKeyFile(kTestDsaKeyFile));
+  crypto::ScopedEVP_PKEY openssl_key(ImportPrivateKeyFile(kTestDsaKeyFile));
   ASSERT_TRUE(openssl_key.get());
 
   std::string message = kTestDsaHash;
   ASSERT_EQ(20U, message.size());
 
   std::string signature;
   DoKeySigning(dsa_key.obj(), openssl_key.get(), message, &signature);
   ASSERT_TRUE(VerifyTestDSASignature(message, signature));
 }
 
 TEST(AndroidKeyStore,SignWithWrapperKeyDSA) {
   crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
 
   ScopedJava dsa_key = GetDSATestKeyJava();
   ASSERT_FALSE(dsa_key.is_null());
 
-  ScopedEVP_PKEY wrapper_key(
+  crypto::ScopedEVP_PKEY wrapper_key(
       GetOpenSSLPrivateKeyWrapper(dsa_key.obj()));
   ASSERT_TRUE(wrapper_key.get());
 
-  ScopedEVP_PKEY openssl_key(ImportPrivateKeyFile(kTestDsaKeyFile));
+  crypto::ScopedEVP_PKEY openssl_key(ImportPrivateKeyFile(kTestDsaKeyFile));
   ASSERT_TRUE(openssl_key.get());
 
   // Check that DSA_size() works correctly on the wrapper.
   EXPECT_EQ(EVP_PKEY_size(openssl_key.get()),
             EVP_PKEY_size(wrapper_key.get()));
 
   std::string message = kTestDsaHash;
   std::string signature;
   DoKeySigningWithWrapper(wrapper_key.get(),
                           openssl_key.get(),
                           message,
                           &signature);
   ASSERT_TRUE(VerifyTestDSASignature(message, signature));
 }
 
 TEST(AndroidKeyStore,GetPrivateKeyTypeECDSA) {
   crypto::OpenSSLErrStackTracer err_trace(FROM_HERE);
 
   ScopedJava ecdsa_key = GetECDSATestKeyJava();
   ASSERT_FALSE(ecdsa_key.is_null());
   EXPECT_EQ(PRIVATE_KEY_TYPE_ECDSA,
             GetPrivateKeyType(ecdsa_key.obj()));
 }
 
 TEST(AndroidKeyStore,SignWithPrivateKeyECDSA) {
   ScopedJava ecdsa_key = GetECDSATestKeyJava();
   ASSERT_FALSE(ecdsa_key.is_null());
 
-  ScopedEVP_PKEY openssl_key(ImportPrivateKeyFile(kTestEcdsaKeyFile));
+  crypto::ScopedEVP_PKEY openssl_key(ImportPrivateKeyFile(kTestEcdsaKeyFile));
   ASSERT_TRUE(openssl_key.get());
 
   std::string message = kTestEcdsaHash;
   std::string signature;
   DoKeySigning(ecdsa_key.obj(), openssl_key.get(), message, &signature);
   ASSERT_TRUE(VerifyTestECDSASignature(message, signature));
 }
 
 TEST(AndroidKeyStore, SignWithWrapperKeyECDSA) {
   crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
 
   ScopedJava ecdsa_key = GetECDSATestKeyJava();
   ASSERT_FALSE(ecdsa_key.is_null());
 
-  ScopedEVP_PKEY wrapper_key(
+  crypto::ScopedEVP_PKEY wrapper_key(
       GetOpenSSLPrivateKeyWrapper(ecdsa_key.obj()));
   ASSERT_TRUE(wrapper_key.get());
 
-  ScopedEVP_PKEY openssl_key(ImportPrivateKeyFile(kTestEcdsaKeyFile));
+  crypto::ScopedEVP_PKEY openssl_key(ImportPrivateKeyFile(kTestEcdsaKeyFile));
   ASSERT_TRUE(openssl_key.get());
 
   // Check that ECDSA size works correctly on the wrapper.
   EXPECT_EQ(EVP_PKEY_size(openssl_key.get()),
             EVP_PKEY_size(wrapper_key.get()));
 
   std::string message = kTestEcdsaHash;
   std::string signature;
   DoKeySigningWithWrapper(wrapper_key.get(),
                           openssl_key.get(),
                           message,
                           &signature);
   ASSERT_TRUE(VerifyTestECDSASignature(message, signature));
 }
 
 }  // namespace android
 }  // namespace net