diff options
author | tnn <tnn@pkgsrc.org> | 2020-10-22 20:29:44 +0000 |
---|---|---|
committer | tnn <tnn@pkgsrc.org> | 2020-10-22 20:29:44 +0000 |
commit | 5c11c7b84acb4284ac686485382461dd71a311f2 (patch) | |
tree | f6c7665f14ea7d4b385b17cb3d424f5ca6d6b21a | |
parent | 03b0d5d0332f867b2bc5339b61ebd582003fc2e4 (diff) | |
download | pkgsrc-5c11c7b84acb4284ac686485382461dd71a311f2.tar.gz |
libfido2: update to 1.5.0
pkgsrc: also bump bl3 for libcbor solib version change.
hid_linux: return FIDO_OK if no devices are found.
hid_osx:
repair communication with U2F tokens, gh#166; reliability fixes.
fido2-{assert,cred}: new options to explicitly toggle UP, UV.
Support for configurable report lengths.
New API calls:
fido_cbor_info_maxcredcntlst;
fido_cbor_info_maxcredidlen;
fido_cred_aaguid_len;
fido_cred_aaguid_ptr;
fido_dev_get_touch_begin;
fido_dev_get_touch_status.
Use COSE_ECDH_ES256 with CTAP_CBOR_CLIENT_PIN; gh#154.
Allow CTAP messages up to 2048 bytes; gh#171.
Ensure we only list USB devices by default.
-rw-r--r-- | security/libfido2/Makefile | 12 | ||||
-rw-r--r-- | security/libfido2/PLIST | 40 | ||||
-rw-r--r-- | security/libfido2/buildlink3.mk | 4 | ||||
-rw-r--r-- | security/libfido2/distinfo | 12 | ||||
-rw-r--r-- | security/libfido2/patches/patch-src_CMakeLists.txt | 12 |
5 files changed, 59 insertions, 21 deletions
diff --git a/security/libfido2/Makefile b/security/libfido2/Makefile index 95196b62ddc..60f9ff37362 100644 --- a/security/libfido2/Makefile +++ b/security/libfido2/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.1 2020/08/19 16:25:56 riastradh Exp $ +# $NetBSD: Makefile,v 1.2 2020/10/22 20:29:44 tnn Exp $ -DISTNAME= libfido2-1.4.0 +DISTNAME= libfido2-1.5.0 CATEGORIES= security devel MASTER_SITES= ${MASTER_SITE_GITHUB:=Yubico/} GITHUB_PROJECT= ${PKGBASE} @@ -11,14 +11,14 @@ HOMEPAGE= https://developers.yubico.com/libfido2/ COMMENT= U2F/FIDO/FIDO2 library and tools LICENSE= 2-clause-bsd -USE_CMAKE= yes -USE_LANGUAGES= c - +USE_CMAKE= yes +USE_LANGUAGES= c CONFIGURE_DIRS+= build CMAKE_ARG_PATH= .. - CMAKE_ARGS.NetBSD+= -DBASE_LIBRARIES:STRING=usbhid +CHECK_PORTABILITY_SKIP+= misc/hooks + pre-configure: ${MKDIR} ${WRKSRC}/build diff --git a/security/libfido2/PLIST b/security/libfido2/PLIST index cc069574610..29512de7886 100644 --- a/security/libfido2/PLIST +++ b/security/libfido2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2020/08/19 16:25:56 riastradh Exp $ +@comment $NetBSD: PLIST,v 1.2 2020/10/22 20:29:44 tnn Exp $ bin/fido2-assert bin/fido2-cred bin/fido2-token @@ -34,10 +34,14 @@ man/man3/fido_assert_authdata_ptr.3 man/man3/fido_assert_clientdata_hash_len.3 man/man3/fido_assert_clientdata_hash_ptr.3 man/man3/fido_assert_count.3 +man/man3/fido_assert_flags.3 man/man3/fido_assert_free.3 man/man3/fido_assert_hmac_secret_len.3 man/man3/fido_assert_hmac_secret_ptr.3 +man/man3/fido_assert_id_len.3 +man/man3/fido_assert_id_ptr.3 man/man3/fido_assert_new.3 +man/man3/fido_assert_rp_id.3 man/man3/fido_assert_set_authdata.3 man/man3/fido_assert_set_clientdata_hash.3 man/man3/fido_assert_set_count.3 @@ -88,6 +92,8 @@ man/man3/fido_cbor_info_extensions_len.3 man/man3/fido_cbor_info_extensions_ptr.3 man/man3/fido_cbor_info_free.3 man/man3/fido_cbor_info_fwversion.3 +man/man3/fido_cbor_info_maxcredcntlst.3 +man/man3/fido_cbor_info_maxcredidlen.3 man/man3/fido_cbor_info_maxmsgsiz.3 man/man3/fido_cbor_info_new.3 man/man3/fido_cbor_info_options_len.3 @@ -97,11 +103,15 @@ man/man3/fido_cbor_info_protocols_len.3 man/man3/fido_cbor_info_protocols_ptr.3 man/man3/fido_cbor_info_versions_len.3 man/man3/fido_cbor_info_versions_ptr.3 +man/man3/fido_cred_aaguid_len.3 +man/man3/fido_cred_aaguid_ptr.3 man/man3/fido_cred_authdata_len.3 man/man3/fido_cred_authdata_ptr.3 man/man3/fido_cred_clientdata_hash_len.3 man/man3/fido_cred_clientdata_hash_ptr.3 +man/man3/fido_cred_display_name.3 man/man3/fido_cred_exclude.3 +man/man3/fido_cred_flags.3 man/man3/fido_cred_fmt.3 man/man3/fido_cred_free.3 man/man3/fido_cred_id_len.3 @@ -110,6 +120,8 @@ man/man3/fido_cred_new.3 man/man3/fido_cred_prot.3 man/man3/fido_cred_pubkey_len.3 man/man3/fido_cred_pubkey_ptr.3 +man/man3/fido_cred_rp_id.3 +man/man3/fido_cred_rp_name.3 man/man3/fido_cred_set_authdata.3 man/man3/fido_cred_set_authdata_raw.3 man/man3/fido_cred_set_clientdata_hash.3 @@ -125,6 +137,10 @@ man/man3/fido_cred_set_uv.3 man/man3/fido_cred_set_x509.3 man/man3/fido_cred_sig_len.3 man/man3/fido_cred_sig_ptr.3 +man/man3/fido_cred_type.3 +man/man3/fido_cred_user_id_len.3 +man/man3/fido_cred_user_id_ptr.3 +man/man3/fido_cred_user_name.3 man/man3/fido_cred_verify.3 man/man3/fido_cred_x5c_len.3 man/man3/fido_cred_x5c_ptr.3 @@ -157,6 +173,7 @@ man/man3/fido_dev_free.3 man/man3/fido_dev_get_assert.3 man/man3/fido_dev_get_cbor_info.3 man/man3/fido_dev_get_retry_count.3 +man/man3/fido_dev_get_touch_begin.3 man/man3/fido_dev_info_free.3 man/man3/fido_dev_info_manifest.3 man/man3/fido_dev_info_manufacturer_string.3 @@ -176,6 +193,8 @@ man/man3/fido_dev_protocol.3 man/man3/fido_dev_reset.3 man/man3/fido_dev_set_io_functions.3 man/man3/fido_dev_set_pin.3 +man/man3/fido_dev_supports_cred_prot.3 +man/man3/fido_dev_supports_pin.3 man/man3/fido_init.3 man/man3/fido_strerr.3 man/man3/rs256_pk_free.3 @@ -201,10 +220,14 @@ share/doc/libfido2/html/fido_assert_authdata_ptr.html share/doc/libfido2/html/fido_assert_clientdata_hash_len.html share/doc/libfido2/html/fido_assert_clientdata_hash_ptr.html share/doc/libfido2/html/fido_assert_count.html +share/doc/libfido2/html/fido_assert_flags.html share/doc/libfido2/html/fido_assert_free.html share/doc/libfido2/html/fido_assert_hmac_secret_len.html share/doc/libfido2/html/fido_assert_hmac_secret_ptr.html +share/doc/libfido2/html/fido_assert_id_len.html +share/doc/libfido2/html/fido_assert_id_ptr.html share/doc/libfido2/html/fido_assert_new.html +share/doc/libfido2/html/fido_assert_rp_id.html share/doc/libfido2/html/fido_assert_set_authdata.html share/doc/libfido2/html/fido_assert_set_clientdata_hash.html share/doc/libfido2/html/fido_assert_set_count.html @@ -255,6 +278,8 @@ share/doc/libfido2/html/fido_cbor_info_extensions_len.html share/doc/libfido2/html/fido_cbor_info_extensions_ptr.html share/doc/libfido2/html/fido_cbor_info_free.html share/doc/libfido2/html/fido_cbor_info_fwversion.html +share/doc/libfido2/html/fido_cbor_info_maxcredcntlst.html +share/doc/libfido2/html/fido_cbor_info_maxcredidlen.html share/doc/libfido2/html/fido_cbor_info_maxmsgsiz.html share/doc/libfido2/html/fido_cbor_info_new.html share/doc/libfido2/html/fido_cbor_info_options_len.html @@ -264,11 +289,15 @@ share/doc/libfido2/html/fido_cbor_info_protocols_len.html share/doc/libfido2/html/fido_cbor_info_protocols_ptr.html share/doc/libfido2/html/fido_cbor_info_versions_len.html share/doc/libfido2/html/fido_cbor_info_versions_ptr.html +share/doc/libfido2/html/fido_cred_aaguid_len.html +share/doc/libfido2/html/fido_cred_aaguid_ptr.html share/doc/libfido2/html/fido_cred_authdata_len.html share/doc/libfido2/html/fido_cred_authdata_ptr.html share/doc/libfido2/html/fido_cred_clientdata_hash_len.html share/doc/libfido2/html/fido_cred_clientdata_hash_ptr.html +share/doc/libfido2/html/fido_cred_display_name.html share/doc/libfido2/html/fido_cred_exclude.html +share/doc/libfido2/html/fido_cred_flags.html share/doc/libfido2/html/fido_cred_fmt.html share/doc/libfido2/html/fido_cred_free.html share/doc/libfido2/html/fido_cred_id_len.html @@ -277,6 +306,8 @@ share/doc/libfido2/html/fido_cred_new.html share/doc/libfido2/html/fido_cred_prot.html share/doc/libfido2/html/fido_cred_pubkey_len.html share/doc/libfido2/html/fido_cred_pubkey_ptr.html +share/doc/libfido2/html/fido_cred_rp_id.html +share/doc/libfido2/html/fido_cred_rp_name.html share/doc/libfido2/html/fido_cred_set_authdata.html share/doc/libfido2/html/fido_cred_set_authdata_raw.html share/doc/libfido2/html/fido_cred_set_clientdata_hash.html @@ -292,6 +323,10 @@ share/doc/libfido2/html/fido_cred_set_uv.html share/doc/libfido2/html/fido_cred_set_x509.html share/doc/libfido2/html/fido_cred_sig_len.html share/doc/libfido2/html/fido_cred_sig_ptr.html +share/doc/libfido2/html/fido_cred_type.html +share/doc/libfido2/html/fido_cred_user_id_len.html +share/doc/libfido2/html/fido_cred_user_id_ptr.html +share/doc/libfido2/html/fido_cred_user_name.html share/doc/libfido2/html/fido_cred_verify.html share/doc/libfido2/html/fido_cred_x5c_len.html share/doc/libfido2/html/fido_cred_x5c_ptr.html @@ -324,6 +359,7 @@ share/doc/libfido2/html/fido_dev_free.html share/doc/libfido2/html/fido_dev_get_assert.html share/doc/libfido2/html/fido_dev_get_cbor_info.html share/doc/libfido2/html/fido_dev_get_retry_count.html +share/doc/libfido2/html/fido_dev_get_touch_begin.html share/doc/libfido2/html/fido_dev_info_free.html share/doc/libfido2/html/fido_dev_info_manifest.html share/doc/libfido2/html/fido_dev_info_manufacturer_string.html @@ -343,6 +379,8 @@ share/doc/libfido2/html/fido_dev_protocol.html share/doc/libfido2/html/fido_dev_reset.html share/doc/libfido2/html/fido_dev_set_io_functions.html share/doc/libfido2/html/fido_dev_set_pin.html +share/doc/libfido2/html/fido_dev_supports_cred_prot.html +share/doc/libfido2/html/fido_dev_supports_pin.html share/doc/libfido2/html/fido_init.html share/doc/libfido2/html/fido_strerr.html share/doc/libfido2/html/rs256_pk_free.html diff --git a/security/libfido2/buildlink3.mk b/security/libfido2/buildlink3.mk index 4645df6ad60..2529877f306 100644 --- a/security/libfido2/buildlink3.mk +++ b/security/libfido2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.1 2020/08/19 16:25:56 riastradh Exp $ +# $NetBSD: buildlink3.mk,v 1.2 2020/10/22 20:29:44 tnn Exp $ BUILDLINK_TREE+= libfido2 @@ -6,7 +6,7 @@ BUILDLINK_TREE+= libfido2 LIBFIDO2_BUILDLINK_MK:= BUILDLINK_API_DEPENDS.libfido2+= libfido2>=1.4.0 -BUILDLINK_ABI_DEPENDS.libfido2+= libfido2>=1.4.0 +BUILDLINK_ABI_DEPENDS.libfido2+= libfido2>=1.5.0 BUILDLINK_PKGSRCDIR.libfido2?= ../../security/libfido2 .endif # LIBFIDO2_BUILDLINK_MK diff --git a/security/libfido2/distinfo b/security/libfido2/distinfo index f421028ff67..5abc04db2df 100644 --- a/security/libfido2/distinfo +++ b/security/libfido2/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.1 2020/08/19 16:25:56 riastradh Exp $ +$NetBSD: distinfo,v 1.2 2020/10/22 20:29:44 tnn Exp $ -SHA1 (libfido2-1.4.0.tar.gz) = 3436a2e723bb424fc744807179965df2f2f1e601 -RMD160 (libfido2-1.4.0.tar.gz) = 052a692a1d95b00f6594d14d78fa309c525f9c97 -SHA512 (libfido2-1.4.0.tar.gz) = 5cf2f2d70bdba893fd33bf3ca91940c7eded5ed1728b517ff3fc46cbde58bf64f16da4104138b20dcea1d9a1cec730e532bc4938cdcba4ad86343e51a1c3c513 -Size (libfido2-1.4.0.tar.gz) = 391439 bytes -SHA1 (patch-src_CMakeLists.txt) = 27cd482566e324beb74a78f5f887c10f0cbb8008 +SHA1 (libfido2-1.5.0.tar.gz) = 555893f22e3031cd766058767c17c725350c814c +RMD160 (libfido2-1.5.0.tar.gz) = f7f714ed5899c6bf764e172f3c62d0a7f0134059 +SHA512 (libfido2-1.5.0.tar.gz) = 240e2368e43846fddf5e98bbcc247468833565bcde4ec27976b88c814d787f1a477241a82b064818aa0eb0a98ff46a65d80b8243f4d0bbd763270e42492354e2 +Size (libfido2-1.5.0.tar.gz) = 407259 bytes +SHA1 (patch-src_CMakeLists.txt) = 071e20b297758b34ab0785fa8ccfabe354c37281 diff --git a/security/libfido2/patches/patch-src_CMakeLists.txt b/security/libfido2/patches/patch-src_CMakeLists.txt index e6fe4932313..41a913ae57b 100644 --- a/security/libfido2/patches/patch-src_CMakeLists.txt +++ b/security/libfido2/patches/patch-src_CMakeLists.txt @@ -1,15 +1,15 @@ -$NetBSD: patch-src_CMakeLists.txt,v 1.1 2020/08/19 16:25:56 riastradh Exp $ +$NetBSD: patch-src_CMakeLists.txt,v 1.2 2020/10/22 20:29:44 tnn Exp $ Add NetBSD support -- same USB HID API as OpenBSD. ---- src/CMakeLists.txt.orig 2020-04-15 10:58:51.000000000 +0000 +--- src/CMakeLists.txt.orig 2020-09-01 07:17:43.000000000 +0000 +++ src/CMakeLists.txt @@ -44,6 +44,8 @@ elseif(APPLE) - list(APPEND COMPAT_SOURCES hid_osx.c) + list(APPEND FIDO_SOURCES hid_osx.c) elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux") - list(APPEND COMPAT_SOURCES hid_linux.c) + list(APPEND FIDO_SOURCES hid_linux.c) +elseif(CMAKE_SYSTEM_NAME STREQUAL "NetBSD") -+ list(APPEND COMPAT_SOURCES hid_openbsd.c) ++ list(APPEND FIDO_SOURCES hid_openbsd.c) elseif(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") - list(APPEND COMPAT_SOURCES hid_openbsd.c) + list(APPEND FIDO_SOURCES hid_openbsd.c) else() |