From 1009717eca5d1fc7362c73c145cff2536e8224ffafdf603f73b00b6ceb777dec Mon Sep 17 00:00:00 2001 From: Torsten Gruner Date: Sun, 18 Apr 2021 10:46:52 +0000 Subject: [PATCH] Accepting request 886377 from home:susnux:branches:security Update to version 1.7.0 OBS-URL: https://build.opensuse.org/request/show/886377 OBS-URL: https://build.opensuse.org/package/show/security/libfido2?expand=0&rev=39 --- fix-cmake-linking.patch | 13 +++++++++++++ libfido2-1.6.0.tar.gz | 3 --- libfido2-1.6.0.tar.gz.sig | Bin 310 -> 0 bytes libfido2-1.7.0.tar.gz | 3 +++ libfido2-1.7.0.tar.gz.sig | Bin 0 -> 566 bytes libfido2.changes | 14 ++++++++++++++ libfido2.spec | 15 +++++++++++---- 7 files changed, 41 insertions(+), 7 deletions(-) create mode 100644 fix-cmake-linking.patch delete mode 100644 libfido2-1.6.0.tar.gz delete mode 100644 libfido2-1.6.0.tar.gz.sig create mode 100644 libfido2-1.7.0.tar.gz create mode 100644 libfido2-1.7.0.tar.gz.sig diff --git a/fix-cmake-linking.patch b/fix-cmake-linking.patch new file mode 100644 index 0000000..1bacc5d --- /dev/null +++ b/fix-cmake-linking.patch @@ -0,0 +1,13 @@ +diff -Nur libfido2-1.7.0/src/CMakeLists.txt new/src/CMakeLists.txt +--- libfido2-1.7.0/src/CMakeLists.txt 2021-03-29 17:28:56.000000000 +0200 ++++ new/src/CMakeLists.txt 2021-04-17 04:08:16.614325721 +0200 +@@ -45,6 +45,9 @@ + + if(USE_HIDAPI) + list(APPEND FIDO_SOURCES hid_hidapi.c) ++ if(NOT WIN32 AND NOT APPLE) ++ list(APPEND FIDO_SOURCES hid_unix.c) ++ endif() + elseif(WIN32) + list(APPEND FIDO_SOURCES hid_win.c) + elseif(APPLE) diff --git a/libfido2-1.6.0.tar.gz b/libfido2-1.6.0.tar.gz deleted file mode 100644 index 1866f6c..0000000 --- a/libfido2-1.6.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6aed47aafd22be49c38f9281fb88ccd08c98678d9b8c39cdc87d1bb3ea2c63e4 -size 413904 diff --git a/libfido2-1.6.0.tar.gz.sig b/libfido2-1.6.0.tar.gz.sig deleted file mode 100644 index 6e30f2812194faa584cc647b63ab284f91a18260ac3637a845df725f207fd583..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 310 zcmV-60m=S}0W$;u0SEvc79j+8E-A&_D(QCloTZg9yx|r<*=gAY0$=>*3IGZT5HY;r z7C+f(*?O4={U4(h_Eo+QP7zB%rRWYBxc2Sj@T^+h;%<#{R~#v8n*6YlEBUxn=sg&5 zB6m%?z;j$vT~~|hMkuy-BKH7fkl6f071k6)8c_eMwx=&R9UVl73J-K9#N+?WEdbEr zd0cxtV=#RO2eM+E-#wn$LnoRMMMDJAY#9WQx0Y9d1Fm5d_`>$Q3(tx}2lB2Kivf26 z&N#mhz_iJmQufi^3H9zkaXdXrt)7!Va%UL{j%NET+nc|?_WZ^1M@SMb z9;b+`2>9)LBsX@V$jh`905cm}bUQ@J@fQo;9bvFJeojTL(l_x`Dpw(olKO!OKW8px Ik@}3s7IK@6=l}o! diff --git a/libfido2-1.7.0.tar.gz b/libfido2-1.7.0.tar.gz new file mode 100644 index 0000000..cb215f4 --- /dev/null +++ b/libfido2-1.7.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:116749b2a6c95f6559439494fcebdbe803dff14037017ad239843c84c59d708e +size 517426 diff --git a/libfido2-1.7.0.tar.gz.sig b/libfido2-1.7.0.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..bea772c42dfc9ef0addc4fb946909772e1e29a320441bbd92b8775b4831467eb GIT binary patch literal 566 zcmV-60?GY}0y6{v0SW*e79j*NIH|P95r#;Te0$^g)#{dcm5TRy= zh!^vaY)zF9|7no!)u$gSIrHa-Nk#|@{tr7?gv+0$j+eN2QPfV~i8K6``?qHkeXJ${ z0BKGn&O5?NL9+D%N+x+@!3!Xbo*1i6%nuAfwkEyUzqBuTZ%(^|T2!e9^}NdhP&9cl z{){Iine6$8OAagCZp`hk8_0-+spjyLu{E~$4YqrF)@t6u{t6o_qJh2-HriKt+VA0T z%J-buNbN-=bj>SGOnd{+JUk5MP)9#MBTnIyH3f60t~Zz-1bDWGpjni+|BRCC5gI2I za)k-IrhRYKrqVN5gEz|imQ2Q|Y14{J!K=#tEuO13wdb8`ef7Dv3>mUE7WVH~RFDxanfg}|vFV35z?!t5qWyu=ufe8_qz+)P|>pYG28T#2>z=EHe6PBa8igrFXtr;lPDf;Q#waiYNIxvO%!ZXe2QO`y|%VW)013Niw%690QxXrJM9B@o% zFyxw5*OD}#ob1TKtv@Wa-{)B$rjT#r=Q>?&BD{imj+@g&oL$Hvbxs@+8A);a>3s68 zyv-m~RKI34eVavI-AuP3rH$lKYgGZ$nrs|N^U>`v{NZ + +- Update to version 1.7.0: + * hid_win: detect devices with vendor or product IDs > 0x7fff + * Support for FIDO 2.1 authenticator configuration. + * Support for FIDO 2.1 UV token permissions. + * Support for FIDO 2.1 "credBlobs" and "largeBlobs" extensions. + * New API calls + * New fido_init flag to disable fido_dev_open’s U2F fallback + * Experimental NFC support on Linux. +- Enabled hidapi again, issues related to hidapi are fixed upstream + * Added fix-cmake-linking.patch to fix linking + ------------------------------------------------------------------- Wed Jan 20 09:46:41 UTC 2021 - Martin Pluskal diff --git a/libfido2.spec b/libfido2.spec index b09773e..47045f3 100644 --- a/libfido2.spec +++ b/libfido2.spec @@ -18,20 +18,25 @@ %define sover 1 Name: libfido2 -Version: 1.6.0 +Version: 1.7.0 Release: 0 Summary: FIDO U2F and FIDO 2.0 protocols License: BSD-2-Clause +Group: Development/Libraries/C and C++ URL: https://developers.yubico.com/ Source0: https://developers.yubico.com/libfido2/Releases/%{name}-%{version}.tar.gz Source1: https://developers.yubico.com/libfido2/Releases/%{name}-%{version}.tar.gz.sig +# PATCH-FIX-UPSTREAM fix-cmake-linking.patch -- Fix linking when building with hidapi, gh#323 +Patch0: fix-cmake-linking.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: libopenssl-1_1-devel BuildRequires: ninja BuildRequires: pkgconfig +BuildRequires: pkgconfig(hidapi-hidraw) BuildRequires: pkgconfig(libcbor) BuildRequires: pkgconfig(libudev) +BuildRequires: pkgconfig(zlib) %description Provides library functionality for communicating with a FIDO device @@ -60,6 +65,7 @@ This package contains the header file needed to develop applications that use FIDO U2F and FIDO 2.0 protocols. %package -n %{name}-utils +Group: Hardware/Other Summary: Utility programs making use of libfido2, a library for FIDO U2F and FIDO 2.0 Conflicts: libfido2-0_4_0 Conflicts: libfido2-1_0_0 @@ -75,14 +81,15 @@ BuildArch: noarch This package contains the udev rules for FIDO2 compatible devices. %prep -%autosetup +%autosetup -p1 %build %define __builder ninja %cmake \ -DCBOR_LIBRARY_DIRS=%{_libdir} \ - -DUSE_HIDAPI=0 \ - -DBUILD_EXAMPLES=OFF + -DBUILD_EXAMPLES=OFF \ + -DUSE_HIDAPI=ON \ + -DNFC_LINUX=ON %cmake_build %install