Check trailing data when parsing ASN.1.

content/child/webcrypto/openssl/util_openssl.cc

 // Copyright 2014 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 "content/child/webcrypto/openssl/util_openssl.h"
 
 #include <openssl/evp.h>
 #include <openssl/pkcs12.h>
 
 #include "base/stl_util.h"
@@ skipping 173 matching lines @@
 }
 
 Status ImportUnverifiedPkeyFromSpki(const CryptoData& key_data,
                                     int expected_pkey_id,
                                     crypto::ScopedEVP_PKEY* pkey) {
   if (!key_data.byte_length())
     return Status::ErrorImportEmptyKeyData();
 
   crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
 
-  crypto::ScopedBIO bio(BIO_new_mem_buf(const_cast<uint8_t*>(key_data.bytes()),
-                                        key_data.byte_length()));
-  if (!bio.get())
-    return Status::ErrorUnexpected();
-
-  pkey->reset(d2i_PUBKEY_bio(bio.get(), NULL));
-  if (!pkey->get())
+  const uint8_t* ptr = key_data.bytes();
+  pkey->reset(d2i_PUBKEY(nullptr, &ptr, key_data.byte_length()));
+  if (!pkey->get() || ptr != key_data.bytes() + key_data.byte_length())
     return Status::DataError();
 
   if (EVP_PKEY_id(pkey->get()) != expected_pkey_id)
     return Status::DataError();  // Data did not define expected key type.
 
   return Status::Success();
 }
 
 Status ImportUnverifiedPkeyFromPkcs8(const CryptoData& key_data,
                                      int expected_pkey_id,
                                      crypto::ScopedEVP_PKEY* pkey) {
   if (!key_data.byte_length())
     return Status::ErrorImportEmptyKeyData();
 
   crypto::OpenSSLErrStackTracer err_tracer(FROM_HERE);
 
-  crypto::ScopedBIO bio(BIO_new_mem_buf(const_cast<uint8_t*>(key_data.bytes()),
-                                        key_data.byte_length()));
-  if (!bio.get())
-    return Status::ErrorUnexpected();
-
+  const uint8_t* ptr = key_data.bytes();
   crypto::ScopedOpenSSL<PKCS8_PRIV_KEY_INFO, PKCS8_PRIV_KEY_INFO_free>::Type
-      p8inf(d2i_PKCS8_PRIV_KEY_INFO_bio(bio.get(), NULL));
-  if (!p8inf.get())
+      p8inf(d2i_PKCS8_PRIV_KEY_INFO(nullptr, &ptr, key_data.byte_length()));
+  if (!p8inf.get() || ptr != key_data.bytes() + key_data.byte_length())
     return Status::DataError();
 
   pkey->reset(EVP_PKCS82PKEY(p8inf.get()));
   if (!pkey->get())
     return Status::DataError();
 
   if (EVP_PKEY_id(pkey->get()) != expected_pkey_id)
     return Status::DataError();  // Data did not define expected key type.
 
   return Status::Success();
 }
 
 BIGNUM* CreateBIGNUM(const std::string& n) {
   return BN_bin2bn(reinterpret_cast<const uint8_t*>(n.data()), n.size(), NULL);
 }
 
 std::vector<uint8_t> BIGNUMToVector(const BIGNUM* n) {
   std::vector<uint8_t> v(BN_num_bytes(n));
   BN_bn2bin(n, vector_as_array(&v));
   return v;
 }
 
 }  // namespace webcrypto
 
 }  // namespace content