Switch //net to the new SPKI and PKCS#8 APIs.

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/bind.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_file.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
+#include "crypto/auto_cbb.h"
 #include "crypto/openssl_util.h"
 #include "net/android/keystore.h"
 #include "net/android/keystore_openssl.h"
 #include "net/base/test_data_directory.h"
 #include "net/ssl/scoped_openssl_types.h"
 #include "net/test/jni/AndroidKeyStoreTestUtil_jni.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // Technical note:
 //
@@ skipping 85 matching lines @@
   }
   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 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();
+  uint8_t* der;
+  size_t der_len;
+  crypto::AutoCBB cbb;
+  if (!CBB_init(cbb.get(), 0) ||
+      !EVP_marshal_private_key(cbb.get(), pkey.get()) ||
+      !CBB_finish(cbb.get(), &der, &der_len)) {
     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);
+  pkcs8->assign(reinterpret_cast<const char*>(der), der_len);
+  OPENSSL_free(der);
   return true;
 }
 
 bool ImportPrivateKeyFileAsPkcs8(const char* filename,
                                  std::string* pkcs8) {
   crypto::ScopedEVP_PKEY pkey(ImportPrivateKeyFile(filename));
   if (!pkey.get())
     return false;
   return GetPrivateKeyPkcs8Bytes(pkey, pkcs8);
 }
@@ skipping 395 matching lines @@
   std::string signature;
   DoKeySigningWithWrapper(wrapper_key.get(),
                           openssl_key.get(),
                           message,
                           &signature);
   ASSERT_TRUE(VerifyTestECDSASignature(message, signature));
 }
 
 }  // namespace android
 }  // namespace net