From 9ad282b1ae1135e7d5dd2e466ff8671c1e4ee04b Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Fri, 11 Jul 2014 09:37:18 +0100 Subject: Remove all traces of FBOpenSSL SPNEGO support MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is just fundamentally broken. SPNEGO (RFC4178) is a protocol which allows client and server to negotiate the underlying mechanism which will actually be used to authenticate. This is *often* Kerberos, and can also be NTLM and other things. And to complicate matters, there are various different OIDs which can be used to specify the Kerberos mechanism too. A SPNEGO exchange will identify *which* GSSAPI mechanism is being used, and will exchange GSSAPI tokens which are appropriate for that mechanism. But this SPNEGO implementation just strips the incoming SPNEGO packet and extracts the token, if any. And completely discards the information about *which* mechanism is being used. Then we *assume* it was Kerberos, and feed the token into gss_init_sec_context() with the default mechanism (GSS_S_NO_OID for the mech_type argument). Furthermore... broken as this code is, it was never even *used* for input tokens anyway, because higher layers of curl would just bail out if the server actually said anything *back* to us in the negotiation. We assume that we send a single token to the server, and it accepts it. If the server wants to continue the exchange (as is required for NTLM and for SPNEGO to do anything useful), then curl was broken anyway. So the only bit which actually did anything was the bit in Curl_output_negotiate(), which always generates an *initial* SPNEGO token saying "Hey, I support only the Kerberos mechanism and this is its token". You could have done that by manually just prefixing the Kerberos token with the appropriate bytes, if you weren't going to do any proper SPNEGO handling. There's no need for the FBOpenSSL library at all. The sane way to do SPNEGO is just to *ask* the GSSAPI library to do SPNEGO. That's what the 'mech_type' argument to gss_init_sec_context() is for. And then it should all Just Work™. That 'sane way' will be added in a subsequent patch, as will bug fixes for our failure to handle any exchange other than a single outbound token to the server which results in immediate success. --- winbuild/Makefile.vc | 14 -------------- winbuild/MakefileBuild.vc | 16 ---------------- 2 files changed, 30 deletions(-) (limited to 'winbuild') diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc index 90719a885..6dc58c4ef 100644 --- a/winbuild/Makefile.vc +++ b/winbuild/Makefile.vc @@ -28,7 +28,6 @@ CFGSET=true !MESSAGE http://www.microsoft.com/downloads/details.aspx?FamilyID=AD6158D7-DDBA-416A-9109-07607425A815 !MESSAGE ENABLE_IPV6= - Enable IPv6, defaults to yes !MESSAGE ENABLE_SSPI= - Enable SSPI support, defaults to yes -!MESSAGE ENABLE_SPNEGO= - Enable Simple and Protected GSSAPI Negotiation Mechanism, defaults to yes !MESSAGE ENABLE_WINSSL= - Enable native Windows SSL support, defaults to yes !MESSAGE GEN_PDB= - Generate Program Database (debug symbols for release build) !MESSAGE DEBUG= - Debug builds @@ -86,14 +85,6 @@ USE_SSPI = true USE_SSPI = false !ENDIF -!IFNDEF ENABLE_SPNEGO -USE_SPNEGO = true -!ELSEIF "$(ENABLE_SPNEGO)"=="yes" -USE_SPNEGO = true -!ELSEIF "$(ENABLE_SPNEGO)"=="no" -USE_SPNEGO = false -!ENDIF - !IFNDEF ENABLE_WINSSL !IFDEF WITH_SSL USE_WINSSL = false @@ -166,10 +157,6 @@ CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-ipv6 CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-sspi !ENDIF -!IF "$(USE_SPNEGO)"=="true" -CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-spnego -!ENDIF - !IF "$(USE_WINSSL)"=="true" CONFIG_NAME_LIB = $(CONFIG_NAME_LIB)-winssl !ENDIF @@ -197,7 +184,6 @@ $(MODE): @SET USE_IDN=$(USE_IDN) @SET USE_IPV6=$(USE_IPV6) @SET USE_SSPI=$(USE_SSPI) - @SET USE_SPNEGO=$(USE_SPNEGO) @SET USE_WINSSL=$(USE_WINSSL) @$(MAKE) /NOLOGO /F MakefileBuild.vc diff --git a/winbuild/MakefileBuild.vc b/winbuild/MakefileBuild.vc index 828fe4f0a..b9e150c43 100644 --- a/winbuild/MakefileBuild.vc +++ b/winbuild/MakefileBuild.vc @@ -187,17 +187,6 @@ SSPI_CFLAGS = $(SSPI_CFLAGS) /DUSE_WINDOWS_SSPI !ENDIF -!IFNDEF USE_SPNEGO -USE_SPNEGO = true -!ELSEIF "$(USE_SPNEGO)"=="yes" -USE_SPNEGO = true -!ENDIF - -!IF "$(USE_SPNEGO)"=="true" -SPNEGO_CFLAGS = $(SPNEGO_CFLAGS) /DHAVE_SPNEGO -!ENDIF - - !IFNDEF USE_WINSSL !IF "$(USE_SSL)"=="true" USE_WINSSL = false @@ -330,10 +319,6 @@ CFLAGS = $(CFLAGS) $(IPV6_CFLAGS) CFLAGS = $(CFLAGS) $(SSPI_CFLAGS) !ENDIF -!IF "$(USE_SPNEGO)"=="true" -CFLAGS = $(CFLAGS) $(SPNEGO_CFLAGS) -!ENDIF - !IF "$(GEN_PDB)"=="true" CFLAGS = $(CFLAGS) $(CFLAGS_PDB) /Fd"$(LIB_DIROBJ)\$(PDB)" LFLAGS = $(LFLAGS) $(LFLAGS_PDB) @@ -396,7 +381,6 @@ $(TARGET): $(LIB_OBJS) $(LIB_DIROBJ) $(DISTDIR) @echo Using IDN: $(USE_IDN) @echo Using IPv6: $(USE_IPV6) @echo Using SSPI: $(USE_SSPI) - @echo Using SPNEGO: $(USE_SPNEGO) @echo Using WinSSL: $(USE_WINSSL) @echo CFLAGS: $(CFLAGS) @echo LFLAGS: $(LFLAGS) -- cgit v1.2.3