Cleanup of OpenSSL/NSS implementation of ProofVerfifier release.

net/quic/crypto/proof_verifier_chromium.cc

 // Copyright 2013 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/quic/crypto/proof_verifier_chromium.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback_helpers.h"
 #include "base/compiler_specific.h"
@@ skipping 22 matching lines @@
 ProofVerifierChromium::ProofVerifierChromium(CertVerifier* cert_verifier,
                                              const BoundNetLog& net_log)
   : cert_verifier_(cert_verifier),
     error_details_(NULL),
     next_state_(STATE_NONE),
     net_log_(net_log) {
 }
 
 ProofVerifierChromium::~ProofVerifierChromium() {
   verifier_.reset();
-
-  // Reset object state.
-  callback_.Reset();
-  cert_verify_result_.Reset();

[wtc, 2013/07/03 19:06:58]

Thank you for making this change.  I confirmed that this code was copied
from SSLClientSocketNSS::Disconnect(), where it is necessary to do this.

 }
 
 int ProofVerifierChromium::VerifyProof(const string& hostname,
                                        const string& server_config,
                                        const vector<string>& certs,
                                        const string& signature,
                                        std::string* error_details,
                                        const CompletionCallback& callback) {
   DCHECK(error_details);
   error_details->clear();
@@ skipping 11 matching lines @@
     return ERR_FAILED;
   }
 
   // Convert certs to X509Certificate.
   vector<StringPiece> cert_pieces(certs.size());
   for (unsigned i = 0; i < certs.size(); i++) {
     cert_pieces[i] = base::StringPiece(certs[i]);
   }
   cert_ = X509Certificate::CreateFromDERCertChain(cert_pieces);
   if (!cert_.get()) {
     cert_verify_result_.Reset();

[wtc, 2013/07/03 19:06:58]

This line should be removed, too.

[ramant (doing other things), 2013/07/03 20:31:35]

Done.

-    cert_verify_result_.cert_status = CERT_STATUS_INVALID;
     *error_details = "Failed to create certificate chain";
     DLOG(WARNING) << *error_details;
     return ERR_FAILED;
   }
 
   // We call VerifySignature first to avoid copying of server_config and
   // signature.
   if (!VerifySignature(server_config, signature, certs[0])) {
     *error_details = "Failed to verify signature of server config";
     DLOG(WARNING) << *error_details;
@@ skipping 52 matching lines @@
       base::Bind(&ProofVerifierChromium::OnIOComplete,
                  base::Unretained(this)),
       net_log_);
 }
 
 int ProofVerifierChromium::DoVerifyCertComplete(int result) {
   verifier_.reset();
 
   if (result <= ERR_FAILED) {
     *error_details_ = StringPrintf("Failed to verify certificate chain: %s",
-                                  ErrorToString(result));
+                                   ErrorToString(result));
     DLOG(WARNING) << *error_details_;
     result = ERR_FAILED;
   }
 
   // Exit DoLoop and return the result to the caller to VerifyProof.
   DCHECK_EQ(STATE_NONE, next_state_);
   return result;
 }
 
 bool ProofVerifierChromium::VerifySignature(const string& signed_data,
@@ skipping 68 matching lines @@
   if (!verifier.VerifyFinal()) {
     DLOG(WARNING) << "VerifyFinal failed";
     return false;
   }
 
   DLOG(INFO) << "VerifyFinal success";
   return true;
 }
 
 }  // namespace net