Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
9654a8c
[libfido2] New port
xgcssch Mar 30, 2021
aee4aa3
[libfido2] Update versions
xgcssch Mar 30, 2021
a2b0586
[libfido2] Fixed invalid dll rename in static library versions
xgcssch Mar 30, 2021
30f26d3
[libfido2] Update versions
xgcssch Mar 30, 2021
9bd3ec2
[libfido2] Exclude UWP from supported platforms
xgcssch Mar 30, 2021
6f4db5b
[libfido2] Update versions
xgcssch Mar 30, 2021
d3efc1f
[libfido2] Bump version to new upstream 1.7 release
xgcssch Mar 31, 2021
6f8c278
[libfido2] Update versions
xgcssch Mar 31, 2021
bb92335
Fix indenting
xgcssch Mar 31, 2021
9f8cfe4
[libfido2] Implement multiple issues/suggestions from PR
xgcssch Mar 31, 2021
82225fb
[libfido2] Update versions
xgcssch Mar 31, 2021
5e0ccd0
[libfido2] Removed surplus option from vcpkg_from_github
xgcssch Apr 1, 2021
be02f6d
[libfido2] Update versions
xgcssch Apr 1, 2021
8d6bff6
[libfido2] Apply suggested changes to use the new vcpkg-cmake port
xgcssch Apr 13, 2021
0d0a91e
[libfido2] Update versions
xgcssch Apr 13, 2021
a380804
[libfido2] Reapply formatting
xgcssch Apr 13, 2021
6d93ab6
[libfido2] Update versions
xgcssch Apr 13, 2021
9775fdf
[libfido2] Changed dependency entry for vcpkg-cmake
xgcssch Apr 14, 2021
5a73578
[libfido2] Update versions
xgcssch Apr 14, 2021
0467e28
[libfido2] New port
xgcssch Mar 30, 2021
9ac8b2d
[libfido2] Update versions
xgcssch Mar 30, 2021
a0a2eaa
[libfido2] Fixed invalid dll rename in static library versions
xgcssch Mar 30, 2021
3dd0bc8
[libfido2] Update versions
xgcssch Mar 30, 2021
38bcef0
[libfido2] Exclude UWP from supported platforms
xgcssch Mar 30, 2021
915bbe1
[libfido2] Update versions
xgcssch Mar 30, 2021
954a4f8
[libfido2] Bump version to new upstream 1.7 release
xgcssch Mar 31, 2021
d4813db
[libfido2] Update versions
xgcssch Mar 31, 2021
51dbcfb
Fix indenting
xgcssch Mar 31, 2021
95231b7
[libfido2] Implement multiple issues/suggestions from PR
xgcssch Mar 31, 2021
a362d9a
[libfido2] Update versions
xgcssch Mar 31, 2021
08d2ff3
[libfido2] Removed surplus option from vcpkg_from_github
xgcssch Apr 1, 2021
c18fcff
[libfido2] Update versions
xgcssch Apr 1, 2021
3cc6885
[libfido2] Apply suggested changes to use the new vcpkg-cmake port
xgcssch Apr 13, 2021
7ca2836
[libfido2] Update versions
xgcssch Apr 13, 2021
3a7e6ab
[libfido2] Reapply formatting
xgcssch Apr 13, 2021
dfc029d
[libfido2] Update versions
xgcssch Apr 13, 2021
2601147
[libfido2] Changed dependency entry for vcpkg-cmake
xgcssch Apr 14, 2021
2d2b93f
[libfido2] Update versions
xgcssch Apr 14, 2021
ae3a0b6
Rebase to head
xgcssch May 1, 2021
7a93e3f
Merge remote-tracking branch 'upstream/master' into libfido2
strega-nil May 5, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 48 additions & 0 deletions ports/libfido2/fix_cmakelists.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1eb8726..b308597 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -161,16 +161,20 @@ if(UNIX)
endif()

if(MSVC)
- if((NOT CBOR_INCLUDE_DIRS) OR (NOT CBOR_LIBRARY_DIRS) OR
- (NOT CRYPTO_INCLUDE_DIRS) OR (NOT CRYPTO_LIBRARY_DIRS) OR
- (NOT ZLIB_INCLUDE_DIRS) OR (NOT ZLIB_LIBRARY_DIRS))
- message(FATAL_ERROR "please provide definitions for "
- "{CBOR,CRYPTO,ZLIB}_{INCLUDE,LIBRARY}_DIRS when building "
- "under msvc")
- endif()
- set(CBOR_LIBRARIES cbor)
- set(ZLIB_LIBRARIES zlib)
- set(CRYPTO_LIBRARIES crypto-46)
+ include(FindPkgConfig)
+
+ find_package(LIBCBOR REQUIRED)
+ find_package(OpenSSL REQUIRED)
+ find_package(ZLIB REQUIRED)
+
+ # Handling of different Packagenames in VCPKG
+ set(CBOR_INCLUDE_DIRS ${LIBCBOR_INCLUDE_DIR})
+ set(CRYPTO_INCLUDE_DIRS ${OPENSSL_INCLUDE_DIRS})
+ set(CBOR_LIBRARY_DIRS ${LIBCBOR_LIBRARY_DIRS})
+ set(CRYPTO_LIBRARY_DIRS ${OPENSSL_LIBRARY_DIRS})
+ set(CBOR_LIBRARIES ${LIBCBOR_LIBRARIES})
+ set(CRYPTO_LIBRARIES ${OPENSSL_LIBRARIES})
+ add_definitions("-D_CRT_SECURE_NO_WARNINGS" "-D_CRT_NONSTDC_NO_DEPRECATE")
set(MSVC_DISABLED_WARNINGS_LIST
"C4200" # nonstandard extension used: zero-sized array in
# struct/union;
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 11b0bb5..d820ff3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -120,7 +120,7 @@ if(BUILD_SHARED_LIBS)
install(TARGETS fido2_shared
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
- RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif()

install(FILES fido.h DESTINATION include)
29 changes: 29 additions & 0 deletions ports/libfido2/portfile.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Yubico/libfido2
REF 1.7.0
SHA512 f40d394883d909e9e3ea3308b32f7ca31a882c709e11b3b143ed5734d16b0c244d4932effe06965d566776b03d152b1fc280e73cdfeeb81b65d8414042af19fe
HEAD_REF master
PATCHES
"fix_cmakelists.patch"
)

string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" LIBFIDO2_BUILD_STATIC)
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" LIBFIDO2_BUILD_SHARED)

vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS
-DBUILD_EXAMPLES=OFF
-DBUILD_MANPAGES=OFF
-DBUILD_STATIC_LIBS=${LIBFIDO2_BUILD_STATIC}
-DBUILD_SHARED_LIBS=${LIBFIDO2_BUILD_SHARED}
-DBUILD_TOOLS=OFF
)

vcpkg_cmake_install()
vcpkg_copy_pdbs()

file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

configure_file(${SOURCE_PATH}/LICENSE ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright COPYONLY)
16 changes: 16 additions & 0 deletions ports/libfido2/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"name": "libfido2",
"version": "1.7.0",
"description": "Provides library functionality to communicate with a FIDO device over USB, and to verify attestation and assertion signatures.",
"homepage": "https://developers.yubico.com/libfido2/",
"supports": "!uwp & (x86 | x64) & windows",
"dependencies": [
"libcbor",
"openssl",
{
"name": "vcpkg-cmake",
"host": true
},
"zlib"
]
}
4 changes: 4 additions & 0 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -3080,6 +3080,10 @@
"baseline": "3.3",
"port-version": 8
},
"libfido2": {
"baseline": "1.7.0",
"port-version": 0
},
"libflac": {
"baseline": "1.3.3",
"port-version": 5
Expand Down
9 changes: 9 additions & 0 deletions versions/l-/libfido2.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"versions": [
{
"git-tree": "170a0bcbc2f58e140205858db504ecfe7ade1a9f",
"version": "1.7.0",
"port-version": 0
}
]
}