Skip to content

Commit 727329a

Browse files
bingbing8bingbing8
committed
Source snapshot from Powershell/openssh-portable:latestw_all
1 parent 25a4ae6 commit 727329a

33 files changed

+489
-164
lines changed

‎appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: 0.0.20.0.{build}
1+
version: 0.0.21.0.{build}
22
image: Visual Studio 2015
33

44
branches:

‎contrib/win32/openssh/OpenSSHBuildHelper.psm1‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ function Start-OpenSSHBootstrap
217217
[Environment]::SetEnvironmentVariable('Path', $newMachineEnvironmentPath, 'MACHINE')
218218
}
219219

220-
$VCTargetsPath = "${env:ProgramFiles(x86)}\MSBuild\Microsoft.Cpp\v4.0\V140"
220+
$VCTargetsPath = "${env:ProgramFiles(x86)}\MSBuild\Microsoft.Cpp\v4.0\V140\"
221221
if([Environment]::GetEnvironmentVariable('VCTargetsPath', 'MACHINE') -eq $null)
222222
{
223223
[Environment]::SetEnvironmentVariable('VCTargetsPath', $VCTargetsPath, 'MACHINE')

‎contrib/win32/openssh/OpenSSHUtils.psm1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ function Repair-SshdConfigPermission
112112
[ValidateNotNullOrEmpty()]
113113
[string]$FilePath)
114114

115-
Repair-FilePermission -Owners $systemSid,$adminsSid -ReadAccessNeeded $sshdSid @psBoundParameters
115+
Repair-FilePermission -Owners $systemSid,$adminsSid -FullAccessNeeded $systemSid -ReadAccessNeeded $sshdSid @psBoundParameters
116116
}
117117

118118
<#
@@ -175,7 +175,7 @@ function Repair-AuthorizedKeyPermission
175175
if($profileItem)
176176
{
177177
$userSid = $profileItem.PSChildName
178-
Repair-FilePermission -Owners $userSid,$adminsSid,$systemSid -AnyAccessOK $userSid -ReadAccessNeeded $sshdSid @psBoundParameters
178+
Repair-FilePermission -Owners $userSid,$adminsSid,$systemSid -AnyAccessOK $userSid -FullAccessNeeded $systemSid -ReadAccessNeeded $sshdSid @psBoundParameters
179179

180180
}
181181
else
@@ -332,7 +332,7 @@ function Repair-FilePermissionInternal {
332332
{
333333
$realReadAccessNeeded = @($everyoneSid)
334334
}
335-
#this is orginal list requested by the user, the account will be removed from the list if they already part of the dacl
335+
#this is original list requested by the user, the account will be removed from the list if they already part of the dacl
336336
if($realReadAccessNeeded)
337337
{
338338
$realReadAccessNeeded = $realReadAccessNeeded | ? { ($_ -ne $null) -and ($realFullAccessNeeded -notcontains $_) }

‎contrib/win32/openssh/install-sshd.ps1‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -220,20 +220,20 @@ namespace MyLsaWrapper
220220
}
221221
}
222222
'@
223-
$references = @()
224-
if(($psversiontable.Containskey("psedition")) -and ($psversiontable.PSEdition -ieq "core"))
225-
{
226-
$references = "System.Security.Principal.Windows", "Microsoft.Win32.Primitives"
227-
}
228223

224+
$references = @("System.Security.Principal.Windows", "Microsoft.Win32.Primitives")
229225
try {
230226
$null = [MyLsaWrapper.LsaWrapperCaller]
231227
}
232228
catch {
233-
$types = Add-Type $definition -ref $references -WarningAction SilentlyContinue -ErrorAction SilentlyContinue
229+
try {
230+
$types = Add-Type $definition -ref $references -WarningAction SilentlyContinue -ErrorAction SilentlyContinue
231+
}
232+
catch {
233+
$types = Add-Type $definition -WarningAction SilentlyContinue -ErrorAction SilentlyContinue
234+
}
234235
}
235236

236-
237237
function Add-Privilege
238238
{
239239
param(

‎contrib/win32/openssh/keygen.vcxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,7 @@
106106
<AdditionalIncludeDirectories>$(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
107107
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
108108
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
109+
<ControlFlowGuard>Guard</ControlFlowGuard>
109110
</ClCompile>
110111
<Link>
111112
<SubSystem>Console</SubSystem>
@@ -126,6 +127,7 @@
126127
<AdditionalIncludeDirectories>$(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
127128
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
128129
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
130+
<ControlFlowGuard>Guard</ControlFlowGuard>
129131
</ClCompile>
130132
<Link>
131133
<SubSystem>Console</SubSystem>
@@ -147,6 +149,7 @@
147149
<SDLCheck>false</SDLCheck>
148150
<AdditionalIncludeDirectories>$(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
149151
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
152+
<ControlFlowGuard>Guard</ControlFlowGuard>
150153
</ClCompile>
151154
<Link>
152155
<SubSystem>Console</SubSystem>
@@ -171,6 +174,7 @@
171174
<SDLCheck>false</SDLCheck>
172175
<AdditionalIncludeDirectories>$(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
173176
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
177+
<ControlFlowGuard>Guard</ControlFlowGuard>
174178
</ClCompile>
175179
<Link>
176180
<SubSystem>Console</SubSystem>

‎contrib/win32/openssh/libssh.vcxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@
102102
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
103103
<CompileAs>CompileAsC</CompileAs>
104104
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
105+
<ControlFlowGuard>false</ControlFlowGuard>
105106
</ClCompile>
106107
<Link>
107108
<SubSystem>Windows</SubSystem>
@@ -120,6 +121,7 @@
120121
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
121122
<CompileAs>CompileAsC</CompileAs>
122123
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
124+
<ControlFlowGuard>false</ControlFlowGuard>
123125
</ClCompile>
124126
<Link>
125127
<SubSystem>Windows</SubSystem>
@@ -137,6 +139,7 @@
137139
<SDLCheck>false</SDLCheck>
138140
<AdditionalIncludeDirectories>$(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
139141
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
142+
<ControlFlowGuard>false</ControlFlowGuard>
140143
</ClCompile>
141144
<Link>
142145
<SubSystem>Windows</SubSystem>
@@ -157,6 +160,7 @@
157160
<AdditionalIncludeDirectories>$(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
158161
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
159162
<WholeProgramOptimization>true</WholeProgramOptimization>
163+
<ControlFlowGuard>false</ControlFlowGuard>
160164
</ClCompile>
161165
<Link>
162166
<SubSystem>Windows</SubSystem>

‎contrib/win32/openssh/libssh.vcxproj.filters‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@
8888
<ClCompile Include="$(OpenSSH-Src-Path)uuencode.c" />
8989
<ClCompile Include="$(OpenSSH-Src-Path)verify.c" />
9090
<ClCompile Include="$(OpenSSH-Src-Path)xmalloc.c" />
91+
<ClCompile Include="$(OpenSSH-Src-Path)kexgexs.c" />
9192
</ItemGroup>
9293
<ItemGroup>
9394
<ClCompile Include="$(OpenSSH-Src-Path)addrmatch.c">
@@ -129,18 +130,12 @@
129130
<ClCompile Include="$(OpenSSH-Src-Path)channels.c">
130131
<Filter>Source Files</Filter>
131132
</ClCompile>
132-
<ClCompile Include="$(OpenSSH-Src-Path)cipher-3des1.c">
133-
<Filter>Source Files</Filter>
134-
</ClCompile>
135133
<ClCompile Include="$(OpenSSH-Src-Path)cipher-aes.c">
136134
<Filter>Source Files</Filter>
137135
</ClCompile>
138136
<ClCompile Include="$(OpenSSH-Src-Path)cipher-aesctr.c">
139137
<Filter>Source Files</Filter>
140138
</ClCompile>
141-
<ClCompile Include="$(OpenSSH-Src-Path)cipher-bf1.c">
142-
<Filter>Source Files</Filter>
143-
</ClCompile>
144139
<ClCompile Include="$(OpenSSH-Src-Path)cipher-chachapoly.c">
145140
<Filter>Source Files</Filter>
146141
</ClCompile>
@@ -159,9 +154,6 @@
159154
<ClCompile Include="$(OpenSSH-Src-Path)crc32.c">
160155
<Filter>Source Files</Filter>
161156
</ClCompile>
162-
<ClCompile Include="$(OpenSSH-Src-Path)deattack.c">
163-
<Filter>Source Files</Filter>
164-
</ClCompile>
165157
<ClCompile Include="$(OpenSSH-Src-Path)dh.c">
166158
<Filter>Source Files</Filter>
167159
</ClCompile>

‎contrib/win32/openssh/openbsd_compat.vcxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@
200200
<AdditionalIncludeDirectories>$(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)openbsd-compat;$(OpenSSH-Src-Path)libkrb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
201201
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
202202
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
203+
<ControlFlowGuard>Guard</ControlFlowGuard>
203204
</ClCompile>
204205
<Link>
205206
<SubSystem>Windows</SubSystem>
@@ -216,6 +217,7 @@
216217
<AdditionalIncludeDirectories>$(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)openbsd-compat;$(OpenSSH-Src-Path)libkrb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
217218
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
218219
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
220+
<ControlFlowGuard>Guard</ControlFlowGuard>
219221
</ClCompile>
220222
<Link>
221223
<SubSystem>Windows</SubSystem>
@@ -233,6 +235,7 @@
233235
<SDLCheck>false</SDLCheck>
234236
<AdditionalIncludeDirectories>$(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)openbsd-compat;$(OpenSSH-Src-Path)libkrb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
235237
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
238+
<ControlFlowGuard>Guard</ControlFlowGuard>
236239
</ClCompile>
237240
<Link>
238241
<SubSystem>Windows</SubSystem>
@@ -253,6 +256,7 @@
253256
<AdditionalIncludeDirectories>$(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)openbsd-compat;$(OpenSSH-Src-Path)libkrb;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
254257
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
255258
<WholeProgramOptimization>true</WholeProgramOptimization>
259+
<ControlFlowGuard>Guard</ControlFlowGuard>
256260
</ClCompile>
257261
<Link>
258262
<SubSystem>Windows</SubSystem>

‎contrib/win32/openssh/openbsd_compat.vcxproj.filters‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,10 +195,16 @@
195195
<ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\xcrypt.c">
196196
<Filter>Source Files</Filter>
197197
</ClCompile>
198-
<ClCompile Include="..\..\..\openbsd-compat\glob.c">
198+
<ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\bsd-getpagesize.c">
199199
<Filter>Source Files</Filter>
200200
</ClCompile>
201-
<ClCompile Include="..\..\..\openbsd-compat\strcasestr.c">
201+
<ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\recallocarray.c">
202+
<Filter>Source Files</Filter>
203+
</ClCompile>
204+
<ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\glob.c">
205+
<Filter>Source Files</Filter>
206+
</ClCompile>
207+
<ClCompile Include="$(OpenSSH-Src-Path)openbsd-compat\strcasestr.c">
202208
<Filter>Source Files</Filter>
203209
</ClCompile>
204210
</ItemGroup>

‎contrib/win32/openssh/scp.vcxproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@
113113
<SDLCheck>false</SDLCheck>
114114
<AdditionalIncludeDirectories>$(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
115115
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
116+
<ControlFlowGuard>Guard</ControlFlowGuard>
116117
</ClCompile>
117118
<Link>
118119
<SubSystem>Console</SubSystem>
@@ -132,6 +133,8 @@
132133
<SDLCheck>false</SDLCheck>
133134
<AdditionalIncludeDirectories>$(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
134135
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
136+
<ControlFlowGuard>Guard</ControlFlowGuard>
137+
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
135138
</ClCompile>
136139
<Link>
137140
<SubSystem>Console</SubSystem>
@@ -153,6 +156,7 @@
153156
<SDLCheck>false</SDLCheck>
154157
<AdditionalIncludeDirectories>$(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
155158
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
159+
<ControlFlowGuard>Guard</ControlFlowGuard>
156160
</ClCompile>
157161
<Link>
158162
<SubSystem>Console</SubSystem>
@@ -177,6 +181,7 @@
177181
<SDLCheck>false</SDLCheck>
178182
<AdditionalIncludeDirectories>$(SolutionDir);$(LibreSSL-Path)include;$(OpenSSH-Src-Path)includes;$(OpenSSH-Src-Path);$(OpenSSH-Src-Path)contrib\win32\win32compat;$(OpenSSH-Src-Path)libkrb;$(OpenSSH-Src-Path)libkrb\libKrb5;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
179183
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
184+
<ControlFlowGuard>Guard</ControlFlowGuard>
180185
</ClCompile>
181186
<Link>
182187
<SubSystem>Console</SubSystem>

0 commit comments

Comments
 (0)