Try #2: Fix cert_verify_tool dump filename conflict between CertVerifyProc impls.

(Reland of ea78046d with win compile fix.)

Change-Id: Iac81b6de149d42edf7bd5b2954d2a8ddc106a52f
Reviewed-on: https://chromium-review.googlesource.com/1058444
Commit-Queue: Matt Mueller <mattm@chromium.org>
Reviewed-by: Eric Roman <eroman@chromium.org>
Cr-Commit-Position: refs/heads/master@{#558843}

net/tools/cert_verify_tool/cert_verify_tool.cc

@@ -116,9 +116,15 @@ class CertVerifyImplUsingProc : public CertVerifyImpl {
       return true;  // "skipping" is considered a successful return.
     }
 
+    base::FilePath dump_path;
+    if (!dump_prefix_path.empty()) {
+      dump_path = dump_prefix_path.AddExtension(FILE_PATH_LITERAL(".pem"))
+                      .InsertBeforeExtensionASCII("." + GetName());
+    }
+
     return VerifyUsingCertVerifyProc(proc_.get(), target_der_cert, hostname,
                                      intermediate_der_certs, root_der_certs,
-                                     crl_set, dump_prefix_path);
+                                     crl_set, dump_path);
   }
 
  private:

net/tools/cert_verify_tool/verify_using_cert_verify_proc.cc

@@ -115,7 +115,7 @@ bool VerifyUsingCertVerifyProc(
     const std::vector<CertInput>& intermediate_der_certs,
     const std::vector<CertInput>& root_der_certs,
     net::CRLSet* crl_set,
-    const base::FilePath& dump_prefix_path) {
+    const base::FilePath& dump_path) {
   std::cout
       << "NOTE: CertVerifyProc always uses OS trust settings (--roots are in "
          "addition).\n";
@@ -165,10 +165,8 @@ bool VerifyUsingCertVerifyProc(
 
   std::cout << "CertVerifyProc result: " << net::ErrorToShortString(rv) << "\n";
   PrintCertVerifyResult(result);
-  if (!dump_prefix_path.empty() && result.verified_cert) {
-    if (!DumpX509CertificateChain(dump_prefix_path.AddExtension(
-                                      FILE_PATH_LITERAL(".CertVerifyProc.pem")),
-                                  result.verified_cert.get())) {
+  if (!dump_path.empty() && result.verified_cert) {
+    if (!DumpX509CertificateChain(dump_path, result.verified_cert.get())) {
       return false;
     }
   }

net/tools/cert_verify_tool/verify_using_cert_verify_proc.h

@@ -30,6 +30,6 @@ bool VerifyUsingCertVerifyProc(
     const std::vector<CertInput>& intermediate_der_certs,
     const std::vector<CertInput>& root_der_certs,
     net::CRLSet* crl_set,
-    const base::FilePath& dump_prefix_path);
+    const base::FilePath& dump_path);
 
 #endif  // NET_TOOLS_CERT_VERIFY_TOOL_VERIFY_USING_CERT_VERIFY_PROC_H_