curl_gssapi: Add macros for common mechs and pass them appropriately

Macros defined: KRB5_MECHANISM and SPNEGO_MECHANISM called from
HTTP, FTP and SOCKS on Unix
This commit is contained in:
Michael Osipov
2014-07-21 09:53:43 +02:00
committed by Daniel Stenberg
parent a4cece3d47
commit eda12bcff8
5 changed files with 25 additions and 19 deletions

View File

@@ -27,22 +27,21 @@
#include "curl_gssapi.h"
#include "sendf.h"
static const char spnego_OID[] = "\x2b\x06\x01\x05\x05\x02";
static const gss_OID_desc gss_mech_spnego = {
6,
&spnego_OID
};
static const char spengo_oid_bytes[] = "\x2b\x06\x01\x05\x05\x02";
gss_OID_desc spnego_mech_oid = { 6, &spengo_oid_bytes };
static const char krb5_oid_bytes[] = "\x2a\x86\x48\x86\xf7\x12\x01\x02\x02";
gss_OID_desc krb5_mech_oid = { 9, &krb5_oid_bytes };
OM_uint32 Curl_gss_init_sec_context(
struct SessionHandle *data,
OM_uint32 * minor_status,
gss_ctx_id_t * context,
OM_uint32 *minor_status,
gss_ctx_id_t *context,
gss_name_t target_name,
bool use_spnego,
gss_OID mech_type,
gss_channel_bindings_t input_chan_bindings,
gss_buffer_t input_token,
gss_buffer_t output_token,
OM_uint32 * ret_flags)
OM_uint32 *ret_flags)
{
OM_uint32 req_flags = GSS_C_MUTUAL_FLAG | GSS_C_REPLAY_FLAG;
@@ -62,8 +61,7 @@ OM_uint32 Curl_gss_init_sec_context(
GSS_C_NO_CREDENTIAL, /* cred_handle */
context,
target_name,
use_spnego ? (gss_OID)&gss_mech_spnego :
GSS_C_NO_OID,
mech_type,
req_flags,
0, /* time_req */
input_chan_bindings,