| Index: net/http/http_auth_gssapi_posix.cc
|
| diff --git a/net/http/http_auth_gssapi_posix.cc b/net/http/http_auth_gssapi_posix.cc
|
| index 388cc640a42cc097657eaf4915fd32aadbd2b89a..6f98abd7e6bf280a6cb32c9b637fa73570c6479e 100644
|
| --- a/net/http/http_auth_gssapi_posix.cc
|
| +++ b/net/http/http_auth_gssapi_posix.cc
|
| @@ -685,41 +685,10 @@ void HttpAuthGSSAPI::Delegate() {
|
| can_delegate_ = true;
|
| }
|
|
|
| -HttpAuth::AuthorizationResult HttpAuthGSSAPI::ParseChallenge(
|
| - HttpAuthChallengeTokenizer* tok) {
|
| - // Verify the challenge's auth-scheme.
|
| - if (!base::LowerCaseEqualsASCII(tok->scheme(),
|
| - base::StringToLowerASCII(scheme_).c_str()))
|
| - return HttpAuth::AUTHORIZATION_RESULT_INVALID;
|
| -
|
| - std::string encoded_auth_token = tok->base64_param();
|
| -
|
| - if (encoded_auth_token.empty()) {
|
| - // If a context has already been established, an empty Negotiate challenge
|
| - // should be treated as a rejection of the current attempt.
|
| - if (scoped_sec_context_.get() != GSS_C_NO_CONTEXT)
|
| - return HttpAuth::AUTHORIZATION_RESULT_REJECT;
|
| - DCHECK(decoded_server_auth_token_.empty());
|
| - return HttpAuth::AUTHORIZATION_RESULT_ACCEPT;
|
| - } else {
|
| - // If a context has not already been established, additional tokens should
|
| - // not be present in the auth challenge.
|
| - if (scoped_sec_context_.get() == GSS_C_NO_CONTEXT)
|
| - return HttpAuth::AUTHORIZATION_RESULT_INVALID;
|
| - }
|
| -
|
| - // Make sure the additional token is base64 encoded.
|
| - std::string decoded_auth_token;
|
| - bool base64_rv = base::Base64Decode(encoded_auth_token, &decoded_auth_token);
|
| - if (!base64_rv)
|
| - return HttpAuth::AUTHORIZATION_RESULT_INVALID;
|
| - decoded_server_auth_token_ = decoded_auth_token;
|
| - return HttpAuth::AUTHORIZATION_RESULT_ACCEPT;
|
| -}
|
| -
|
| int HttpAuthGSSAPI::GenerateAuthToken(const AuthCredentials* credentials,
|
| const std::string& spn,
|
| - std::string* auth_token) {
|
| + std::string* auth_token,
|
| + const CompletionCallback& /*callback*/) {
|
| DCHECK(auth_token);
|
|
|
| gss_buffer_desc input_token = GSS_C_EMPTY_BUFFER;
|
|
|