Simplify parse_certificate_fuzzer.

net/cert/internal/parse_certificate_fuzzer.cc

Index: net/cert/internal/parse_certificate_fuzzer.cc
diff --git a/net/cert/internal/parse_certificate_fuzzer.cc b/net/cert/internal/parse_certificate_fuzzer.cc
index c6112f68685413920a57c012853f4bb0d3652006..67ea6986e54bf89f0a5384b541e3644d4e457066 100644
--- a/net/cert/internal/parse_certificate_fuzzer.cc
+++ b/net/cert/internal/parse_certificate_fuzzer.cc
@@ -7,76 +7,13 @@
 
 #include "base/macros.h"
 #include "net/cert/internal/cert_errors.h"
-#include "net/cert/internal/certificate_policies.h"
-#include "net/cert/internal/extended_key_usage.h"
-#include "net/cert/internal/name_constraints.h"
-#include "net/cert/internal/parse_certificate.h"
-#include "net/cert/internal/parse_name.h"
-#include "net/cert/internal/signature_algorithm.h"
-#include "net/cert/internal/signature_policy.h"
-#include "net/cert/internal/verify_signed_data.h"
-
-namespace net {
-namespace {
-
-bool FindExtension(const der::Input& oid,
-                   std::map<der::Input, ParsedExtension>* extensions,
-                   ParsedExtension* extension) {
-  auto it = extensions->find(oid);
-  if (it == extensions->end())
-    return false;
-  *extension = it->second;
-  return true;
-}
-
-void ParseCertificateForFuzzer(const der::Input& in) {
-  der::Input tbs_certificate_tlv;
-  der::Input signature_algorithm_tlv;
-  der::BitString signature_value;
-  CertErrors errors;
-  if (!ParseCertificate(in, &tbs_certificate_tlv, &signature_algorithm_tlv,
-                        &signature_value, &errors))
-    return;
-  std::unique_ptr<SignatureAlgorithm> sig_alg(
-      SignatureAlgorithm::Create(signature_algorithm_tlv, &errors));
-
-  ParsedTbsCertificate tbs;
-  if (!ParseTbsCertificate(tbs_certificate_tlv, {}, &tbs, &errors))
-    return;
-
-  RDNSequence subject;
-  ignore_result(ParseName(tbs.subject_tlv, &subject));
-
-  std::map<der::Input, ParsedExtension> extensions;
-  if (tbs.has_extensions && ParseExtensions(tbs.extensions_tlv, &extensions)) {
-    ParsedExtension extension;
-    ParsedBasicConstraints basic_constraints;
-    der::BitString key_usage;
-    std::vector<der::Input> policies;
-    std::vector<der::Input> eku_oids;
-    std::vector<base::StringPiece> ca_issuers_uris;
-    std::vector<base::StringPiece> ocsp_uris;
-    if (FindExtension(BasicConstraintsOid(), &extensions, &extension))
-      ignore_result(ParseBasicConstraints(extension.value, &basic_constraints));
-    if (FindExtension(KeyUsageOid(), &extensions, &extension))
-      ignore_result(ParseKeyUsage(extension.value, &key_usage));
-    if (FindExtension(SubjectAltNameOid(), &extensions, &extension))
-      GeneralNames::CreateFromDer(extension.value);
-    if (FindExtension(CertificatePoliciesOid(), &extensions, &extension))
-      ParseCertificatePoliciesExtension(extension.value, &policies);

[mattm, 2016/09/22 22:57:14]

Doesn't fuzz ParseCertificatePoliciesExtension and ParseEKUExtension extension
anymore.. but I guess it's better to fuzz the code path we actually use, and
it'll start fuzzing them again if we add them to ParsedCertificate.

[eroman, 2016/09/22 23:22:23]

Correct. I expect to add those to ParsedCertificate at some point.

-    if (FindExtension(ExtKeyUsageOid(), &extensions, &extension))
-      ParseEKUExtension(extension.value, &eku_oids);
-    if (FindExtension(AuthorityInfoAccessOid(), &extensions, &extension))
-      ignore_result(ParseAuthorityInfoAccess(extension.value, &ca_issuers_uris,
-                                             &ocsp_uris));
-  }
-}
-
-}  // namespace
-}  // namespace net
+#include "net/cert/internal/parsed_certificate.h"
 
 extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
-  net::der::Input in(data, size);
-  net::ParseCertificateForFuzzer(in);
+  net::CertErrors errors;
+  scoped_refptr<net::ParsedCertificate> cert =
+      net::ParsedCertificate::Create(data, size, {}, &errors);
+
+  // TODO(crbug.com/634443): Ensure that !errors.empty() on parsing failure.
   return 0;
 }