diff options
Diffstat (limited to 'src/WinTLSContext.cc')
| -rw-r--r-- | src/WinTLSContext.cc | 46 |
1 files changed, 18 insertions, 28 deletions
diff --git a/src/WinTLSContext.cc b/src/WinTLSContext.cc index add0d1e4..56d25002 100644 --- a/src/WinTLSContext.cc +++ b/src/WinTLSContext.cc @@ -67,7 +67,7 @@ namespace aria2 { WinTLSContext::WinTLSContext(TLSSessionSide side, TLSVersion ver) - : side_(side), store_(0) + : side_(side), store_(0) { memset(&credentials_, 0, sizeof(credentials_)); credentials_.dwVersion = SCHANNEL_CRED_VERSION; @@ -76,16 +76,16 @@ WinTLSContext::WinTLSContext(TLSSessionSide side, TLSVersion ver) switch (ver) { case TLS_PROTO_SSL3: credentials_.grbitEnabledProtocols |= SP_PROT_SSL3_CLIENT; - // fall through + // fall through case TLS_PROTO_TLS10: credentials_.grbitEnabledProtocols |= SP_PROT_TLS1_CLIENT; - // fall through + // fall through case TLS_PROTO_TLS11: credentials_.grbitEnabledProtocols |= SP_PROT_TLS1_1_CLIENT; - // fall through + // fall through case TLS_PROTO_TLS12: credentials_.grbitEnabledProtocols |= SP_PROT_TLS1_2_CLIENT; - // fall through + // fall through default: break; } @@ -94,16 +94,16 @@ WinTLSContext::WinTLSContext(TLSSessionSide side, TLSVersion ver) switch (ver) { case TLS_PROTO_SSL3: credentials_.grbitEnabledProtocols |= SP_PROT_SSL3_SERVER; - // fall through + // fall through case TLS_PROTO_TLS10: credentials_.grbitEnabledProtocols |= SP_PROT_TLS1_SERVER; - // fall through + // fall through case TLS_PROTO_TLS11: credentials_.grbitEnabledProtocols |= SP_PROT_TLS1_1_SERVER; - // fall through + // fall through case TLS_PROTO_TLS12: credentials_.grbitEnabledProtocols |= SP_PROT_TLS1_2_SERVER; - // fall through + // fall through default: break; } @@ -159,10 +159,9 @@ void WinTLSContext::setVerifyPeer(bool verify) if (side_ != TLS_CLIENT || !verify) { // No verification for servers and if user explicitly requested it - credentials_.dwFlags |= SCH_CRED_MANUAL_CRED_VALIDATION | - SCH_CRED_IGNORE_NO_REVOCATION_CHECK | - SCH_CRED_IGNORE_REVOCATION_OFFLINE | - SCH_CRED_NO_SERVERNAME_CHECK; + credentials_.dwFlags |= + SCH_CRED_MANUAL_CRED_VALIDATION | SCH_CRED_IGNORE_NO_REVOCATION_CHECK | + SCH_CRED_IGNORE_REVOCATION_OFFLINE | SCH_CRED_NO_SERVERNAME_CHECK; return; } @@ -195,15 +194,9 @@ CredHandle* WinTLSContext::getCredHandle() credentials_.paCred = nullptr; } SECURITY_STATUS status = ::AcquireCredentialsHandleW( - nullptr, - (SEC_WCHAR*)UNISP_NAME_W, - side_ == TLS_CLIENT ? SECPKG_CRED_OUTBOUND : SECPKG_CRED_INBOUND, - nullptr, - &credentials_, - nullptr, - nullptr, - cred_.get(), - &ts); + nullptr, (SEC_WCHAR*)UNISP_NAME_W, + side_ == TLS_CLIENT ? SECPKG_CRED_OUTBOUND : SECPKG_CRED_INBOUND, nullptr, + &credentials_, nullptr, nullptr, cred_.get(), &ts); if (ctx) { ::CertFreeCertificateContext(ctx); } @@ -220,10 +213,7 @@ bool WinTLSContext::addCredentialFile(const std::string& certfile, std::stringstream ss; BufferedFile(certfile.c_str(), "rb").transfer(ss); auto data = ss.str(); - CRYPT_DATA_BLOB blob = { - (DWORD)data.length(), - (BYTE*)data.c_str() - }; + CRYPT_DATA_BLOB blob = {(DWORD)data.length(), (BYTE*)data.c_str()}; if (!::PFXIsPFXBlob(&blob)) { A2_LOG_ERROR("Not a valid PKCS12 file"); return false; @@ -231,8 +221,8 @@ bool WinTLSContext::addCredentialFile(const std::string& certfile, HCERTSTORE store = ::PFXImportCertStore(&blob, L"", CRYPT_EXPORTABLE | CRYPT_USER_KEYSET); if (!store_) { - store = ::PFXImportCertStore( - &blob, nullptr, CRYPT_EXPORTABLE | CRYPT_USER_KEYSET); + store = ::PFXImportCertStore(&blob, nullptr, + CRYPT_EXPORTABLE | CRYPT_USER_KEYSET); } if (!store) { A2_LOG_ERROR("Failed to import PKCS12 store"); |