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

net/cert/jwk_serializer_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/jwk_serializer.h"
 
 #include <openssl/bn.h>
+#include <openssl/bytestring.h>
 #include <openssl/ec.h>
 #include <openssl/ec_key.h>
 #include <openssl/evp.h>
-#include <openssl/x509.h>
 
 #include "base/base64url.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/values.h"
 #include "crypto/openssl_util.h"
 #include "crypto/scoped_openssl_types.h"
 
 namespace net {
 
@@ skipping 67 matching lines @@
 }  // namespace
 
 bool ConvertSpkiFromDerToJwk(
     const base::StringPiece& spki_der,
     base::DictionaryValue* public_key_jwk) {
   public_key_jwk->Clear();
 
   crypto::EnsureOpenSSLInit();
   crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
 
-  const uint8_t *data = reinterpret_cast<const uint8_t*>(spki_der.data());
-  const uint8_t *ptr = data;
-  crypto::ScopedEVP_PKEY pubkey(d2i_PUBKEY(NULL, &ptr, spki_der.size()));
-  if (!pubkey || ptr != data + spki_der.size())
+  CBS cbs;
+  CBS_init(&cbs, reinterpret_cast<const uint8_t*>(spki_der.data()),
+           spki_der.size());
+  crypto::ScopedEVP_PKEY pubkey(EVP_parse_public_key(&cbs));
+  if (!pubkey || CBS_len(&cbs) != 0)
     return false;
 
   if (pubkey->type == EVP_PKEY_EC) {
     return ConvertEcKeyToJwk(pubkey.get(), public_key_jwk, err_tracer);
   } else {
     // TODO(juanlang): other algorithms
     return false;
   }
 }
 
 }  // namespace JwkSerializer
 
 }  // namespace net