← Commit list

4aed2dcc89

Viktor Szakats
Viktor Szakats
2025-12-01
SUCCESS Duration: 191s

Subject

krb5: fix detecting channel binding feature

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

lib/curl_gssapi.h +0 -5lib/http_negotiate.c +3 -3lib/urldata.h +5 -6lib/vauth/cleartext.c +0 -1lib/vauth/cram.c +0 -1lib/vauth/digest.c +0 -1lib/vauth/digest_sspi.c +0 -1lib/vauth/gsasl.c +0 -1lib/vauth/krb5_gssapi.c +0 -1lib/vauth/krb5_sspi.c +0 -1lib/vauth/ntlm.c +1 -3lib/vauth/ntlm_sspi.c +0 -1lib/vauth/oauth2.c +0 -1lib/vauth/spnego_gssapi.c +2 -3lib/vauth/spnego_sspi.c +0 -1lib/vauth/vauth.c +0 -1lib/vauth/vauth.h +2 -13lib/version.c +0 -12
lib/curl_gssapi.h+0 -5
@@ -28,11 +28,6 @@
#include "urldata.h"
#ifdef HAVE_GSSAPI
-
-#ifdef GSS_C_CHANNEL_BOUND_FLAG /* MIT Kerberos 1.19+, missing from GNU GSS */
-#define CURL_GSSAPI_HAS_CHANNEL_BINDING
-#endif
-
extern gss_OID_desc Curl_spnego_mech_oid;
extern gss_OID_desc Curl_krb5_mech_oid;
lib/http_negotiate.c+3 -3
@@ -120,7 +120,7 @@ CURLcode Curl_input_negotiate(struct Curl_easy *data, struct connectdata *conn,
neg_ctx->sslContext = conn->sslContext;
#endif
/* Check if the connection is using SSL and get the channel binding data */
-#ifdef CURL_GSSAPI_HAS_CHANNEL_BINDING
+#ifdef GSS_C_CHANNEL_BOUND_FLAG
#ifdef USE_SSL
curlx_dyn_init(&neg_ctx->channel_binding_data, SSL_CB_MAX_SIZE + 1);
if(Curl_conn_is_ssl(conn, FIRSTSOCKET)) {
@@ -134,13 +134,13 @@ CURLcode Curl_input_negotiate(struct Curl_easy *data, struct connectdata *conn,
#else
curlx_dyn_init(&neg_ctx->channel_binding_data, 1);
#endif /* USE_SSL */
-#endif /* CURL_GSSAPI_HAS_CHANNEL_BINDING */
+#endif /* GSS_C_CHANNEL_BOUND_FLAG */
/* Initialize the security context and decode our challenge */
result = Curl_auth_decode_spnego_message(data, userp, passwdp, service,
host, header, neg_ctx);
-#ifdef CURL_GSSAPI_HAS_CHANNEL_BINDING
+#ifdef GSS_C_CHANNEL_BOUND_FLAG
curlx_dyn_free(&neg_ctx->channel_binding_data);
#endif
lib/urldata.h+5 -6
@@ -191,12 +191,11 @@ typedef CURLcode (Curl_recv)(struct Curl_easy *data, /* transfer */
#ifdef HAVE_GSSAPI
# ifdef HAVE_GSSGNU
# include <gss.h>
-# else
-# ifdef HAVE_GSSAPI_H
-# include <gssapi.h>
-# else
-# include <gssapi/gssapi.h>
-# endif
+# elif defined(HAVE_GSSAPI_H)
+# include <gssapi.h>
+# else /* MIT Kerberos */
+# include <gssapi/gssapi.h>
+# include <gssapi/gssapi_krb5.h> /* for GSS_C_CHANNEL_BOUND_FLAG, in 1.19+ */
# endif
#endif
lib/vauth/cleartext.c+0 -1
@@ -32,7 +32,6 @@
(!defined(CURL_DISABLE_LDAP) && defined(USE_OPENLDAP))
#include <curl/curl.h>
-#include "../urldata.h"
#include "vauth.h"
#include "../curlx/warnless.h"
lib/vauth/cram.c+0 -1
@@ -29,7 +29,6 @@
#ifndef CURL_DISABLE_DIGEST_AUTH
#include <curl/curl.h>
-#include "../urldata.h"
#include "vauth.h"
#include "../curl_hmac.h"
lib/vauth/digest.c+0 -1
@@ -33,7 +33,6 @@
#include "vauth.h"
#include "digest.h"
-#include "../urldata.h"
#include "../curlx/base64.h"
#include "../curl_hmac.h"
#include "../curl_md5.h"
lib/vauth/digest_sspi.c+0 -1
@@ -33,7 +33,6 @@
#include "vauth.h"
#include "digest.h"
-#include "../urldata.h"
#include "../curlx/warnless.h"
#include "../curlx/multibyte.h"
#include "../sendf.h"
lib/vauth/gsasl.c+0 -1
@@ -31,7 +31,6 @@
#include <curl/curl.h>
#include "vauth.h"
-#include "../urldata.h"
#include "../sendf.h"
#include <gsasl.h>
lib/vauth/krb5_gssapi.c+0 -1
@@ -33,7 +33,6 @@
#include "vauth.h"
#include "../curl_sasl.h"
-#include "../urldata.h"
#include "../curl_gssapi.h"
#include "../sendf.h"
lib/vauth/krb5_sspi.c+0 -1
@@ -31,7 +31,6 @@
#include <curl/curl.h>
#include "vauth.h"
-#include "../urldata.h"
#include "../curlx/warnless.h"
#include "../curlx/multibyte.h"
#include "../sendf.h"
lib/vauth/ntlm.c+1 -3
@@ -35,7 +35,7 @@
#define DEBUG_ME 0
-#include "../urldata.h"
+#include "vauth.h"
#include "../sendf.h"
#include "../curl_ntlm_core.h"
#include "../curl_gethostname.h"
@@ -44,8 +44,6 @@
#include "../rand.h"
#include "../vtls/vtls.h"
#include "../strdup.h"
-
-#include "vauth.h"
#include "../curl_endian.h"
/* NTLM buffer fixed size, large enough for long user + host + domain */
lib/vauth/ntlm_sspi.c+0 -1
@@ -29,7 +29,6 @@
#include <curl/curl.h>
#include "vauth.h"
-#include "../urldata.h"
#include "../curl_ntlm_core.h"
#include "../curlx/warnless.h"
#include "../curlx/multibyte.h"
lib/vauth/oauth2.c+0 -1
@@ -31,7 +31,6 @@
(!defined(CURL_DISABLE_LDAP) && defined(USE_OPENLDAP))
#include <curl/curl.h>
-#include "../urldata.h"
#include "vauth.h"
#include "../curlx/warnless.h"
lib/vauth/spnego_gssapi.c+2 -3
@@ -31,7 +31,6 @@
#include <curl/curl.h>
#include "vauth.h"
-#include "../urldata.h"
#include "../curlx/base64.h"
#include "../curl_gssapi.h"
#include "../curlx/warnless.h"
@@ -92,7 +91,7 @@ CURLcode Curl_auth_decode_spnego_message(struct Curl_easy *data,
gss_buffer_desc input_token = GSS_C_EMPTY_BUFFER;
gss_buffer_desc output_token = GSS_C_EMPTY_BUFFER;
gss_channel_bindings_t chan_bindings = GSS_C_NO_CHANNEL_BINDINGS;
-#ifdef CURL_GSSAPI_HAS_CHANNEL_BINDING
+#ifdef GSS_C_CHANNEL_BOUND_FLAG
struct gss_channel_bindings_struct chan;
#endif
@@ -155,7 +154,7 @@ CURLcode Curl_auth_decode_spnego_message(struct Curl_easy *data,
}
/* Set channel binding data if available */
-#ifdef CURL_GSSAPI_HAS_CHANNEL_BINDING
+#ifdef GSS_C_CHANNEL_BOUND_FLAG
if(curlx_dyn_len(&nego->channel_binding_data)) {
memset(&chan, 0, sizeof(struct gss_channel_bindings_struct));
chan.application_data.length = curlx_dyn_len(&nego->channel_binding_data);
lib/vauth/spnego_sspi.c+0 -1
@@ -31,7 +31,6 @@
#include <curl/curl.h>
#include "vauth.h"
-#include "../urldata.h"
#include "../curlx/base64.h"
#include "../curlx/warnless.h"
#include "../curlx/multibyte.h"
lib/vauth/vauth.c+0 -1
@@ -28,7 +28,6 @@
#include "vauth.h"
#include "../strdup.h"
-#include "../urldata.h"
#include "../curlx/multibyte.h"
#include "../url.h"
lib/vauth/vauth.h+2 -13
@@ -28,6 +28,7 @@
#include "../bufref.h"
#include "../curlx/dynbuf.h"
+#include "../urldata.h"
struct Curl_easy;
struct connectdata;
@@ -233,18 +234,6 @@ CURLcode Curl_auth_create_xoauth_bearer_message(const char *user,
#ifdef USE_KERBEROS5
-#ifdef HAVE_GSSAPI
-# ifdef HAVE_GSSGNU
-# include <gss.h>
-# else
-# ifdef HAVE_GSSAPI_H
-# include <gssapi.h>
-# else
-# include <gssapi/gssapi.h>
-# endif
-# endif
-#endif
-
/* meta key for storing KRB5 meta at connection */
#define CURL_META_KRB5_CONN "meta:auth:krb5:conn"
@@ -310,7 +299,7 @@ struct negotiatedata {
gss_ctx_id_t context;
gss_name_t spn;
gss_buffer_desc output_token;
-#ifdef CURL_GSSAPI_HAS_CHANNEL_BINDING
+#ifdef GSS_C_CHANNEL_BOUND_FLAG
struct dynbuf channel_binding_data;
#endif
#else
lib/version.c+0 -12
@@ -77,18 +77,6 @@
#include <gsasl.h>
#endif
-#ifdef HAVE_GSSAPI
-# ifdef HAVE_GSSGNU
-# include <gss.h>
-# else
-# ifdef HAVE_GSSAPI_H
-# include <gssapi.h>
-# else
-# include <gssapi/gssapi.h>
-# endif
-# endif
-#endif
-
#ifdef USE_OPENLDAP
#include <ldap.h>
#endif