| Index: net/http/http_auth_gssapi_posix.h
|
| diff --git a/net/http/http_auth_gssapi_posix.h b/net/http/http_auth_gssapi_posix.h
|
| index ddaf518736b7e6c53b1f5ec42a6888f04c2dea50..a0683addce70a174abc4c44a10f92018e4138370 100644
|
| --- a/net/http/http_auth_gssapi_posix.h
|
| +++ b/net/http/http_auth_gssapi_posix.h
|
| @@ -41,29 +41,24 @@ class NET_EXPORT_PRIVATE GSSAPILibrary {
|
| virtual bool Init() = 0;
|
|
|
| // These methods match the ones in the GSSAPI library.
|
| - virtual OM_uint32 import_name(
|
| - OM_uint32* minor_status,
|
| - const gss_buffer_t input_name_buffer,
|
| - const gss_OID input_name_type,
|
| - gss_name_t* output_name) = 0;
|
| - virtual OM_uint32 release_name(
|
| - OM_uint32* minor_status,
|
| - gss_name_t* input_name) = 0;
|
| - virtual OM_uint32 release_buffer(
|
| - OM_uint32* minor_status,
|
| - gss_buffer_t buffer) = 0;
|
| - virtual OM_uint32 display_name(
|
| - OM_uint32* minor_status,
|
| - const gss_name_t input_name,
|
| - gss_buffer_t output_name_buffer,
|
| - gss_OID* output_name_type) = 0;
|
| - virtual OM_uint32 display_status(
|
| - OM_uint32* minor_status,
|
| - OM_uint32 status_value,
|
| - int status_type,
|
| - const gss_OID mech_type,
|
| - OM_uint32* message_contex,
|
| - gss_buffer_t status_string) = 0;
|
| + virtual OM_uint32 import_name(OM_uint32* minor_status,
|
| + const gss_buffer_t input_name_buffer,
|
| + const gss_OID input_name_type,
|
| + gss_name_t* output_name) = 0;
|
| + virtual OM_uint32 release_name(OM_uint32* minor_status,
|
| + gss_name_t* input_name) = 0;
|
| + virtual OM_uint32 release_buffer(OM_uint32* minor_status,
|
| + gss_buffer_t buffer) = 0;
|
| + virtual OM_uint32 display_name(OM_uint32* minor_status,
|
| + const gss_name_t input_name,
|
| + gss_buffer_t output_name_buffer,
|
| + gss_OID* output_name_type) = 0;
|
| + virtual OM_uint32 display_status(OM_uint32* minor_status,
|
| + OM_uint32 status_value,
|
| + int status_type,
|
| + const gss_OID mech_type,
|
| + OM_uint32* message_contex,
|
| + gss_buffer_t status_string) = 0;
|
| virtual OM_uint32 init_sec_context(
|
| OM_uint32* minor_status,
|
| const gss_cred_id_t initiator_cred_handle,
|
| @@ -78,28 +73,24 @@ class NET_EXPORT_PRIVATE GSSAPILibrary {
|
| gss_buffer_t output_token,
|
| OM_uint32* ret_flags,
|
| OM_uint32* time_rec) = 0;
|
| - virtual OM_uint32 wrap_size_limit(
|
| - OM_uint32* minor_status,
|
| - const gss_ctx_id_t context_handle,
|
| - int conf_req_flag,
|
| - gss_qop_t qop_req,
|
| - OM_uint32 req_output_size,
|
| - OM_uint32* max_input_size) = 0;
|
| - virtual OM_uint32 delete_sec_context(
|
| - OM_uint32* minor_status,
|
| - gss_ctx_id_t* context_handle,
|
| - gss_buffer_t output_token) = 0;
|
| - virtual OM_uint32 inquire_context(
|
| - OM_uint32* minor_status,
|
| - const gss_ctx_id_t context_handle,
|
| - gss_name_t* src_name,
|
| - gss_name_t* targ_name,
|
| - OM_uint32* lifetime_rec,
|
| - gss_OID* mech_type,
|
| - OM_uint32* ctx_flags,
|
| - int* locally_initiated,
|
| - int* open) = 0;
|
| -
|
| + virtual OM_uint32 wrap_size_limit(OM_uint32* minor_status,
|
| + const gss_ctx_id_t context_handle,
|
| + int conf_req_flag,
|
| + gss_qop_t qop_req,
|
| + OM_uint32 req_output_size,
|
| + OM_uint32* max_input_size) = 0;
|
| + virtual OM_uint32 delete_sec_context(OM_uint32* minor_status,
|
| + gss_ctx_id_t* context_handle,
|
| + gss_buffer_t output_token) = 0;
|
| + virtual OM_uint32 inquire_context(OM_uint32* minor_status,
|
| + const gss_ctx_id_t context_handle,
|
| + gss_name_t* src_name,
|
| + gss_name_t* targ_name,
|
| + OM_uint32* lifetime_rec,
|
| + gss_OID* mech_type,
|
| + OM_uint32* ctx_flags,
|
| + int* locally_initiated,
|
| + int* open) = 0;
|
| };
|
|
|
| // GSSAPISharedLibrary class is defined here so that unit tests can access it.
|
| @@ -112,29 +103,24 @@ class NET_EXPORT_PRIVATE GSSAPISharedLibrary : public GSSAPILibrary {
|
|
|
| // GSSAPILibrary methods:
|
| virtual bool Init() OVERRIDE;
|
| - virtual OM_uint32 import_name(
|
| - OM_uint32* minor_status,
|
| - const gss_buffer_t input_name_buffer,
|
| - const gss_OID input_name_type,
|
| - gss_name_t* output_name) OVERRIDE;
|
| - virtual OM_uint32 release_name(
|
| - OM_uint32* minor_status,
|
| - gss_name_t* input_name) OVERRIDE;
|
| - virtual OM_uint32 release_buffer(
|
| - OM_uint32* minor_status,
|
| - gss_buffer_t buffer) OVERRIDE;
|
| - virtual OM_uint32 display_name(
|
| - OM_uint32* minor_status,
|
| - const gss_name_t input_name,
|
| - gss_buffer_t output_name_buffer,
|
| - gss_OID* output_name_type) OVERRIDE;
|
| - virtual OM_uint32 display_status(
|
| - OM_uint32* minor_status,
|
| - OM_uint32 status_value,
|
| - int status_type,
|
| - const gss_OID mech_type,
|
| - OM_uint32* message_contex,
|
| - gss_buffer_t status_string) OVERRIDE;
|
| + virtual OM_uint32 import_name(OM_uint32* minor_status,
|
| + const gss_buffer_t input_name_buffer,
|
| + const gss_OID input_name_type,
|
| + gss_name_t* output_name) OVERRIDE;
|
| + virtual OM_uint32 release_name(OM_uint32* minor_status,
|
| + gss_name_t* input_name) OVERRIDE;
|
| + virtual OM_uint32 release_buffer(OM_uint32* minor_status,
|
| + gss_buffer_t buffer) OVERRIDE;
|
| + virtual OM_uint32 display_name(OM_uint32* minor_status,
|
| + const gss_name_t input_name,
|
| + gss_buffer_t output_name_buffer,
|
| + gss_OID* output_name_type) OVERRIDE;
|
| + virtual OM_uint32 display_status(OM_uint32* minor_status,
|
| + OM_uint32 status_value,
|
| + int status_type,
|
| + const gss_OID mech_type,
|
| + OM_uint32* message_contex,
|
| + gss_buffer_t status_string) OVERRIDE;
|
| virtual OM_uint32 init_sec_context(
|
| OM_uint32* minor_status,
|
| const gss_cred_id_t initiator_cred_handle,
|
| @@ -149,27 +135,24 @@ class NET_EXPORT_PRIVATE GSSAPISharedLibrary : public GSSAPILibrary {
|
| gss_buffer_t output_token,
|
| OM_uint32* ret_flags,
|
| OM_uint32* time_rec) OVERRIDE;
|
| - virtual OM_uint32 wrap_size_limit(
|
| - OM_uint32* minor_status,
|
| - const gss_ctx_id_t context_handle,
|
| - int conf_req_flag,
|
| - gss_qop_t qop_req,
|
| - OM_uint32 req_output_size,
|
| - OM_uint32* max_input_size) OVERRIDE;
|
| - virtual OM_uint32 delete_sec_context(
|
| - OM_uint32* minor_status,
|
| - gss_ctx_id_t* context_handle,
|
| - gss_buffer_t output_token) OVERRIDE;
|
| - virtual OM_uint32 inquire_context(
|
| - OM_uint32* minor_status,
|
| - const gss_ctx_id_t context_handle,
|
| - gss_name_t* src_name,
|
| - gss_name_t* targ_name,
|
| - OM_uint32* lifetime_rec,
|
| - gss_OID* mech_type,
|
| - OM_uint32* ctx_flags,
|
| - int* locally_initiated,
|
| - int* open) OVERRIDE;
|
| + virtual OM_uint32 wrap_size_limit(OM_uint32* minor_status,
|
| + const gss_ctx_id_t context_handle,
|
| + int conf_req_flag,
|
| + gss_qop_t qop_req,
|
| + OM_uint32 req_output_size,
|
| + OM_uint32* max_input_size) OVERRIDE;
|
| + virtual OM_uint32 delete_sec_context(OM_uint32* minor_status,
|
| + gss_ctx_id_t* context_handle,
|
| + gss_buffer_t output_token) OVERRIDE;
|
| + virtual OM_uint32 inquire_context(OM_uint32* minor_status,
|
| + const gss_ctx_id_t context_handle,
|
| + gss_name_t* src_name,
|
| + gss_name_t* targ_name,
|
| + OM_uint32* lifetime_rec,
|
| + gss_OID* mech_type,
|
| + OM_uint32* ctx_flags,
|
| + int* locally_initiated,
|
| + int* open) OVERRIDE;
|
|
|
| private:
|
| typedef typeof(&gss_import_name) gss_import_name_type;
|
| @@ -226,7 +209,6 @@ class ScopedSecurityContext {
|
| DISALLOW_COPY_AND_ASSIGN(ScopedSecurityContext);
|
| };
|
|
|
| -
|
| // TODO(ahendrickson): Share code with HttpAuthSSPI.
|
| class NET_EXPORT_PRIVATE HttpAuthGSSAPI {
|
| public:
|
| @@ -241,8 +223,7 @@ class NET_EXPORT_PRIVATE HttpAuthGSSAPI {
|
|
|
| bool AllowsExplicitCredentials() const;
|
|
|
| - HttpAuth::AuthorizationResult ParseChallenge(
|
| - HttpAuthChallengeTokenizer* tok);
|
| + HttpAuth::AuthorizationResult ParseChallenge(HttpAuthChallengeTokenizer* tok);
|
|
|
| // Generates an authentication token.
|
| // The return value is an error code. If it's not |OK|, the value of
|
|
|