add sshd-auth project

Author: tgauth

contrib/win32/install/server.wxs

@@ -9,6 +9,9 @@
             <Component>
                 <File Name="ssh-shellhost.exe" KeyPath="yes" />
             </Component>
+            <Component>
+                <File Name="sshd-auth.exe" KeyPath="yes" />
+            </Component>
             <Component>
                 <File Name="sshd-session.exe" KeyPath="yes" />
             </Component>

contrib/win32/openssh/OpenSSHBuildHelper.psm1

@@ -8,7 +8,7 @@ Import-Module $PSScriptRoot\OpenSSHCommonUtils.psm1 -Force
 [bool] $script:Verbose = $false
 [string] $script:BuildLogFile = $null
 <#
-    Called by Write-BuildMsg to write to the build log, if it exists. 
+    Called by Write-BuildMsg to write to the build log, if it exists.
 #>
 function Write-Log
 {
@@ -22,7 +22,7 @@ function Write-Log
     if (-not ([string]::IsNullOrEmpty($script:BuildLogFile)))
     {
         Add-Content -Path $script:BuildLogFile -Value $Message
-    }  
+    }
 }
 
 <#
@@ -94,7 +94,7 @@ function Write-BuildMsg
         return
     }
 
-    if($PSBoundParameters.ContainsKey("AsInfo"))    
+    if($PSBoundParameters.ContainsKey("AsInfo"))
     {
         Write-Log -Message "INFO: $message"
         if (-not $Silent)
@@ -151,7 +151,7 @@ function Start-OpenSSHBootstrap
 
     # Add git\cmd to the path
     $machinePath = [Environment]::GetEnvironmentVariable('Path', 'MACHINE')
-    $newMachineEnvironmentPath = $machinePath 
+    $newMachineEnvironmentPath = $machinePath
     $gitCmdPath = "$env:ProgramFiles\git\cmd"
     if (-not ($machinePath.ToLower().Contains($gitCmdPath.ToLower())))
     {
@@ -171,10 +171,10 @@ function Start-OpenSSHBootstrap
     if ($newMachineEnvironmentPath -ne $machinePath)
     {
         [Environment]::SetEnvironmentVariable('Path', $newMachineEnvironmentPath, 'MACHINE')
-    }    
+    }
 
     $sdkVersion = Get-Windows10SDKVersion
-    if ($null -eq $sdkVersion) 
+    if ($null -eq $sdkVersion)
     {
         Get-Chocolatey
         $packageName = "windows-sdk-10.1"
@@ -196,7 +196,7 @@ function Start-OpenSSHBootstrap
     else {
         $MSBuildPath = Get-VS2015BuildToolPath
     }
-    if ($MSBuildPath | Select-String "2022") 
+    if ($MSBuildPath | Select-String "2022")
     {
         $env:vctargetspath = Join-Path $VisualStudioPath "MSBuild\Microsoft\VC\v170\"
         if ($null -eq $env:VS170COMNTOOLS)
@@ -205,11 +205,11 @@ function Start-OpenSSHBootstrap
         }
         elseif (-not (Test-Path $env:VS170COMNTOOLS))
         {
-            Write-BuildMsg -AsError -ErrorAction Stop -Message "$env:VS170COMNTOOLS build tools path is invalid"   
+            Write-BuildMsg -AsError -ErrorAction Stop -Message "$env:VS170COMNTOOLS build tools path is invalid"
         }
         $VSBuildToolsPath = Get-Item(Join-Path $VisualStudioPath 'vc/auxiliary/build')
     }
-    elseif ($MSBuildPath | Select-String "2019") 
+    elseif ($MSBuildPath | Select-String "2019")
     {
         $env:vctargetspath = Join-Path $VisualStudioPath "Common7\IDE\VC\VCTargets"
         Write-BuildMsg -AsVerbose -Message "Setting vctargetspath env var to ${env:vctargetspath}"
@@ -219,11 +219,11 @@ function Start-OpenSSHBootstrap
         }
         elseif (-not (Test-Path $env:VS160COMNTOOLS))
         {
-            Write-BuildMsg -AsError -ErrorAction Stop -Message "$env:VS160COMNTOOLS build tools path is invalid"   
+            Write-BuildMsg -AsError -ErrorAction Stop -Message "$env:VS160COMNTOOLS build tools path is invalid"
         }
         $VSBuildToolsPath = Get-Item(Join-Path $VisualStudioPath 'vc/auxiliary/build')
     }
-    elseif ($MSBuildPath | Select-String "2017") 
+    elseif ($MSBuildPath | Select-String "2017")
     {
         $env:vctargetspath = Join-Path $VisualStudioPath "Common7\IDE\VC\VCTargets"
         if ($null -eq $env:VS150COMNTOOLS)
@@ -232,11 +232,11 @@ function Start-OpenSSHBootstrap
         }
         elseif (-not (Test-Path $env:VS150COMNTOOLS))
         {
-            Write-BuildMsg -AsError -ErrorAction Stop -Message "$env:VS150COMNTOOLS build tools path is invalid"   
+            Write-BuildMsg -AsError -ErrorAction Stop -Message "$env:VS150COMNTOOLS build tools path is invalid"
         }
         $VSBuildToolsPath = Get-Item(Join-Path $VisualStudioPath 'vc/auxiliary/build')
     }
-    else 
+    else
     {
         if($NativeHostArch.ToLower().Startswith('arm'))
         {
@@ -246,7 +246,7 @@ function Start-OpenSSHBootstrap
 
         $VSBuildToolsPath = Get-Item(Join-Path -Path $env:VS140COMNTOOLS -ChildPath '../../vc')
         Write-BuildMsg -AsVerbose -Message 'VC++ 2015 Build Tools already present.'
-        
+
         if (!$MSBuildPath -or ($null -eq $env:VS140COMNTOOLS)) {
             Get-Chocolatey
             $packageName = "vcbuildtools"
@@ -287,15 +287,15 @@ function Start-OpenSSHBootstrap
     Write-BuildMsg -AsVerbose -Message "vcPath: $script:vcPath" -Silent:$silent
     if ((Test-Path -Path "$script:vcPath\vcvarsall.bat") -eq $false)
     {
-        Write-BuildMsg -AsError -ErrorAction Stop -Message "Could not find Visual Studio vcvarsall.bat at $script:vcPath, which means some required develop kits are missing on the machine." 
+        Write-BuildMsg -AsError -ErrorAction Stop -Message "Could not find Visual Studio vcvarsall.bat at $script:vcPath, which means some required develop kits are missing on the machine."
     }
 }
 
 function Start-OpenSSHPackage
 {
-    [CmdletBinding(SupportsShouldProcess=$false)]    
+    [CmdletBinding(SupportsShouldProcess=$false)]
     param
-    (        
+    (
         [ValidateSet('x86', 'x64', 'arm64', 'arm')]
         [string]$NativeHostArch = "x64",
 
@@ -314,10 +314,10 @@ function Start-OpenSSHPackage
     if($NativeHostArch -ieq 'x86')
     {
         $folderName = "Win32"
-    }    
+    }
 
     $buildDir = Join-Path $repositoryRoot ("bin\" + $folderName + "\" + $Configuration)
-    $payload =  "sshd.exe", "sshd-session.exe", "ssh.exe", "ssh-agent.exe", "ssh-add.exe", "sftp.exe"
+    $payload =  "sshd.exe", "sshd-auth.exe", "sshd-session.exe", "ssh.exe", "ssh-agent.exe", "ssh-add.exe", "sftp.exe"
     $payload += "sftp-server.exe", "scp.exe", "ssh-shellhost.exe", "ssh-keygen.exe", "ssh-keyscan.exe", "ssh-sk-helper.exe", "ssh-pkcs11-helper.exe"
     $payload += "sshd_config_default", "install-sshd.ps1", "uninstall-sshd.ps1"
     $payload += "FixHostFilePermissions.ps1", "FixUserFilePermissions.ps1", "OpenSSHUtils.psm1", "OpenSSHUtils.psd1"
@@ -335,20 +335,20 @@ function Start-OpenSSHPackage
     }
 
     while((($service = Get-Service ssh-agent -ErrorAction SilentlyContinue) -ne $null) -and ($service.Status -ine 'Stopped'))
-    {        
+    {
         Stop-Service ssh-agent -Force
-        #sleep to wait the servicelog file write        
+        #sleep to wait the servicelog file write
         Start-Sleep 5
     }
 
     $packageDir = Join-Path $buildDir $packageName
     Remove-Item $packageDir -Recurse -Force -ErrorAction SilentlyContinue
     New-Item $packageDir -Type Directory | Out-Null
-    
+
     $symbolsDir = Join-Path $buildDir ($packageName + '_Symbols')
     Remove-Item $symbolsDir -Recurse -Force -ErrorAction SilentlyContinue
     New-Item $symbolsDir -Type Directory | Out-Null
-       
+
     foreach ($file in $payload) {
         if ((-not(Test-Path (Join-Path $buildDir $file)))) {
             Throw "Cannot find $file under $buildDir. Did you run Build-OpenSSH?"
@@ -367,7 +367,7 @@ function Start-OpenSSHPackage
     #copy libcrypto dll
     $libreSSLPath = Join-Path $PSScriptRoot "LibreSSL"
     if (-not $NoOpenSSL.IsPresent)
-    {        
+    {
         if($OneCore)
         {
             Copy-Item -Path $(Join-Path $libreSSLPath "bin\onecore\$NativeHostArch\libcrypto.dll") -Destination $packageDir -Force -ErrorAction Stop
@@ -378,10 +378,10 @@ function Start-OpenSSHPackage
             Copy-Item -Path $(Join-Path $libreSSLPath "bin\desktop\$NativeHostArch\libcrypto.dll") -Destination $packageDir -Force -ErrorAction Stop
             Copy-Item -Path $(Join-Path $libreSSLPath "bin\desktop\$NativeHostArch\libcrypto.pdb") -Destination $symbolsDir -Force -ErrorAction Stop
         }
-    }    
+    }
 
     if ($DestinationPath -ne "") {
-        if (Test-Path $DestinationPath) {            
+        if (Test-Path $DestinationPath) {
             Remove-Item $DestinationPath\* -Force -Recurse -ErrorAction SilentlyContinue
         }
         else {
@@ -403,7 +403,7 @@ function Start-OpenSSHPackage
         }
     }
     Remove-Item $packageDir -Recurse -Force -ErrorAction SilentlyContinue
-    
+
     if ($DestinationPath -ne "") {
         Copy-Item -Path $symbolsDir\* -Destination $DestinationPath -Force -Recurse
         Write-BuildMsg -AsInfo -Message "Copied symbols to $DestinationPath"
@@ -425,9 +425,9 @@ function Start-OpenSSHPackage
 
 function Copy-OpenSSHUnitTests
 {
-    [CmdletBinding(SupportsShouldProcess=$false)]    
+    [CmdletBinding(SupportsShouldProcess=$false)]
     param
-    (        
+    (
         [ValidateSet('x86', 'x64', 'arm64', 'arm')]
         [string]$NativeHostArch = "x64",
 
@@ -447,18 +447,18 @@ function Copy-OpenSSHUnitTests
     }
     $buildDir = Join-Path $repositoryRoot ("bin\" + $folderName + "\" + $Configuration)
     $unittestsDir = Join-Path $buildDir "unittests"
-    $unitTestFolders = Get-ChildItem -Directory $buildDir\unittest-*    
-    
+    $unitTestFolders = Get-ChildItem -Directory $buildDir\unittest-*
+
     if ($DestinationPath -ne "") {
         if (-not (Test-Path $DestinationPath -PathType Container)) {
             New-Item -ItemType Directory $DestinationPath -Force | Out-Null
         }
         foreach ($folder in $unitTestFolders) {
             Copy-Item $folder.FullName $DestinationPath\$($folder.Name) -Recurse -Force
             Write-BuildMsg -AsInfo -Message "Copied $($folder.FullName) to $DestinationPath\$($folder.Name)."
-        }        
+        }
     }
-    else {        
+    else {
         if(Test-Path ($unittestsDir + '.zip') -PathType Leaf) {
             Remove-Item ($unittestsDir + '.zip') -Force -ErrorAction SilentlyContinue
         }
@@ -476,9 +476,9 @@ function Copy-OpenSSHUnitTests
 
 function Start-OpenSSHBuild
 {
-    [CmdletBinding(SupportsShouldProcess=$false)]    
+    [CmdletBinding(SupportsShouldProcess=$false)]
     param
-    (        
+    (
         [ValidateSet('x86', 'x64', 'arm64', 'arm')]
         [string]$NativeHostArch = "x64",
 
@@ -488,7 +488,7 @@ function Start-OpenSSHBuild
         [switch]$NoOpenSSL,
 
         [switch]$OneCore
-    )    
+    )
     $script:BuildLogFile = $null
 
     [System.IO.DirectoryInfo] $repositoryRoot = Get-RepositoryRoot
@@ -512,8 +512,8 @@ function Start-OpenSSHBuild
     Start-OpenSSHBootstrap -NativeHostArch $NativeHostArch -OneCore:$OneCore
 
     $PathTargets = Join-Path -Path $PSScriptRoot -ChildPath 'paths.targets'
-    if ($NoOpenSSL) 
-    {        
+    if ($NoOpenSSL)
+    {
         [XML]$xml = Get-Content $PathTargets
         $xml.Project.PropertyGroup.UseOpenSSL = 'false'
         $xml.Project.PropertyGroup.SSLLib = [string]::Empty
@@ -523,11 +523,11 @@ function Start-OpenSSHBuild
         (Get-Content $f).Replace('#define OPENSSL_HAS_ECC 1','') | Set-Content $f
         (Get-Content $f).Replace('#define OPENSSL_HAS_NISTP521 1','') | Set-Content $f
     }
-    
+
     $win10SDKVer = Get-Windows10SDKVersion
     [XML]$xml = Get-Content $PathTargets
     $xml.Project.PropertyGroup.WindowsSDKVersion = $win10SDKVer.ToString()
-    
+
     if($NativeHostArch.ToLower().Startswith('arm'))
     {
         $arch = $NativeHostArch.ToUpper()
@@ -538,7 +538,7 @@ function Start-OpenSSHBuild
             $newElement =$xml.CreateElement($nodeName, $xml.Project.xmlns)
             $newNode = $xml.Project.PropertyGroup.AppendChild($newElement)
             $null = $newNode.AppendChild($xml.CreateTextNode("true"))
-        } 
+        }
         else
         {
             $node.InnerText = "true"
@@ -553,18 +553,18 @@ function Start-OpenSSHBuild
         $xml.Project.PropertyGroup.WindowsSDKVersion = $win10SDKVer
         $xml.Project.PropertyGroup.AdditionalDependentLibs = 'onecore.lib;shlwapi.lib'
         $xml.Project.PropertyGroup.MinimalCoreWin = 'true'
-        
+
         #Use onecore libcrypto binaries
         $xml.Project.PropertyGroup."LibreSSL-x86-Path" = '$(SolutionDir)\LibreSSL\bin\onecore\x86\'
         $xml.Project.PropertyGroup."LibreSSL-x64-Path" = '$(SolutionDir)\LibreSSL\bin\onecore\x64\'
         $xml.Project.PropertyGroup."LibreSSL-arm-Path" = '$(SolutionDir)\LibreSSL\bin\onecore\arm\'
         $xml.Project.PropertyGroup."LibreSSL-arm64-Path" = '$(SolutionDir)\LibreSSL\bin\onecore\arm64\'
-        
+
         $xml.Save($PathTargets)
     }
-    
+
     $solutionFile = Get-SolutionFile -root $repositoryRoot.FullName
-    $cmdMsg = @("${solutionFile}", "/t:Rebuild", "/p:Platform=${NativeHostArch}", "/p:Configuration=${Configuration}", "/m", "/nologo", "/fl", "/flp:LogFile=${script:BuildLogFile}`;Append`;Verbosity=diagnostic")    
+    $cmdMsg = @("${solutionFile}", "/t:Rebuild", "/p:Platform=${NativeHostArch}", "/p:Configuration=${Configuration}", "/m", "/nologo", "/fl", "/flp:LogFile=${script:BuildLogFile}`;Append`;Verbosity=diagnostic")
     if($silent)
     {
         $cmdMsg += "/noconlog"
@@ -588,7 +588,7 @@ function Start-OpenSSHBuild
     if ($errorCode -ne 0)
     {
         Write-BuildMsg -AsError -ErrorAction Stop -Message "Build failed for OpenSSH.`nExitCode: $errorCode."
-    }    
+    }
 
     Write-BuildMsg -AsInfo -Message "SSH build successful."
 }
@@ -683,13 +683,13 @@ function Get-BuildToolPath
         if (-not (Test-Path($buildToolsPath)))
         {
             Write-BuildMsg -AsError -ErrorAction Stop -Message "$packageName installation failed with error code $LASTEXITCODE."
-        } 
-    }   
+        }
+    }
     return $buildToolsPath
 }
 
 function Get-Windows10SDKVersion
-{  
+{
     ## Search for latest windows sdk available on the machine
     $windowsSDKPath = Join-Path ${env:ProgramFiles(x86)} "Windows Kits\10\Lib"
     $minSDKVersion = [version]"10.0.17763.0"
@@ -719,7 +719,7 @@ function Get-BuildLogFile
 
         [ValidateSet('x86', 'x64', 'arm64', 'arm')]
         [string]$NativeHostArch = "x64",
-                
+
         [ValidateSet('Debug', 'Release')]
         [string]$Configuration = "Release"
     )
@@ -738,7 +738,7 @@ function Get-SolutionFile
         [Parameter(Mandatory=$true)]
         [ValidateNotNull()]
         [System.IO.DirectoryInfo] $root
-    )    
+    )
     if ($root.FullName -ieq $PSScriptRoot)
     {
         return Join-Path -Path $PSScriptRoot -ChildPath "Win32-OpenSSH.sln"
@@ -761,7 +761,7 @@ function Get-Chocolatey {
     }
 
     $machinePath = [Environment]::GetEnvironmentVariable('Path', 'MACHINE')
-    $newMachineEnvironmentPath = $machinePath   
+    $newMachineEnvironmentPath = $machinePath
 
     if (-not ($machinePath.ToLower().Contains($chocolateyPath.ToLower())))
     {
@@ -781,7 +781,7 @@ function Get-Chocolatey {
     if ($newMachineEnvironmentPath -ne $machinePath)
     {
         [Environment]::SetEnvironmentVariable('Path', $newMachineEnvironmentPath, 'MACHINE')
-    }    
+    }
 }
 
 Export-ModuleMember -Function Start-OpenSSHBuild, Get-BuildLogFile, Start-OpenSSHPackage, Copy-OpenSSHUnitTests