Skip to content

Commit 2c7e659

Browse files
manojampalammanojampalam
committed
5-8 C3
1 parent 473841c commit 2c7e659

File tree

5 files changed

+56
-21
lines changed

5 files changed

+56
-21
lines changed

‎contrib/win32/openssh/ssh-agent.vcxproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<Optimization>Disabled</Optimization>
107107
<PreprocessorDefinitions>_WIN32_WINNT=0x600;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
108108
<SDLCheck>false</SDLCheck>
109-
<AdditionalIncludeDirectories>$(SolutionDir);$(OpenSSL-Win32-Debug-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat\includes;$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
109+
<AdditionalIncludeDirectories>$(SolutionDir);$(OpenSSL-Win32-Debug-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat\includes;$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories);$(OpenSSH-Src-Path)contrib\win32\ssh-pubkey</AdditionalIncludeDirectories>
110110
<CompileAs>CompileAsC</CompileAs>
111111
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
112112
<ExceptionHandling>Sync</ExceptionHandling>
@@ -129,7 +129,7 @@
129129
<Optimization>Disabled</Optimization>
130130
<PreprocessorDefinitions>_WIN32_WINNT=0x600;WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
131131
<SDLCheck>false</SDLCheck>
132-
<AdditionalIncludeDirectories>$(SolutionDir);$(OpenSSL-x64-Debug-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat\includes;$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
132+
<AdditionalIncludeDirectories>$(SolutionDir);$(OpenSSL-x64-Debug-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat\includes;$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories);$(OpenSSH-Src-Path)contrib\win32\ssh-pubkey</AdditionalIncludeDirectories>
133133
<CompileAs>CompileAsC</CompileAs>
134134
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
135135
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
@@ -153,7 +153,7 @@
153153
<IntrinsicFunctions>true</IntrinsicFunctions>
154154
<PreprocessorDefinitions>_WIN32_WINNT=0x600;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
155155
<SDLCheck>false</SDLCheck>
156-
<AdditionalIncludeDirectories>$(SolutionDir);$(OpenSSL-Win32-Release-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat\includes;$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
156+
<AdditionalIncludeDirectories>$(SolutionDir);$(OpenSSL-Win32-Release-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat\includes;$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories);$(OpenSSH-Src-Path)contrib\win32\ssh-pubkey</AdditionalIncludeDirectories>
157157
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
158158
</ClCompile>
159159
<Link>
@@ -177,7 +177,7 @@
177177
<IntrinsicFunctions>true</IntrinsicFunctions>
178178
<PreprocessorDefinitions>_WIN32_WINNT=0x600;_LIB;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_WARNINGS;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
179179
<SDLCheck>false</SDLCheck>
180-
<AdditionalIncludeDirectories>$(SolutionDir);$(OpenSSL-x64-Release-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat\includes;$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
180+
<AdditionalIncludeDirectories>$(SolutionDir);$(OpenSSL-x64-Release-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat\includes;$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories);$(OpenSSH-Src-Path)contrib\win32\ssh-pubkey</AdditionalIncludeDirectories>
181181
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
182182
<WholeProgramOptimization>true</WholeProgramOptimization>
183183
</ClCompile>
@@ -195,6 +195,7 @@
195195
</ItemDefinitionGroup>
196196
<ItemGroup>
197197
<ClInclude Include="..\..\..\servconf.h" />
198+
<ClInclude Include="..\ssh-pubkey\ssh-pubkeydefs.h" />
198199
<ClInclude Include="..\win32compat\ssh-agent\agent-request.h" />
199200
<ClInclude Include="..\win32compat\ssh-agent\agent.h" />
200201
<ClInclude Include="..\win32compat\ssh-agent\config.h" />

‎contrib/win32/openssh/ssh-pubkey.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
<ClCompile Include="..\ssh-pubkey\ssh-pubkey.c" />
2525
</ItemGroup>
2626
<ItemGroup>
27+
<ClInclude Include="..\ssh-pubkey\ssh-pubkeydefs.h" />
2728
<ClInclude Include="..\ssh-pubkey\pubkeyfd.h" />
2829
</ItemGroup>
2930
<PropertyGroup Label="Globals">

‎contrib/win32/ssh-pubkey/pubkeyfd.h

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,7 @@
22
#ifndef PUBKEYFD_H
33
#define PUBKEYFD_H
44

5-
#define PK_REQUEST_ADD "add"
6-
#define PK_REQUEST_LIST "list"
7-
#define PK_REQUEST_REMOVE "remove"
8-
#define PK_REQUEST_REMOVE_ALL "removeall"
9-
#define PK_REQUEST_REMOVE_BY_FP "removebyfp"
10-
11-
#define SSH_PUBLICKEY_SUCCESS 0
12-
#define SSH_PUBLICKEY_ACCESS_DENIED 1
13-
#define SSH_PUBLICKEY_STORAGE_EXCEEDED 2
14-
#define SSH_PUBLICKEY_VERSION_NOT_SUPPORTED 3
15-
#define SSH_PUBLICKEY_KEY_NOT_FOUND 4
16-
#define SSH_PUBLICKEY_KEY_NOT_SUPPORTED 5
17-
#define SSH_PUBLICKEY_KEY_ALREADY_PRESENT 6
18-
#define SSH_PUBLICKEY_GENERAL_FAILURE 7
19-
#define SSH_PUBLICKEY_REQUEST_NOT_SUPPORTED 8
20-
#define SSH_PUBLICKEY_ATTRIBUTE_NOT_SUPPORTED 9
5+
#include "ssh-pubkeydefs.h"
216

227
int ssh_add_pubkey(int sock, struct sshkey *key, const char *comment, const char* password);
238
int ssh_list_pubkeys(int sock, struct ssh_identitylist **idlp);

‎contrib/win32/ssh-pubkey/ssh-pubkeydefs.h

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
2+
#ifndef PUBKEYDEFS_H
3+
#define PUBKEYDEFS_H
4+
5+
#define PK_REQUEST_ADD "add"
6+
#define PK_REQUEST_LIST "list"
7+
#define PK_REQUEST_REMOVE "remove"
8+
#define PK_REQUEST_REMOVE_ALL "removeall"
9+
#define PK_REQUEST_REMOVE_BY_FP "removebyfp"
10+
11+
#define SSH_PUBLICKEY_SUCCESS 0
12+
#define SSH_PUBLICKEY_ACCESS_DENIED 1
13+
#define SSH_PUBLICKEY_STORAGE_EXCEEDED 2
14+
#define SSH_PUBLICKEY_VERSION_NOT_SUPPORTED 3
15+
#define SSH_PUBLICKEY_KEY_NOT_FOUND 4
16+
#define SSH_PUBLICKEY_KEY_NOT_SUPPORTED 5
17+
#define SSH_PUBLICKEY_KEY_ALREADY_PRESENT 6
18+
#define SSH_PUBLICKEY_GENERAL_FAILURE 7
19+
#define SSH_PUBLICKEY_REQUEST_NOT_SUPPORTED 8
20+
#define SSH_PUBLICKEY_ATTRIBUTE_NOT_SUPPORTED 9
21+
22+
#endif

‎contrib/win32/win32compat/ssh-agent/pubkeyagent-request.c

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,33 @@
3131

3232
#include "agent.h"
3333
#include "agent-request.h"
34+
#include "ssh-pubkeydefs.h"
3435

35-
int process_pubkeyagent_request(struct sshbuf* request, struct sshbuf* response, struct agent_connection* con) {
36+
37+
static int
38+
process_add_request(struct sshbuf* request, struct sshbuf* response, struct agent_connection* con) {
3639
return -1;
40+
}
41+
42+
43+
44+
int process_pubkeyagent_request(struct sshbuf* request, struct sshbuf* response, struct agent_connection* con) {
45+
int r = 0;
46+
const u_char *op;
47+
size_t op_len;
48+
49+
if ((r = sshbuf_get_string_direct(request, &op, &op_len)) != 0)
50+
goto done;
51+
52+
if (op_len > 10) {
53+
r = EINVAL;
54+
goto done;
55+
}
56+
57+
if ((op_len == 3) && (strncmp(op, PK_REQUEST_ADD, 3) == 0))
58+
r = 0;
59+
60+
61+
done:
62+
return r;
3763
}

0 commit comments

Comments
 (0)