Reduce Certificate Parsing Strictness

net/cert/internal/signature_algorithm_unittest.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/signature_algorithm.h"
 
 #include "base/files/file_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "net/base/test_data_directory.h"
 #include "net/cert/pem_tokenizer.h"
@@ skipping 54 matching lines @@
 //       OBJECT IDENTIFIER  1.2.840.113549.1.1.5
 TEST(SignatureAlgorithmTest, ParseDerSha1WithRSAEncryptionNoParams) {
   // clang-format off
   const uint8_t kData[] = {
       0x30, 0x0B,  // SEQUENCE (11 bytes)
       0x06, 0x09,  // OBJECT IDENTIFIER (9 bytes)
       0x2A, 0x86, 0x48, 0x86, 0xF7, 0x0D, 0x01, 0x01, 0x05,
   };
   // clang-format on
   scoped_ptr<SignatureAlgorithm> algorithm;
-  ASSERT_FALSE(ParseDer(kData, &algorithm));
+  ASSERT_TRUE(ParseDer(kData, &algorithm));

[eroman, 2016/02/12 21:09:44]

Check the values of |algorithm| now that this expectation has changed.

[svaldez, 2016/02/12 22:00:11]

Done.

 }
 
 // Parses a sha1WithRSAEncryption which contains an unexpected parameters
 // field. Instead of being NULL it is an integer.
 //
 //   SEQUENCE (2 elem)
 //       OBJECT IDENTIFIER  1.2.840.113549.1.1.5
 //       INTEGER  0
 TEST(SignatureAlgorithmTest, ParseDerSha1WithRSAEncryptionNonNullParams) {
   // clang-format off
@@ skipping 35 matching lines @@
 //       OBJECT IDENTIFIER  1.3.14.3.2.29
 TEST(SignatureAlgorithmTest, ParseDerSha1WithRSASignatureNoParams) {
   // clang-format off
   const uint8_t kData[] = {
       0x30, 0x07,  // SEQUENCE (7 bytes)
       0x06, 0x05,  // OBJECT IDENTIFIER (5 bytes)
       0x2b, 0x0e, 0x03, 0x02, 0x1d,
   };
   // clang-format on
   scoped_ptr<SignatureAlgorithm> algorithm;
-  ASSERT_FALSE(ParseDer(kData, &algorithm));
+  ASSERT_TRUE(ParseDer(kData, &algorithm));

[eroman, 2016/02/12 21:09:44]

Same here.

[svaldez, 2016/02/12 22:00:11]

Done.

 }
 
 // Parses a sha1WithRSAEncryption which contains values after the sequence.
 //
 //   SEQUENCE (2 elem)
 //       OBJECT IDENTIFIER  1.2.840.113549.1.1.5
 //       NULL
 //   INTEGER  0
 TEST(SignatureAlgorithmTest, ParseDerSha1WithRsaEncryptionDataAfterSequence) {
   // clang-format off
@@ skipping 91 matching lines @@
 //       OBJECT IDENTIFIER  1.2.840.113549.1.1.11
 TEST(SignatureAlgorithmTest, ParseDerSha256WithRSAEncryptionNoParams) {
   // clang-format off
   const uint8_t kData[] = {
       0x30, 0x0B,  // SEQUENCE (11 bytes)
       0x06, 0x09,  // OBJECT IDENTIFIER (9 bytes)
       0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0b,
   };
   // clang-format on
   scoped_ptr<SignatureAlgorithm> algorithm;
-  ASSERT_FALSE(ParseDer(kData, &algorithm));
+  ASSERT_TRUE(ParseDer(kData, &algorithm));

[eroman, 2016/02/12 21:09:44]

Same here.

[svaldez, 2016/02/12 22:00:11]

Done.

 }
 
 // Parses a sha384WithRSAEncryption which contains a NULL parameters field.
 //
 //   SEQUENCE (2 elem)
 //       OBJECT IDENTIFIER  1.2.840.113549.1.1.12
 //       NULL
 TEST(SignatureAlgorithmTest, ParseDerSha384WithRSAEncryptionNullParams) {
   // clang-format off
   const uint8_t kData[] = {
@@ skipping 16 matching lines @@
 //       OBJECT IDENTIFIER  1.2.840.113549.1.1.12
 TEST(SignatureAlgorithmTest, ParseDerSha384WithRSAEncryptionNoParams) {
   // clang-format off
   const uint8_t kData[] = {
       0x30, 0x0B,  // SEQUENCE (11 bytes)
       0x06, 0x09,  // OBJECT IDENTIFIER (9 bytes)
       0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0c,
   };
   // clang-format on
   scoped_ptr<SignatureAlgorithm> algorithm;
-  ASSERT_FALSE(ParseDer(kData, &algorithm));
+  ASSERT_TRUE(ParseDer(kData, &algorithm));

[eroman, 2016/02/12 21:09:44]

And here.

[svaldez, 2016/02/12 22:00:11]

Done.

 }
 
 // Parses a sha512WithRSAEncryption which contains a NULL parameters field.
 //
 //   SEQUENCE (2 elem)
 //       OBJECT IDENTIFIER  1.2.840.113549.1.1.13
 //       NULL
 TEST(SignatureAlgorithmTest, ParseDerSha512WithRSAEncryptionNullParams) {
   // clang-format off
   const uint8_t kData[] = {
@@ skipping 16 matching lines @@
 //       OBJECT IDENTIFIER  1.2.840.113549.1.1.13
 TEST(SignatureAlgorithmTest, ParseDerSha512WithRSAEncryptionNoParams) {
   // clang-format off
   const uint8_t kData[] = {
       0x30, 0x0B,  // SEQUENCE (11 bytes)
       0x06, 0x09,  // OBJECT IDENTIFIER (9 bytes)
       0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x01, 0x0d,
   };
   // clang-format on
   scoped_ptr<SignatureAlgorithm> algorithm;
-  ASSERT_FALSE(ParseDer(kData, &algorithm));
+  ASSERT_TRUE(ParseDer(kData, &algorithm));

[eroman, 2016/02/12 21:09:44]

...

[svaldez, 2016/02/12 22:00:11]

Done.

 }
 
 // Parses a sha224WithRSAEncryption which contains a NULL parameters field.
 // This fails because the parsing code does not enumerate this OID (even though
 // it is in fact valid).
 //
 //   SEQUENCE (2 elem)
 //       OBJECT IDENTIFIER  1.2.840.113549.1.1.14
 //       NULL
 TEST(SignatureAlgorithmTest, ParseDerSha224WithRSAEncryptionNullParams) {
@@ skipping 703 matching lines @@
   const RsaPssParameters* params = algorithm->ParamsForRsaPss();
 
   ASSERT_TRUE(params);
   EXPECT_EQ(DigestAlgorithm::Sha256, params->mgf1_hash());
   EXPECT_EQ(10u, params->salt_length());
 }
 
 }  // namespace
 
 }  // namespace net