tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-28 08:14:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

add ssh-pkcs11-helper.exe to build output, fix create_no_window for ssh-sk-helper.exe (#579)

Browse Source
This commit is contained in:
bagajjal 2022-03-16 16:48:29 -07:00 committed by GitHub
parent 5d6a3f5641
commit b90820169b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/win32/openssh/OpenSSHBuildHelper.psm1
View File

@ -374,7 +374,7 @@ function Start-OpenSSHPackage
$buildDir = Join-Path $repositoryRoot ("bin\" + $folderName + "\" + $Configuration) $buildDir = Join-Path $repositoryRoot ("bin\" + $folderName + "\" + $Configuration)
$payload = "sshd.exe", "ssh.exe", "ssh-agent.exe", "ssh-add.exe", "sftp.exe" $payload = "sshd.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" $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 += "sshd_config_default", "install-sshd.ps1", "uninstall-sshd.ps1"
$payload += "FixHostFilePermissions.ps1", "FixUserFilePermissions.ps1", "OpenSSHUtils.psm1", "OpenSSHUtils.psd1" $payload += "FixHostFilePermissions.ps1", "FixUserFilePermissions.ps1", "OpenSSHUtils.psm1", "OpenSSHUtils.psd1"
$payload += "openssh-events.man", "moduli", "LICENSE.txt", "NOTICE.txt" $payload += "openssh-events.man", "moduli", "LICENSE.txt", "NOTICE.txt"

10
contrib/win32/win32compat/w32fd.c
View File

@ -1074,7 +1074,15 @@ spawn_child_internal(const char* cmd, char *const argv[], HANDLE in, HANDLE out,
if (strstr(cmd, "sshd.exe")) { if (strstr(cmd, "sshd.exe")) {
flags |= DETACHED_PROCESS; flags |= DETACHED_PROCESS;
} }
if (strstr(cmd, "ssh-pkcs11-helper.exe") || is_bash_test_env()) {
char* fidoDebug = NULL;
size_t len = 0;
_dupenv_s(&fidoDebug, &len, "FIDO_DEBUG");
if (is_bash_test_env() ||
(strstr(cmd, "ssh-pkcs11-helper.exe")) ||
((fidoDebug == NULL) && strstr(cmd, "ssh-sk-helper.exe"))) {
debug3("Creating process with CREATE_NO_WINDOW");
flags |= CREATE_NO_WINDOW; flags |= CREATE_NO_WINDOW;
} }