Commitf15c8ac

authored and

Edward Thomson

committed

http: add SSPI authentication on Windows

Add support for SSPI on Windows, which offers NTLM and Negotiateauthentication.

1 parent0d7f3f5 commitf15c8acCopy full SHA for f15c8ac

File tree

+350

-9

lines changed

+350

-9

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ if(USE_GSSAPI)`
`29`	`29`	`list(APPENDLIBGIT2_SYSTEM_LIBS${GSSFRAMEWORK_LIBRARIES})`
`30`	`30`
`31`	`31`	`set(GIT_GSSFRAMEWORK1)`
`32`		`-add_feature_info(SPNEGOGIT_GSSFRAMEWORK"SPNEGO authentication support (${USE_GSSAPI})")`
	`32`	`+add_feature_info(GSSAPIGIT_GSSFRAMEWORK"GSSAPI support forSPNEGO authentication (${USE_GSSAPI})")`
`33`	`33`	`elseif(USE_GSSAPISTREQUAL"gssapi")`
`34`	`34`	`if(NOTGSSAPI_FOUND)`
`35`	`35`	`message(FATAL_ERROR"Asked for gssapi GSS backend, but it wasn't found")`
`@@ -38,11 +38,11 @@ if(USE_GSSAPI)`
`38`	`38`	`list(APPENDLIBGIT2_SYSTEM_LIBS${GSSAPI_LIBRARIES})`
`39`	`39`
`40`	`40`	`set(GIT_GSSAPI1)`
`41`		`-add_feature_info(SPNEGOGIT_GSSAPI"SPNEGO authentication support (${USE_GSSAPI})")`
	`41`	`+add_feature_info(GSSAPIGIT_GSSAPI"GSSAPI support forSPNEGO authentication (${USE_GSSAPI})")`
`42`	`42`	`else()`
`43`	`43`	`message(FATAL_ERROR"Asked for backend${USE_GSSAPI} but it wasn't found")`
`44`	`44`	`endif()`
`45`	`45`	`else()`
`46`	`46`	`set(GIT_GSSAPI0)`
`47`		`-add_feature_info(SPNEGONO"SPNEGO authentication support")`
	`47`	`+add_feature_info(GSSAPINO"GSSAPI support forSPNEGO authentication")`
`48`	`48`	`endif()`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -125,8 +125,8 @@ if(USE_HTTPS)`
`125`	`125`	`list(APPENDLIBGIT2_PC_LIBS"-lwinhttp")`
`126`	`126`	`endif()`
`127`	`127`
`128`		`-list(APPENDLIBGIT2_SYSTEM_LIBS"rpcrt4""crypt32""ole32")`
`129`		`-list(APPENDLIBGIT2_PC_LIBS"-lrpcrt4""-lcrypt32""-lole32")`
	`128`	`+list(APPENDLIBGIT2_SYSTEM_LIBS"rpcrt4""crypt32""ole32""secur32")`
	`129`	`+list(APPENDLIBGIT2_PC_LIBS"-lrpcrt4""-lcrypt32""-lole32""-lsecur32")`
`130`	`130`	`elseif(USE_HTTPSSTREQUAL"OpenSSL-Dynamic")`
`131`	`131`	`set(GIT_OPENSSL1)`
`132`	`132`	`set(GIT_OPENSSL_DYNAMIC1)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`	`#include"git2.h"`
`13`	`13`	`#include"auth.h"`
`14`	`14`
`15`		`-#if defined(GIT_GSSAPI)\|\| defined(GIT_GSSFRAMEWORK)`
	`15`	`+#if defined(GIT_GSSAPI)\|\| defined(GIT_GSSFRAMEWORK)\|\| defined(GIT_WIN32)`
`16`	`16`
`17`	`17`	`externintgit_http_auth_negotiate(`
`18`	`18`	`git_http_auth_context**out,`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,15 +5,15 @@`
`5`	`5`	`* a Linking Exception. For full terms see the included COPYING file.`
`6`	`6`	`*/`
`7`	`7`
`8`		`-#ifndefINCLUDE_transports_auth_ntlmclient_h__`
`9`		`-#defineINCLUDE_transports_auth_ntlmclient_h__`
	`8`	`+#ifndefINCLUDE_transports_auth_ntlm_h__`
	`9`	`+#defineINCLUDE_transports_auth_ntlm_h__`
`10`	`10`
`11`	`11`	`#include"auth.h"`
`12`	`12`
`13`	`13`	`/* NTLM requires a full request/challenge/response */`
`14`	`14`	`#defineGIT_AUTH_STEPS_NTLM 2`
`15`	`15`
`16`		`-#ifdefGIT_NTLM`
	`16`	`+#if defined(GIT_NTLM)\|\| defined(GIT_WIN32)`
`17`	`17`
`18`	`18`	`#if defined(GIT_OPENSSL)`
`19`	`19`	`# defineCRYPT_OPENSSL`

Comments

(0)