| Index: net/http/http_auth_sspi_win.h
|
| diff --git a/net/http/http_auth_sspi_win.h b/net/http/http_auth_sspi_win.h
|
| index dd0b1772b16f00c4fad6bff6e6c24c19cfa42aa8..13787d40f7a3359cae9ffc96ac16b2bafc301c7b 100644
|
| --- a/net/http/http_auth_sspi_win.h
|
| +++ b/net/http/http_auth_sspi_win.h
|
| @@ -58,7 +58,7 @@ class SSPILibrary {
|
| PTimeStamp ptsExpiry) = 0;
|
|
|
| virtual SECURITY_STATUS QuerySecurityPackageInfo(LPWSTR pszPackageName,
|
| - PSecPkgInfoW *pkgInfo) = 0;
|
| + PSecPkgInfoW* pkgInfo) = 0;
|
|
|
| virtual SECURITY_STATUS FreeCredentialsHandle(PCredHandle phCredential) = 0;
|
|
|
| @@ -81,9 +81,14 @@ class SSPILibraryDefault : public SSPILibrary {
|
| void* pvGetKeyArgument,
|
| PCredHandle phCredential,
|
| PTimeStamp ptsExpiry) {
|
| - return ::AcquireCredentialsHandle(pszPrincipal, pszPackage, fCredentialUse,
|
| - pvLogonId, pvAuthData, pGetKeyFn,
|
| - pvGetKeyArgument, phCredential,
|
| + return ::AcquireCredentialsHandle(pszPrincipal,
|
| + pszPackage,
|
| + fCredentialUse,
|
| + pvLogonId,
|
| + pvAuthData,
|
| + pGetKeyFn,
|
| + pvGetKeyArgument,
|
| + phCredential,
|
| ptsExpiry);
|
| }
|
|
|
| @@ -99,14 +104,22 @@ class SSPILibraryDefault : public SSPILibrary {
|
| PSecBufferDesc pOutput,
|
| unsigned long* contextAttr,
|
| PTimeStamp ptsExpiry) {
|
| - return ::InitializeSecurityContext(phCredential, phContext, pszTargetName,
|
| - fContextReq, Reserved1, TargetDataRep,
|
| - pInput, Reserved2, phNewContext, pOutput,
|
| - contextAttr, ptsExpiry);
|
| + return ::InitializeSecurityContext(phCredential,
|
| + phContext,
|
| + pszTargetName,
|
| + fContextReq,
|
| + Reserved1,
|
| + TargetDataRep,
|
| + pInput,
|
| + Reserved2,
|
| + phNewContext,
|
| + pOutput,
|
| + contextAttr,
|
| + ptsExpiry);
|
| }
|
|
|
| virtual SECURITY_STATUS QuerySecurityPackageInfo(LPWSTR pszPackageName,
|
| - PSecPkgInfoW *pkgInfo) {
|
| + PSecPkgInfoW* pkgInfo) {
|
| return ::QuerySecurityPackageInfo(pszPackageName, pkgInfo);
|
| }
|
|
|
| @@ -135,8 +148,7 @@ class NET_EXPORT_PRIVATE HttpAuthSSPI {
|
|
|
| bool AllowsExplicitCredentials() const;
|
|
|
| - HttpAuth::AuthorizationResult ParseChallenge(
|
| - HttpAuthChallengeTokenizer* tok);
|
| + HttpAuth::AuthorizationResult ParseChallenge(HttpAuthChallengeTokenizer* tok);
|
|
|
| // Generates an authentication token for the service specified by the
|
| // Service Principal Name |spn| and stores the value in |*auth_token|.
|
| @@ -157,12 +169,11 @@ class NET_EXPORT_PRIVATE HttpAuthSSPI {
|
| private:
|
| int OnFirstRound(const AuthCredentials* credentials);
|
|
|
| - int GetNextSecurityToken(
|
| - const std::string& spn,
|
| - const void* in_token,
|
| - int in_token_len,
|
| - void** out_token,
|
| - int* out_token_len);
|
| + int GetNextSecurityToken(const std::string& spn,
|
| + const void* in_token,
|
| + int in_token_len,
|
| + void** out_token,
|
| + int* out_token_len);
|
|
|
| void ResetSecurityContext();
|
|
|
|
|