tyler.durden/Win32-OpenSSH
1
0
Fork 0
mirror of https://github.com/PowerShell/Win32-OpenSSH.git synced 2025-07-24 22:45:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Removing untested kerb support in client

Browse Source
This commit is contained in:
manojampalam 2016-03-23 13:39:32 -07:00
parent 689073e46a
commit d94011a37e
7 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/win32/openssh/config.h.vs
View File

@ -166,7 +166,7 @@
/* Define this if you want GSSAPI /* Define this if you want GSSAPI
support in the version 2 protocol */ support in the version 2 protocol */
#define GSSAPI 1 /* #undef GSSAPI */
/* Define if you want to use shadow password expire field */ /* Define if you want to use shadow password expire field */
/* #undef HAS_SHADOW_EXPIRE */ /* #undef HAS_SHADOW_EXPIRE */
@ -1254,7 +1254,7 @@
#define IP_TOS_IS_BROKEN 1 #define IP_TOS_IS_BROKEN 1
/* Define if you want Kerberos 5 support */ /* Define if you want Kerberos 5 support */
#define KRB5 1 /* #undef KRB5 */
/* Define if pututxline updates lastlog too */ /* Define if pututxline updates lastlog too */
/* #undef LASTLOG_WRITE_PUTUTXLINE */ /* #undef LASTLOG_WRITE_PUTUTXLINE */

1
contrib/win32/openssh/libssh.vcxproj
View File

@ -204,7 +204,6 @@
<ClCompile Include="$(OpenSSH-Src-Path)hmac.c" /> <ClCompile Include="$(OpenSSH-Src-Path)hmac.c" />
<ClCompile Include="$(OpenSSH-Src-Path)hostfile.c" /> <ClCompile Include="$(OpenSSH-Src-Path)hostfile.c" />
<ClCompile Include="$(OpenSSH-Src-Path)jpake.c" /> <ClCompile Include="$(OpenSSH-Src-Path)jpake.c" />
<ClCompile Include="$(OpenSSH-Src-Path)kerberos-sspi.c" />
<ClCompile Include="$(OpenSSH-Src-Path)kex.c" /> <ClCompile Include="$(OpenSSH-Src-Path)kex.c" />
<ClCompile Include="$(OpenSSH-Src-Path)kexc25519.c" /> <ClCompile Include="$(OpenSSH-Src-Path)kexc25519.c" />
<ClCompile Include="$(OpenSSH-Src-Path)kexc25519c.c" /> <ClCompile Include="$(OpenSSH-Src-Path)kexc25519c.c" />

3
contrib/win32/openssh/libssh.vcxproj.filters
View File

@ -129,9 +129,6 @@
<ClCompile Include="$(OpenSSH-Src-Path)jpake.c"> <ClCompile Include="$(OpenSSH-Src-Path)jpake.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="$(OpenSSH-Src-Path)kerberos-sspi.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="$(OpenSSH-Src-Path)kex.c"> <ClCompile Include="$(OpenSSH-Src-Path)kex.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>

5
kexdhs.c
View File

@ -29,11 +29,6 @@
* We support only client side kerberos on Windows. * We support only client side kerberos on Windows.
*/ */
#ifdef WIN32_FIXME
#undef GSSAPI
#undef KRB5
#endif
#include <sys/types.h> #include <sys/types.h>

5
kexgex.c
View File

@ -30,11 +30,6 @@
* We support only client side kerberos on Windows. * We support only client side kerberos on Windows.
*/ */
#ifdef WIN32_FIXME
#undef GSSAPI
#undef KRB5
#endif
#include <sys/types.h> #include <sys/types.h>
#include <openssl/evp.h> #include <openssl/evp.h>

4
key.c
View File

@ -5,10 +5,6 @@
#include "includes.h" #include "includes.h"
#ifdef WIN32_FIXME
#include "openbsd-compat/openssl-compat.h"
#endif
#include <sys/types.h> #include <sys/types.h>
#include <errno.h> #include <errno.h>
#include <stdarg.h> #include <stdarg.h>

9
sshconnect2.c
View File

@ -332,21 +332,12 @@ static Authmethod *authmethod_get(char *authlist);
static Authmethod *authmethod_lookup(const char *name); static Authmethod *authmethod_lookup(const char *name);
static char *authmethods_get(void); static char *authmethods_get(void);
#ifdef WIN32_FIXME
int userauth_sspi_kerberos(Authctxt *authctxt);
void userauth_sspi_kerberos_cleanup(Authctxt *authctxt);
#endif
Authmethod authmethods[] = { Authmethod authmethods[] = {
#ifdef GSSAPI #ifdef GSSAPI
{"gssapi-with-mic", {"gssapi-with-mic",
userauth_gssapi, userauth_gssapi,
#ifdef WIN32_FIXME
userauth_sspi_kerberos_cleanup, userauth_sspi_kerberos_cleanup,
#else
NULL, NULL,
#endif
&options.gss_authentication, &options.gss_authentication,
NULL}, NULL},
#endif #endif