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

net/cert/ct_log_verifier_openssl.cc

 // Copyright 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 "net/cert/ct_log_verifier.h"
 
+#include <openssl/bytestring.h>
 #include <openssl/evp.h>
-#include <openssl/x509.h>
 
 #include "base/logging.h"
 #include "crypto/openssl_util.h"
 #include "crypto/scoped_openssl_types.h"
 #include "crypto/sha2.h"
 #include "net/cert/signed_tree_head.h"
 
 namespace net {
 
 namespace {
@@ skipping 24 matching lines @@
 CTLogVerifier::~CTLogVerifier() {
   crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
 
   if (public_key_)
     EVP_PKEY_free(public_key_);
 }
 
 bool CTLogVerifier::Init(const base::StringPiece& public_key) {
   crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
 
-  const uint8_t* ptr = reinterpret_cast<const uint8_t*>(public_key.data());
-  const uint8_t* end = ptr + public_key.size();
-  public_key_ = d2i_PUBKEY(nullptr, &ptr, public_key.size());
-  if (!public_key_ || ptr != end)
+  CBS cbs;
+  CBS_init(&cbs, reinterpret_cast<const uint8_t*>(public_key.data()),
+           public_key.size());
+  public_key_ = EVP_parse_public_key(&cbs);
+  if (!public_key_ || CBS_len(&cbs) != 0)
     return false;
 
   key_id_ = crypto::SHA256HashString(public_key);
 
   // Right now, only RSASSA-PKCS1v15 with SHA-256 and ECDSA with SHA-256 are
   // supported.
   switch (EVP_PKEY_type(public_key_->type)) {
     case EVP_PKEY_RSA:
       hash_algorithm_ = ct::DigitallySigned::HASH_ALGO_SHA256;
       signature_algorithm_ = ct::DigitallySigned::SIG_ALGO_RSA;
@@ skipping 36 matching lines @@
       1 == EVP_DigestVerifyFinal(
           &ctx,
           reinterpret_cast<const uint8_t*>(signature.data()),
           signature.size()));
 
   EVP_MD_CTX_cleanup(&ctx);
   return ok;
 }
 
 }  // namespace net