Update from https://crrev.com/306655

crypto/rsa_private_key_unittest.cc

 // Copyright (c) 2011 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 "crypto/rsa_private_key.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
@@ skipping 132 matching lines @@
       crypto::RSAPrivateKey::CreateFromPrivateKeyInfo(input));
 
   scoped_ptr<crypto::RSAPrivateKey> key_copy(key->Copy());
   ASSERT_TRUE(key_copy.get());
 
   std::vector<uint8> privkey_copy;
   ASSERT_TRUE(key_copy->ExportPrivateKey(&privkey_copy));
   ASSERT_EQ(input, privkey_copy);
 }
 
+// Test that CreateFromPrivateKeyInfo fails if there is extra data after the RSA
+// key.
+TEST(RSAPrivateKeyUnitTest, ExtraData) {
+  std::vector<uint8> input(
+      kTestPrivateKeyInfo, kTestPrivateKeyInfo + sizeof(kTestPrivateKeyInfo));
+  input.push_back(0);
+
+  scoped_ptr<crypto::RSAPrivateKey> key(
+      crypto::RSAPrivateKey::CreateFromPrivateKeyInfo(input));
+
+  // Import should fail.
+  EXPECT_FALSE(key);
+}
+
 
 // Verify that generated public keys look good. This test data was generated
 // with the openssl command line tool.
 TEST(RSAPrivateKeyUnitTest, PublicKeyTest) {
   const uint8 expected_public_key_info[] = {
     0x30, 0x81, 0x9f, 0x30, 0x0d, 0x06, 0x09, 0x2a,
     0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x01,
     0x05, 0x00, 0x03, 0x81, 0x8d, 0x00, 0x30, 0x81,
     0x89, 0x02, 0x81, 0x81, 0x00, 0xb8, 0x7f, 0x2b,
     0x20, 0xdc, 0x7c, 0x9b, 0x0c, 0xdc, 0x51, 0x61,
@@ skipping 260 matching lines @@
   std::vector<uint8> privkey_copy;
   std::vector<uint8> pubkey_copy;
   ASSERT_TRUE(key_copy->ExportPrivateKey(&privkey_copy));
   ASSERT_TRUE(key_copy->ExportPublicKey(&pubkey_copy));
 
   ASSERT_EQ(privkey, privkey_copy);
   ASSERT_EQ(pubkey, pubkey_copy);
 }
 #endif