diff --git a/CMakeLists.txt b/CMakeLists.txt index ca8d1e60..2630e263 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,7 +43,7 @@ option(BUILD_STATIC_LIBS "Build a static library" ON) option(BUILD_TOOLS "Build tool programs" ON) option(FUZZ "Enable fuzzing instrumentation" OFF) option(USE_HIDAPI "Use hidapi as the HID backend" OFF) -option(USE_PCSC "Enable experimental PCSC support" ON) +option(USE_PCSC "Enable experimental PCSC support" OFF) option(USE_WINHELLO "Abstract Windows Hello as a FIDO device" ON) option(NFC_LINUX "Enable NFC support on Linux" ON) diff --git a/NEWS b/NEWS index 68e0afef..6b410b38 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,13 @@ +* Version 1.16.0 (unreleased) + ** Added support for enterprise attestation. + ** Improved handling of invalid key handles in U2F key lookup; gh#819. + ** Fixed issue where storing small CTAP 2.1 largeBlobs failed; gh#826. + ** Fixed APDU chaining issues for certain authenticators; gh#818, gh#855. + ** Improved documentation and examples. + ** New API calls: + - fido_cred_entattest; + - fido_cred_set_entattest. + * Version 1.15.0 (2024-06-13) ** 1.15.0 will be the last release to support OpenSSL 1.1. ** bio, credman: improved CTAP 2.1 support. diff --git a/windows/build.ps1 b/windows/build.ps1 index 8e612766..a26ae1bf 100644 --- a/windows/build.ps1 +++ b/windows/build.ps1 @@ -78,10 +78,6 @@ if (-Not (Test-Path $GPG)) { if ($Arch -eq "ARM" -and [string]::IsNullOrEmpty($WinSDK)) { $WinSDK = '10.0.22621.0' } -# Override Windows SDK version if $WinSDK is set. -if (-Not ([string]::IsNullOrEmpty($WinSDK))) { - $Arch = "$Arch,version=$WinSDK" -} Write-Host "WinSDK: $WinSDK" Write-Host "Config: $Config" @@ -112,6 +108,11 @@ New-Item -Type Directory "${OUTPUT}" -Force New-Item -Type Directory "${OUTPUT}\${Arch}" -Force New-Item -Type Directory "${OUTPUT}\${Arch}\${Type}" -force +# Override Windows SDK version if $WinSDK is set. +if (-Not ([string]::IsNullOrEmpty($WinSDK))) { + $Arch = "$Arch,version=$WinSDK" +} + # Fetch and verify dependencies. Push-Location ${BUILD} try {