tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-27 15:54:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix 9.1 compilation errors

Browse Source
This commit is contained in:
Tess Gauthier 2022-10-06 15:43:21 -04:00
parent df96e7c7e2
commit 3e3b110485
13 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
auth.h
View File

@ -41,6 +41,10 @@
#include <krb5.h> #include <krb5.h>
#endif #endif
#ifdef WINDOWS
#include "hostfile.h"
#endif
struct passwd; struct passwd;
struct ssh; struct ssh;
struct sshbuf; struct sshbuf;

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

@ -356,7 +356,6 @@
<ClCompile Include="$(OpenSSH-Src-Path)cipher-aes.c" /> <ClCompile Include="$(OpenSSH-Src-Path)cipher-aes.c" />
<ClCompile Include="$(OpenSSH-Src-Path)cipher-aesctr.c" /> <ClCompile Include="$(OpenSSH-Src-Path)cipher-aesctr.c" />
<ClCompile Include="$(OpenSSH-Src-Path)cipher-chachapoly.c" /> <ClCompile Include="$(OpenSSH-Src-Path)cipher-chachapoly.c" />
<ClCompile Include="$(OpenSSH-Src-Path)cipher-ctr.c" />
<ClCompile Include="$(OpenSSH-Src-Path)cipher.c" /> <ClCompile Include="$(OpenSSH-Src-Path)cipher.c" />
<ClCompile Include="$(OpenSSH-Src-Path)cleanup.c" /> <ClCompile Include="$(OpenSSH-Src-Path)cleanup.c" />
<ClCompile Include="$(OpenSSH-Src-Path)compat.c" /> <ClCompile Include="$(OpenSSH-Src-Path)compat.c" />

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

@ -12,7 +12,6 @@
<ClCompile Include="$(OpenSSH-Src-Path)cipher-aes.c" /> <ClCompile Include="$(OpenSSH-Src-Path)cipher-aes.c" />
<ClCompile Include="$(OpenSSH-Src-Path)cipher-aesctr.c" /> <ClCompile Include="$(OpenSSH-Src-Path)cipher-aesctr.c" />
<ClCompile Include="$(OpenSSH-Src-Path)cipher-chachapoly.c" /> <ClCompile Include="$(OpenSSH-Src-Path)cipher-chachapoly.c" />
<ClCompile Include="$(OpenSSH-Src-Path)cipher-ctr.c" />
<ClCompile Include="$(OpenSSH-Src-Path)cipher.c" /> <ClCompile Include="$(OpenSSH-Src-Path)cipher.c" />
<ClCompile Include="$(OpenSSH-Src-Path)cleanup.c" /> <ClCompile Include="$(OpenSSH-Src-Path)cleanup.c" />
<ClCompile Include="$(OpenSSH-Src-Path)compat.c" /> <ClCompile Include="$(OpenSSH-Src-Path)compat.c" />

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

@ -42,6 +42,7 @@
<ClCompile Include="..\..\..\sftp-client.c" /> <ClCompile Include="..\..\..\sftp-client.c" />
<ClCompile Include="..\..\..\sftp-common.c" /> <ClCompile Include="..\..\..\sftp-common.c" />
<ClCompile Include="..\..\..\sftp-glob.c" /> <ClCompile Include="..\..\..\sftp-glob.c" />
<ClCompile Include="..\..\..\sftp-usergroup.c" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="version.rc" /> <ResourceCompile Include="version.rc" />

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

@ -33,6 +33,9 @@
<ClCompile Include="..\..\..\sftp-glob.c"> <ClCompile Include="..\..\..\sftp-glob.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\sftp-usergroup.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="version.rc"> <ResourceCompile Include="version.rc">

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

@ -43,6 +43,7 @@
<ClCompile Include="$(OpenSSH-Src-Path)sftp.c" /> <ClCompile Include="$(OpenSSH-Src-Path)sftp.c" />
<ClCompile Include="$(OpenSSH-Src-Path)contrib\win32\win32compat\wmain_common.c" /> <ClCompile Include="$(OpenSSH-Src-Path)contrib\win32\win32compat\wmain_common.c" />
<ClCompile Include="$(OpenSSH-Src-Path)contrib\win32\win32compat\win32-utf8.c" /> <ClCompile Include="$(OpenSSH-Src-Path)contrib\win32\win32compat\win32-utf8.c" />
<ClCompile Include="..\..\..\sftp-usergroup.c" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="version.rc" /> <ResourceCompile Include="version.rc" />

5
contrib/win32/openssh/sftp.vcxproj.filters
View File

@ -36,10 +36,13 @@
<ClCompile Include="$(OpenSSH-Src-Path)contrib\win32\win32compat\win32-utf8.c"> <ClCompile Include="$(OpenSSH-Src-Path)contrib\win32\win32compat\win32-utf8.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\sftp-usergroup.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="version.rc"> <ResourceCompile Include="version.rc">
<Filter>Resource Files</Filter> <Filter>Resource Files</Filter>
</ResourceCompile> </ResourceCompile>
</ItemGroup> </ItemGroup>
</Project> </Project>

2
contrib/win32/openssh/ssh.vcxproj
View File

@ -507,6 +507,8 @@
<ClCompile Include="$(OpenSSH-Src-Path)contrib\win32\win32compat\win32_sshtty.c" /> <ClCompile Include="$(OpenSSH-Src-Path)contrib\win32\win32compat\win32_sshtty.c" />
<ClCompile Include="$(OpenSSH-Src-Path)contrib\win32\win32compat\win32-utf8.c" /> <ClCompile Include="$(OpenSSH-Src-Path)contrib\win32\win32compat\win32-utf8.c" />
<ClCompile Include="$(OpenSSH-Src-Path)ssh-sk-client.c" /> <ClCompile Include="$(OpenSSH-Src-Path)ssh-sk-client.c" />
<ClCompile Include="..\..\..\misc.c" />
<ClCompile Include="..\..\..\sshkey.c" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="version.rc" /> <ResourceCompile Include="version.rc" />

6
contrib/win32/openssh/ssh.vcxproj.filters
View File

@ -314,6 +314,12 @@
<ClCompile Include="$(OpenSSH-Src-Path)ssh-sk-client.c"> <ClCompile Include="$(OpenSSH-Src-Path)ssh-sk-client.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\misc.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\sshkey.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="version.rc"> <ResourceCompile Include="version.rc">

3
contrib/win32/openssh/sshd.vcxproj
View File

@ -459,8 +459,11 @@
<ClCompile Include="$(OpenSSH-Src-Path)contrib\win32\win32compat\win32_sshpty.c" /> <ClCompile Include="$(OpenSSH-Src-Path)contrib\win32\win32compat\win32_sshpty.c" />
<ClCompile Include="$(OpenSSH-Src-Path)contrib\win32\win32compat\wmain_sshd.c" /> <ClCompile Include="$(OpenSSH-Src-Path)contrib\win32\win32compat\wmain_sshd.c" />
<ClCompile Include="$(OpenSSH-Src-Path)contrib\win32\win32compat\w32-doexec.c" /> <ClCompile Include="$(OpenSSH-Src-Path)contrib\win32\win32compat\w32-doexec.c" />
<ClCompile Include="..\..\..\auth2-pubkeyfile.c" />
<ClCompile Include="..\..\..\misc.c" />
<ClCompile Include="..\..\..\srclimit.c" /> <ClCompile Include="..\..\..\srclimit.c" />
<ClCompile Include="..\..\..\ssh-sk-client.c" /> <ClCompile Include="..\..\..\ssh-sk-client.c" />
<ClCompile Include="..\..\..\sshkey.c" />
<ClCompile Include="..\win32compat\win32-utf8.c" /> <ClCompile Include="..\win32compat\win32-utf8.c" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

9
contrib/win32/openssh/sshd.vcxproj.filters
View File

@ -150,6 +150,15 @@
<ClCompile Include="..\..\..\ssh-sk-client.c"> <ClCompile Include="..\..\..\ssh-sk-client.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\..\auth2-pubkeyfile.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\misc.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="..\..\..\sshkey.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ResourceCompile Include="version.rc"> <ResourceCompile Include="version.rc">

4
sftp-server.c
View File

@ -181,8 +181,10 @@ static const struct sftp_handler extended_handlers[] = {
{ "copy-data", "copy-data", 0, process_extended_copy_data, 1 }, { "copy-data", "copy-data", 0, process_extended_copy_data, 1 },
{ "home-directory", "home-directory", 0, { "home-directory", "home-directory", 0,
process_extended_home_directory, 0 }, process_extended_home_directory, 0 },
#ifndef WINDOWS
{ "users-groups-by-id", "users-groups-by-id@openssh.com", 0, { "users-groups-by-id", "users-groups-by-id@openssh.com", 0,
process_extended_get_users_groups_by_id, 0 }, process_extended_get_users_groups_by_id, 0 },
#endif
{ NULL, NULL, 0, NULL, 0 } { NULL, NULL, 0, NULL, 0 }
}; };
@ -1759,6 +1761,7 @@ process_extended_home_directory(u_int32_t id)
static void static void
process_extended_get_users_groups_by_id(u_int32_t id) process_extended_get_users_groups_by_id(u_int32_t id)
{ {
#ifndef WINDOWS
struct passwd *user_pw; struct passwd *user_pw;
struct group *gr; struct group *gr;
struct sshbuf *uids, *gids, *usernames, *groupnames, *msg; struct sshbuf *uids, *gids, *usernames, *groupnames, *msg;
@ -1809,6 +1812,7 @@ process_extended_get_users_groups_by_id(u_int32_t id)
sshbuf_free(usernames); sshbuf_free(usernames);
sshbuf_free(groupnames); sshbuf_free(groupnames);
sshbuf_free(msg); sshbuf_free(msg);
#endif
} }
static void static void

4
sk-usbhid.c
View File

@ -1208,10 +1208,10 @@ sk_sign(uint32_t alg, const uint8_t *data, size_t datalen,
if ((sk = sk_open("windows://hello")) == NULL) { if ((sk = sk_open("windows://hello")) == NULL) {
if (pin != NULL || if (pin != NULL ||
(flags & SSH_SK_USER_VERIFICATION_REQD)) (flags & SSH_SK_USER_VERIFICATION_REQD))
sk = sk_probe(NULL, NULL, 0); sk = sk_probe(NULL, NULL, 0, 0);
else else
sk = sk_probe(application, key_handle, sk = sk_probe(application, key_handle,
key_handle_len); key_handle_len, 0);
} }
} }
#else #else