Update from https://crrev.com/304121

crypto/signature_verifier_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/signature_verifier.h"
 
 #include "base/numerics/safe_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 TEST(SignatureVerifierTest, BasicTest) {
@@ skipping 240 matching lines @@
                            bad_signature, sizeof(bad_signature),
                            public_key_info, sizeof(public_key_info));
 
   // A crypto library (e.g., NSS) may detect that the signature is corrupted
   // and cause VerifyInit to return false, so it is fine for 'ok' to be false.
   if (ok) {
     verifier.VerifyUpdate(tbs_certificate, sizeof(tbs_certificate));
     ok = verifier.VerifyFinal();
     EXPECT_FALSE(ok);
   }
+
+  // Test 5: import an invalid key.
+  uint8_t bad_public_key_info[sizeof(public_key_info)];
+  memcpy(bad_public_key_info, public_key_info, sizeof(public_key_info));
+  bad_public_key_info[0] += 1;  // Corrupt part of the SPKI syntax.
+  ok = verifier.VerifyInit(signature_algorithm,
+                           sizeof(signature_algorithm),
+                           signature, sizeof(signature),
+                           bad_public_key_info, sizeof(bad_public_key_info));
+  EXPECT_FALSE(ok);
+
+  // Test 6: import a key with extra data.
+  uint8_t long_public_key_info[sizeof(public_key_info) + 5];
+  memset(long_public_key_info, 0, sizeof(long_public_key_info));
+  memcpy(long_public_key_info, public_key_info, sizeof(public_key_info));
+  ok = verifier.VerifyInit(signature_algorithm,
+                           sizeof(signature_algorithm),
+                           signature, sizeof(signature),
+                           long_public_key_info, sizeof(long_public_key_info));
+  EXPECT_FALSE(ok);
 }
 
 //////////////////////////////////////////////////////////////////////
 //
 // RSA-PSS signature verification known answer test
 //
 //////////////////////////////////////////////////////////////////////
 
 // The following RSA-PSS signature test vectors come from the pss-vect.txt
 // file downloaded from
@@ skipping 860 matching lines @@
                                      &public_key_info[0],
                                      public_key_info.size());
       signature[0] -= 1;
       ASSERT_TRUE(ok);
       verifier.VerifyUpdate(&message[0], message.size());
       ok = verifier.VerifyFinal();
       EXPECT_FALSE(ok);
     }
   }
 }