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

net/cert/internal/verify_signed_data.cc

 // Copyright 2015 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/internal/verify_signed_data.h"
 
 #include "base/logging.h"
 #include "net/der/parse_values.h"
 
 // TODO(eroman): There is no intention to implement this for non-OpenSSL. Remove
@@ skipping 11 matching lines @@
                       const der::Input& public_key,
                       const SignaturePolicy* policy) {
   NOTIMPLEMENTED();
   return false;
 }
 
 }  // namespace net
 
 #else
 
+#include <openssl/bytestring.h>
 #include <openssl/digest.h>
 #include <openssl/ec.h>
 #include <openssl/ec_key.h>
 #include <openssl/evp.h>
 #include <openssl/rsa.h>
-#include <openssl/x509.h>
 
 #include "base/compiler_specific.h"
 #include "crypto/openssl_util.h"
 #include "crypto/scoped_openssl_types.h"
 #include "net/cert/internal/signature_algorithm.h"
 #include "net/cert/internal/signature_policy.h"
 #include "net/der/input.h"
 #include "net/der/parser.h"
 
 namespace net {
@@ skipping 42 matching lines @@
 }
 
 // TODO(eroman): This function is not strict enough. It accepts BER, other RSA
 // OIDs, and does not check id-rsaEncryption parameters.
 // See https://crbug.com/522228 and https://crbug.com/522232
 WARN_UNUSED_RESULT bool ImportPkeyFromSpki(const der::Input& spki,
                                            int expected_pkey_id,
                                            crypto::ScopedEVP_PKEY* pkey) {
   crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
 
-  const uint8_t* ptr = spki.UnsafeData();
-  pkey->reset(d2i_PUBKEY(nullptr, &ptr, spki.Length()));
-  if (!pkey->get() || ptr != spki.UnsafeData() + spki.Length() ||
+  CBS cbs;
+  CBS_init(&cbs, spki.UnsafeData(), spki.Length());
+  pkey->reset(EVP_parse_public_key(&cbs));
+  if (!*pkey || CBS_len(&cbs) != 0 ||
       EVP_PKEY_id(pkey->get()) != expected_pkey_id) {
     pkey->reset();
     return false;
   }
 
   return true;
 }
 
 // Parses an RSA public key from SPKI to an EVP_PKEY.
 //
@@ skipping 193 matching lines @@
       break;
   }
 
   return DoVerify(signature_algorithm, signed_data, signature_value,
                   public_key.get());
 }
 
 }  // namespace net
 
 #endif