Commit e38ba430 authored by Michael Osipov's avatar Michael Osipov Committed by Daniel Stenberg
Browse files

curl.h/features: Deprecate GSS-Negotiate macros due to bad naming 

- Replace CURLAUTH_GSSNEGOTIATE with CURLAUTH_NEGOTIATE
- CURL_VERSION_GSSNEGOTIATE is deprecated which
  is served by CURL_VERSION_SSPI, CURL_VERSION_GSSAPI and
  CURUL_VERSION_SPNEGO now.
- Remove display of feature 'GSS-Negotiate'
parent 46750c39

include/curl/curl.h

+7 −3
Original line number Diff line number Diff line
@@ -619,7 +619,8 @@ typedef enum { 
 * CURLAUTH_NONE         - No HTTP authentication

 * CURLAUTH_BASIC        - HTTP Basic authentication (default)

 * CURLAUTH_DIGEST       - HTTP Digest authentication

 * CURLAUTH_GSSNEGOTIATE - HTTP GSS-Negotiate authentication

 * CURLAUTH_NEGOTIATE    - HTTP Negotiate (SPNEGO) authentication

 * CURLAUTH_GSSNEGOTIATE - Alias for CURLAUTH_NEGOTIATE (deprecated)

 * CURLAUTH_NTLM         - HTTP NTLM authentication

 * CURLAUTH_DIGEST_IE    - HTTP Digest authentication with IE flavour

 * CURLAUTH_NTLM_WB      - HTTP NTLM authentication delegated to winbind helper
@@ -632,7 +633,9 @@ typedef enum { 
#define CURLAUTH_NONE         ((unsigned long)0)

#define CURLAUTH_BASIC        (((unsigned long)1)<<0)

#define CURLAUTH_DIGEST       (((unsigned long)1)<<1)

#define CURLAUTH_GSSNEGOTIATE (((unsigned long)1)<<2)

#define CURLAUTH_NEGOTIATE    (((unsigned long)1)<<2)

/* Deprecated since the advent of CURLAUTH_NEGOTIATE */

#define CURLAUTH_GSSNEGOTIATE CURLAUTH_NEGOTIATE

#define CURLAUTH_NTLM         (((unsigned long)1)<<3)

#define CURLAUTH_DIGEST_IE    (((unsigned long)1)<<4)

#define CURLAUTH_NTLM_WB      (((unsigned long)1)<<5)
@@ -2231,7 +2234,8 @@ typedef struct { 
#define CURL_VERSION_SSL       (1<<2)  /* SSL options are present */

#define CURL_VERSION_LIBZ      (1<<3)  /* libz features are present */

#define CURL_VERSION_NTLM      (1<<4)  /* NTLM auth is supported */

#define CURL_VERSION_GSSNEGOTIATE (1<<5) /* Negotiate auth support */

#define CURL_VERSION_GSSNEGOTIATE (1<<5) /* Negotiate auth support

                                            (deprecated) */

#define CURL_VERSION_DEBUG     (1<<6)  /* built with debug capabilities */

#define CURL_VERSION_ASYNCHDNS (1<<7)  /* asynchronous dns resolves */

#define CURL_VERSION_SPNEGO    (1<<8)  /* SPNEGO auth is supported */

lib/curl_setup.h

+1 −1
Original line number Diff line number Diff line
@@ -610,7 +610,7 @@ int netware_init(void); 


#if !defined(CURL_DISABLE_CRYPTO_AUTH) && \

    (defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI))

#define USE_HTTP_NEGOTIATE

#define USE_SPNEGO

#endif



/* Single point where USE_NTLM definition might be done */

lib/http.c

+11 −11
Original line number Diff line number Diff line
@@ -328,8 +328,8 @@ static bool pickoneauth(struct auth *pick) 


  /* The order of these checks is highly relevant, as this will be the order

     of preference in case of the existence of multiple accepted types. */

  if(avail & CURLAUTH_GSSNEGOTIATE)

    pick->picked = CURLAUTH_GSSNEGOTIATE;

  if(avail & CURLAUTH_NEGOTIATE)

    pick->picked = CURLAUTH_NEGOTIATE;

  else if(avail & CURLAUTH_DIGEST)

    pick->picked = CURLAUTH_DIGEST;

  else if(avail & CURLAUTH_NTLM)
@@ -557,7 +557,7 @@ output_auth_headers(struct connectdata *conn, 
  struct SessionHandle *data = conn->data;

  const char *auth=NULL;

  CURLcode result = CURLE_OK;

#ifdef USE_HTTP_NEGOTIATE

#ifdef USE_SPNEGO

  struct negotiatedata *negdata = proxy?

    &data->state.proxyneg:&data->state.negotiate;

#endif
@@ -567,9 +567,9 @@ output_auth_headers(struct connectdata *conn, 
  (void)path;

#endif



#ifdef USE_HTTP_NEGOTIATE

#ifdef USE_SPNEGO

  negdata->state = GSS_AUTHNONE;

  if((authstatus->picked == CURLAUTH_GSSNEGOTIATE) &&

  if((authstatus->picked == CURLAUTH_NEGOTIATE) &&

     negdata->context && !GSS_ERROR(negdata->status)) {

    auth="Negotiate";

    result = Curl_output_negotiate(conn, proxy);
@@ -737,7 +737,7 @@ CURLcode Curl_http_input_auth(struct connectdata *conn, bool proxy, 
   */

  struct SessionHandle *data = conn->data;



#ifdef USE_HTTP_NEGOTIATE

#ifdef USE_SPNEGO

  struct negotiatedata *negdata = proxy?

    &data->state.proxyneg:&data->state.negotiate;

#endif
@@ -771,13 +771,13 @@ CURLcode Curl_http_input_auth(struct connectdata *conn, bool proxy, 
   */



  while(*auth) {

#ifdef USE_HTTP_NEGOTIATE

#ifdef USE_SPNEGO

    if(checkprefix("Negotiate", auth)) {

      int neg;

      *availp |= CURLAUTH_GSSNEGOTIATE;

      authp->avail |= CURLAUTH_GSSNEGOTIATE;

      *availp |= CURLAUTH_NEGOTIATE;

      authp->avail |= CURLAUTH_NEGOTIATE;



      if(authp->picked == CURLAUTH_GSSNEGOTIATE) {

      if(authp->picked == CURLAUTH_NEGOTIATE) {

        if(negdata->state == GSS_AUTHSENT || negdata->state == GSS_AUTHNONE) {

          neg = Curl_input_negotiate(conn, proxy, auth);

          if(neg == 0) {
@@ -1440,7 +1440,7 @@ CURLcode Curl_http_done(struct connectdata *conn, 


  Curl_unencode_cleanup(conn);



#ifdef USE_HTTP_NEGOTIATE

#ifdef USE_SPNEGO

  if(data->state.proxyneg.state == GSS_AUTHSENT ||

      data->state.negotiate.state == GSS_AUTHSENT)

    Curl_cleanup_negotiate(data);

lib/http_negotiate.h

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
 *

 ***************************************************************************/



#ifdef USE_HTTP_NEGOTIATE

#ifdef USE_SPNEGO



/* this is for Negotiate header input */

int Curl_input_negotiate(struct connectdata *conn, bool proxy,
@@ -37,6 +37,6 @@ void Curl_cleanup_negotiate(struct SessionHandle *data); 
#define GSS_ERROR(status) (status & 0x80000000)

#endif



#endif /* USE_HTTP_NEGOTIATE */

#endif /* USE_SPNEGO */



#endif /* HEADER_CURL_HTTP_NEGOTIATE_H */

lib/http_negotiate_sspi.c

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


#ifdef USE_WINDOWS_SSPI



#if !defined(CURL_DISABLE_HTTP) && defined(USE_HTTP_NEGOTIATE)

#if !defined(CURL_DISABLE_HTTP) && defined(USE_SPNEGO)



#include "urldata.h"

#include "sendf.h"
@@ -262,6 +262,6 @@ void Curl_cleanup_negotiate(struct SessionHandle *data) 
  cleanup(&data->state.proxyneg);

}



#endif /* !CURL_DISABLE_HTTP && USE_HTTP_NEGOTIATE */

#endif /* !CURL_DISABLE_HTTP && USE_SPNEGO */



#endif /* USE_WINDOWS_SSPI */