mirror of
https://github.com/moparisthebest/curl
synced 2024-12-21 23:58:49 -05:00
Use SPNEGO for HTTP Negotiate
This is the correct way to do SPNEGO. Just ask for it Now I correctly see it trying NTLMSSP authentication when a Kerberos ticket isn't available. Of course, we bail out when the server responds with the challenge packet, since we don't expect that. But I'll fix that bug next...
This commit is contained in:
parent
9ad282b1ae
commit
59431c242b
@ -27,11 +27,18 @@
|
||||
#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
|
||||
};
|
||||
|
||||
OM_uint32 Curl_gss_init_sec_context(
|
||||
struct SessionHandle *data,
|
||||
OM_uint32 * minor_status,
|
||||
gss_ctx_id_t * context,
|
||||
gss_name_t target_name,
|
||||
bool use_spnego,
|
||||
gss_channel_bindings_t input_chan_bindings,
|
||||
gss_buffer_t input_token,
|
||||
gss_buffer_t output_token,
|
||||
@ -55,7 +62,7 @@ OM_uint32 Curl_gss_init_sec_context(
|
||||
GSS_C_NO_CREDENTIAL, /* cred_handle */
|
||||
context,
|
||||
target_name,
|
||||
GSS_C_NO_OID, /* mech_type */
|
||||
use_spnego ? (gss_OID)&gss_mech_spnego : GSS_C_NO_OID,
|
||||
req_flags,
|
||||
0, /* time_req */
|
||||
input_chan_bindings,
|
||||
|
@ -47,6 +47,7 @@ OM_uint32 Curl_gss_init_sec_context(
|
||||
OM_uint32 * minor_status,
|
||||
gss_ctx_id_t * context,
|
||||
gss_name_t target_name,
|
||||
bool use_spnego,
|
||||
gss_channel_bindings_t input_chan_bindings,
|
||||
gss_buffer_t input_token,
|
||||
gss_buffer_t output_token,
|
||||
|
@ -184,6 +184,7 @@ int Curl_input_negotiate(struct connectdata *conn, bool proxy,
|
||||
&minor_status,
|
||||
&neg_ctx->context,
|
||||
neg_ctx->server_name,
|
||||
TRUE,
|
||||
GSS_C_NO_CHANNEL_BINDINGS,
|
||||
&input_token,
|
||||
&output_token,
|
||||
|
@ -236,6 +236,7 @@ krb5_auth(void *app_data, struct connectdata *conn)
|
||||
&min,
|
||||
context,
|
||||
gssname,
|
||||
FALSE,
|
||||
&chan,
|
||||
gssresp,
|
||||
&output_buffer,
|
||||
|
@ -181,6 +181,7 @@ CURLcode Curl_SOCKS5_gssapi_negotiate(int sockindex,
|
||||
&gss_minor_status,
|
||||
&gss_context,
|
||||
server,
|
||||
FALSE,
|
||||
NULL,
|
||||
gss_token,
|
||||
&gss_send_token,
|
||||
|
Loading…
Reference in New Issue
Block a user