From 5151107c286eb00ee5757d5c1707ef639d5aab1c Mon Sep 17 00:00:00 2001 From: Brendan Forster Date: Thu, 27 Apr 2017 15:01:55 +1000 Subject: [PATCH] tighten up indenting --- atom/browser/ui/certificate_trust_win.cc | 180 +++++++++++++++---------------- 1 file changed, 87 insertions(+), 93 deletions(-) diff --git a/atom/browser/ui/certificate_trust_win.cc b/atom/browser/ui/certificate_trust_win.cc index 892441c..a5f8ec3 100644 --- a/atom/browser/ui/certificate_trust_win.cc +++ b/atom/browser/ui/certificate_trust_win.cc @@ -12,131 +12,125 @@ namespace certificate_trust { -BOOL AddCertificateAndRefresh( - const HCERTSTORE certStore, - const PCCERT_CONTEXT certContext, - const scoped_refptr& cert) { - auto result = CertAddCertificateContextToStore( - certStore, - certContext, - CERT_STORE_ADD_REPLACE_EXISTING, - NULL); - - if (result) { - auto cert_db = net::CertDatabase::GetInstance(); - // Force Chromium to reload the certificate since it might be trusted - // now. - cert_db->NotifyObserversCertDBChanged(cert.get()); - } - - return result; +BOOL AddCertificate(const HCERTSTORE certStore, + const PCCERT_CONTEXT certContext, + const scoped_refptr& cert) { + auto result = CertAddCertificateContextToStore( + certStore, + certContext, + CERT_STORE_ADD_REPLACE_EXISTING, + NULL); + + if (result) { + // force Chromium to reload it's database for this certificate + auto cert_db = net::CertDatabase::GetInstance(); + cert_db->NotifyObserversCertDBChanged(cert.get()); + } + + return result; } - -// Add the provided certificate to the Trusted Root -// Certificate Authorities store for the current user. +// Add the provided certificate to the Trusted Root Certificate Authorities +// store for the current user. // -// This requires prompting the user to confirm they -// trust the certificate. +// This requires prompting the user to confirm they trust the certificate. BOOL AddToTrustedRootStore(const PCCERT_CONTEXT certContext, const scoped_refptr& cert) { - auto rootCertStore = CertOpenStore( - CERT_STORE_PROV_SYSTEM, - 0, - NULL, - CERT_SYSTEM_STORE_CURRENT_USER, - L"Root"); - - if (rootCertStore == NULL) { - // could not resolve the certificate store, giving up - return false; - } + auto rootCertStore = CertOpenStore( + CERT_STORE_PROV_SYSTEM, + 0, + NULL, + CERT_SYSTEM_STORE_CURRENT_USER, + L"Root"); - auto result = AddCertificateAndRefresh(rootCertStore, certContext, cert); + if (rootCertStore == NULL) { + return false; + } - CertCloseStore(rootCertStore, CERT_CLOSE_STORE_FORCE_FLAG); + auto result = AddCertificate(rootCertStore, certContext, cert); - return result; + CertCloseStore(rootCertStore, CERT_CLOSE_STORE_FORCE_FLAG); + + return result; } // Add the provided certificate to the Personal // certificate store for the current user. BOOL AddToPersonalStore(const PCCERT_CONTEXT certContext, const scoped_refptr& cert) { - auto userCertStore = CertOpenStore( - CERT_STORE_PROV_SYSTEM, - 0, - NULL, - CERT_SYSTEM_STORE_CURRENT_USER, - L"My"); - - if (userCertStore == NULL) { - // could not resolve the certificate store, giving up - return false; - } + auto userCertStore = CertOpenStore( + CERT_STORE_PROV_SYSTEM, + 0, + NULL, + CERT_SYSTEM_STORE_CURRENT_USER, + L"My"); - auto result = AddCertificateAndRefresh(userCertStore, certContext, cert); + if (userCertStore == NULL) { + return false; + } - CertCloseStore(userCertStore, CERT_CLOSE_STORE_FORCE_FLAG); + auto result = AddCertificate(userCertStore, certContext, cert); - return result; + CertCloseStore(userCertStore, CERT_CLOSE_STORE_FORCE_FLAG); + + return result; } CERT_CHAIN_PARA GetCertificateChainParameters() { - CERT_ENHKEY_USAGE enhkeyUsage; - enhkeyUsage.cUsageIdentifier = 0; - enhkeyUsage.rgpszUsageIdentifier = NULL; + CERT_ENHKEY_USAGE enhkeyUsage; + enhkeyUsage.cUsageIdentifier = 0; + enhkeyUsage.rgpszUsageIdentifier = NULL; - CERT_USAGE_MATCH CertUsage; - // ensure the rules are applied to the entire chain - CertUsage.dwType = USAGE_MATCH_TYPE_AND; - CertUsage.Usage = enhkeyUsage; + CERT_USAGE_MATCH CertUsage; + // ensure the rules are applied to the entire chain + CertUsage.dwType = USAGE_MATCH_TYPE_AND; + CertUsage.Usage = enhkeyUsage; - CERT_CHAIN_PARA params = { sizeof(CERT_CHAIN_PARA) }; - params.RequestedUsage = CertUsage; + CERT_CHAIN_PARA params = { sizeof(CERT_CHAIN_PARA) }; + params.RequestedUsage = CertUsage; - return params; + return params; } void ShowCertificateTrust(atom::NativeWindow* parent_window, const scoped_refptr& cert, const std::string& message, const ShowTrustCallback& callback) { - PCCERT_CHAIN_CONTEXT chainContext; - - auto pCertContext = cert->CreateOSCertChainForCert(); - - auto params = GetCertificateChainParameters(); - - if (CertGetCertificateChain(NULL, - pCertContext, - NULL, - NULL, - ¶ms, - NULL, - NULL, - &chainContext)) { - switch (chainContext->TrustStatus.dwErrorStatus) { - case CERT_TRUST_NO_ERROR: - AddToPersonalStore(pCertContext, cert); - break; - - case CERT_TRUST_IS_UNTRUSTED_ROOT: - case CERT_TRUST_IS_SELF_SIGNED: - AddToTrustedRootStore(pCertContext, cert); - break; - - default: - // we can't handle other scenarios, giving up - break; - } - - CertFreeCertificateChain(chainContext); + PCCERT_CHAIN_CONTEXT chainContext; + + auto pCertContext = cert->CreateOSCertChainForCert(); + + auto params = GetCertificateChainParameters(); + + if (CertGetCertificateChain(NULL, + pCertContext, + NULL, + NULL, + ¶ms, + NULL, + NULL, + &chainContext)) { + switch (chainContext->TrustStatus.dwErrorStatus) { + case CERT_TRUST_NO_ERROR: + AddToPersonalStore(pCertContext, cert); + break; + + case CERT_TRUST_IS_UNTRUSTED_ROOT: + case CERT_TRUST_IS_SELF_SIGNED: + AddToTrustedRootStore(pCertContext, cert); + break; + + default: + // we can't handle other scenarios, giving up + break; } - CertFreeCertificateContext(pCertContext); + CertFreeCertificateChain(chainContext); + } + + CertFreeCertificateContext(pCertContext); - callback.Run(); + callback.Run(); } } // namespace certificate_trust -- 2.7.4