negotiate: conditional check around GSS & SSL specific code
Fixes #14938 Reported-by: lomberd2 on github Fixes #14952 Closes #14954
This commit is contained in:
parent
c0a9db8424
commit
1ec5336b66
@ -108,7 +108,7 @@ CURLcode Curl_input_negotiate(struct Curl_easy *data, struct connectdata *conn,
|
|||||||
neg_ctx->sslContext = conn->sslContext;
|
neg_ctx->sslContext = conn->sslContext;
|
||||||
#endif
|
#endif
|
||||||
/* Check if the connection is using SSL and get the channel binding data */
|
/* Check if the connection is using SSL and get the channel binding data */
|
||||||
#ifdef HAVE_GSSAPI
|
#if defined(USE_SSL) && defined(HAVE_GSSAPI)
|
||||||
if(conn->handler->flags & PROTOPT_SSL) {
|
if(conn->handler->flags & PROTOPT_SSL) {
|
||||||
Curl_dyn_init(&neg_ctx->channel_binding_data, SSL_CB_MAX_SIZE);
|
Curl_dyn_init(&neg_ctx->channel_binding_data, SSL_CB_MAX_SIZE);
|
||||||
result = Curl_ssl_get_channel_binding(
|
result = Curl_ssl_get_channel_binding(
|
||||||
@ -124,7 +124,7 @@ CURLcode Curl_input_negotiate(struct Curl_easy *data, struct connectdata *conn,
|
|||||||
result = Curl_auth_decode_spnego_message(data, userp, passwdp, service,
|
result = Curl_auth_decode_spnego_message(data, userp, passwdp, service,
|
||||||
host, header, neg_ctx);
|
host, header, neg_ctx);
|
||||||
|
|
||||||
#ifdef HAVE_GSSAPI
|
#if defined(USE_SSL) && defined(HAVE_GSSAPI)
|
||||||
Curl_dyn_free(&neg_ctx->channel_binding_data);
|
Curl_dyn_free(&neg_ctx->channel_binding_data);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user