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

Switched to use MS mirror of libfido2 (#561)

Browse Source
This commit is contained in:
Andrew 2022-02-04 13:07:05 -08:00 committed by GitHub
parent 66b991a47c
commit 762704b8b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
contrib/win32/openssh/GetFIDO2.ps1
View File

@ -36,7 +36,7 @@ Write-Host "override:$override"
$zip_path = Join-Path $PSScriptRoot "libfido2.zip" $zip_path = Join-Path $PSScriptRoot "libfido2.zip"
$release_url = "https://developers.yubico.com/libfido2/Releases/libfido2-$version-win.zip" $release_url = "https://github.com/PowerShell/libfido2/releases/download/$version/libfido2.zip"
Write-Host "release_url:$release_url" Write-Host "release_url:$release_url"
[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 -bor ` [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 -bor `
@ -51,13 +51,12 @@ if(-not (Test-Path $zip_path))
} }
# XXX check pgp sig? # XXX check pgp sig?
Expand-Archive -Path $zip_path -DestinationPath $destDir -Force -ErrorAction SilentlyContinue -ErrorVariable e Expand-Archive -Path $zip_path -DestinationPath $destDir\libfido2 -Force -ErrorAction SilentlyContinue -ErrorVariable e
if($e -ne $null) if($e -ne $null)
{ {
throw "Error when expand zip file. libfido2 version:$version" throw "Error when expand zip file. libfido2 version:$version"
} }
Rename-Item -Path $destDir\libfido2-$version-win -NewName libfido2
Remove-Item $zip_path -Force -ErrorAction SilentlyContinue Remove-Item $zip_path -Force -ErrorAction SilentlyContinue
Write-Host "Succesfully downloaded libfido2 version:$version" Write-Host "Succesfully downloaded libfido2 version:$version"

8
contrib/win32/openssh/paths.targets
View File

@ -13,10 +13,10 @@
<LibreSSL-arm64-Path>$(SolutionDir)\LibreSSL\bin\desktop\arm64\</LibreSSL-arm64-Path> <LibreSSL-arm64-Path>$(SolutionDir)\LibreSSL\bin\desktop\arm64\</LibreSSL-arm64-Path>
<LibreSSL-arm-Path>$(SolutionDir)\LibreSSL\bin\desktop\arm\</LibreSSL-arm-Path> <LibreSSL-arm-Path>$(SolutionDir)\LibreSSL\bin\desktop\arm\</LibreSSL-arm-Path>
<fido2-Path>$(SolutionDir)\libfido2\</fido2-Path> <fido2-Path>$(SolutionDir)\libfido2\</fido2-Path>
<fido2-x86-Path>$(SolutionDir)\libfido2\Win32\Release\v143\static\</fido2-x86-Path> <fido2-x86-Path>$(SolutionDir)\libfido2\Win32\Release\static\</fido2-x86-Path>
<fido2-x64-Path>$(SolutionDir)\libfido2\Win64\Release\v143\static\</fido2-x64-Path> <fido2-x64-Path>$(SolutionDir)\libfido2\Win64\Release\static\</fido2-x64-Path>
<fido2-arm64-Path>$(SolutionDir)\libfido2\ARM64\Release\v143\static\</fido2-arm64-Path> <fido2-arm64-Path>$(SolutionDir)\libfido2\ARM64\Release\static\</fido2-arm64-Path>
<fido2-arm-Path>$(SolutionDir)\libfido2\ARM\Release\v143\static\</fido2-arm-Path> <fido2-arm-Path>$(SolutionDir)\libfido2\ARM\Release\static\</fido2-arm-Path>
<ZLib-Path>$(SolutionDir)\ZLib\sdk\</ZLib-Path> <ZLib-Path>$(SolutionDir)\ZLib\sdk\</ZLib-Path>
<ZLib-x86-Path>$(SolutionDir)\ZLib\bin\x86\</ZLib-x86-Path> <ZLib-x86-Path>$(SolutionDir)\ZLib\bin\x86\</ZLib-x86-Path>
<ZLib-x64-Path>$(SolutionDir)\ZLib\bin\x64\</ZLib-x64-Path> <ZLib-x64-Path>$(SolutionDir)\ZLib\bin\x64\</ZLib-x64-Path>