Date: Sun, 6 Sep 2020 15:35:40 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r547802 - in head/security/libfido2: . files Message-ID: <202009061535.086FZeDZ081754@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Sun Sep 6 15:35:40 2020 New Revision: 547802 URL: https://svnweb.freebsd.org/changeset/ports/547802 Log: Update to 1.5.0 Changes: https://developers.yubico.com/libfido2/Release_Notes.html https://github.com/Yubico/libfido2/blob/master/NEWS Added: head/security/libfido2/files/patch-src-cbor.c (contents, props changed) Modified: head/security/libfido2/Makefile head/security/libfido2/distinfo head/security/libfido2/files/patch-src-CMakeLists.txt head/security/libfido2/files/patch-src-hid_openbsd.c head/security/libfido2/pkg-plist Modified: head/security/libfido2/Makefile ============================================================================== --- head/security/libfido2/Makefile Sun Sep 6 15:35:35 2020 (r547801) +++ head/security/libfido2/Makefile Sun Sep 6 15:35:40 2020 (r547802) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libfido2 -PORTVERSION= 1.4.0 +PORTVERSION= 1.5.0 CATEGORIES= security MASTER_SITES= https://developers.yubico.com/libfido2/Releases/ Modified: head/security/libfido2/distinfo ============================================================================== --- head/security/libfido2/distinfo Sun Sep 6 15:35:35 2020 (r547801) +++ head/security/libfido2/distinfo Sun Sep 6 15:35:40 2020 (r547802) @@ -1,3 +1,3 @@ -TIMESTAMP = 1587445356 -SHA256 (libfido2-1.4.0.tar.gz) = ad921fbe7d4bb70e4a971e564cd01f341daf9b5ed5d69b3cbab94a8a811d2a6c -SIZE (libfido2-1.4.0.tar.gz) = 391439 +TIMESTAMP = 1599375996 +SHA256 (libfido2-1.5.0.tar.gz) = 5990f923c9390fe1e6a00ba5d1d1f74030e7344b855e971d9fb7223e70ff3122 +SIZE (libfido2-1.5.0.tar.gz) = 407259 Modified: head/security/libfido2/files/patch-src-CMakeLists.txt ============================================================================== --- head/security/libfido2/files/patch-src-CMakeLists.txt Sun Sep 6 15:35:35 2020 (r547801) +++ head/security/libfido2/files/patch-src-CMakeLists.txt Sun Sep 6 15:35:40 2020 (r547802) @@ -1,11 +1,11 @@ ---- src/CMakeLists.txt.orig 2019-11-28 11:38:08 UTC +--- src/CMakeLists.txt.orig 2020-09-01 07:17:43 UTC +++ src/CMakeLists.txt -@@ -41,7 +41,7 @@ elseif(APPLE) - list(APPEND COMPAT_SOURCES hid_osx.c) +@@ -44,7 +44,7 @@ elseif(APPLE) + 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 "OpenBSD") +elseif(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "OpenBSD") - list(APPEND COMPAT_SOURCES hid_openbsd.c) - endif() - + list(APPEND FIDO_SOURCES hid_openbsd.c) + else() + message(FATAL_ERROR "please define a hid backend for your platform") Added: head/security/libfido2/files/patch-src-cbor.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/libfido2/files/patch-src-cbor.c Sun Sep 6 15:35:40 2020 (r547802) @@ -0,0 +1,15 @@ +Obtained from: https://github.com/Yubico/libfido2/commit/e009c77b1fba57faf9524d3b788da2807b7406d8 + +--- src/cbor.c.orig 2020-09-01 07:17:43 UTC ++++ src/cbor.c +@@ -726,8 +726,8 @@ cbor_encode_change_pin_auth(const fido_blob_t *key, co + + if ((md = EVP_sha256()) == NULL || + HMAC_Init_ex(&ctx, key->ptr, (int)key->len, md, NULL) == 0 || +- HMAC_Update(&ctx, npe->ptr, (int)npe->len) == 0 || +- HMAC_Update(&ctx, phe->ptr, (int)phe->len) == 0 || ++ HMAC_Update(&ctx, npe->ptr, npe->len) == 0 || ++ HMAC_Update(&ctx, phe->ptr, phe->len) == 0 || + HMAC_Final(&ctx, dgst, &dgst_len) == 0 || dgst_len != 32) { + fido_log_debug("%s: HMAC", __func__); + goto fail; Modified: head/security/libfido2/files/patch-src-hid_openbsd.c ============================================================================== --- head/security/libfido2/files/patch-src-hid_openbsd.c Sun Sep 6 15:35:35 2020 (r547801) +++ head/security/libfido2/files/patch-src-hid_openbsd.c Sun Sep 6 15:35:40 2020 (r547802) @@ -1,19 +1,10 @@ ---- src/hid_openbsd.c.orig 2019-11-28 11:38:08 UTC +--- src/hid_openbsd.c.orig 2020-09-01 07:17:43 UTC +++ src/hid_openbsd.c @@ -8,6 +8,7 @@ #include <sys/ioctl.h> #include <dev/usb/usb.h> +#include <dev/usb/usb_ioctl.h> - #include <dev/usb/usbhid.h> #include <errno.h> -@@ -20,7 +21,7 @@ - #include "fido.h" - - #define MAX_UHID 64 --#define MAX_REPORT_LEN (sizeof(((struct usb_ctl_report *)(NULL))->ucr_data)) -+#define MAX_REPORT_LEN (sizeof(((struct usb_gen_descriptor *)(NULL))->ugd_data)) - - struct hid_openbsd { - int fd; + #include <fcntl.h> Modified: head/security/libfido2/pkg-plist ============================================================================== --- head/security/libfido2/pkg-plist Sun Sep 6 15:35:35 2020 (r547801) +++ head/security/libfido2/pkg-plist Sun Sep 6 15:35:40 2020 (r547802) @@ -33,10 +33,14 @@ man/man3/fido_assert_authdata_ptr.3.gz man/man3/fido_assert_clientdata_hash_len.3.gz man/man3/fido_assert_clientdata_hash_ptr.3.gz man/man3/fido_assert_count.3.gz +man/man3/fido_assert_flags.3.gz man/man3/fido_assert_free.3.gz man/man3/fido_assert_hmac_secret_len.3.gz man/man3/fido_assert_hmac_secret_ptr.3.gz +man/man3/fido_assert_id_len.3.gz +man/man3/fido_assert_id_ptr.3.gz man/man3/fido_assert_new.3.gz +man/man3/fido_assert_rp_id.3.gz man/man3/fido_assert_set_authdata.3.gz man/man3/fido_assert_set_clientdata_hash.3.gz man/man3/fido_assert_set_count.3.gz @@ -87,6 +91,8 @@ man/man3/fido_cbor_info_extensions_len.3.gz man/man3/fido_cbor_info_extensions_ptr.3.gz man/man3/fido_cbor_info_free.3.gz man/man3/fido_cbor_info_fwversion.3.gz +man/man3/fido_cbor_info_maxcredcntlst.3.gz +man/man3/fido_cbor_info_maxcredidlen.3.gz man/man3/fido_cbor_info_maxmsgsiz.3.gz man/man3/fido_cbor_info_new.3.gz man/man3/fido_cbor_info_options_len.3.gz @@ -96,11 +102,15 @@ man/man3/fido_cbor_info_protocols_len.3.gz man/man3/fido_cbor_info_protocols_ptr.3.gz man/man3/fido_cbor_info_versions_len.3.gz man/man3/fido_cbor_info_versions_ptr.3.gz +man/man3/fido_cred_aaguid_len.3.gz +man/man3/fido_cred_aaguid_ptr.3.gz man/man3/fido_cred_authdata_len.3.gz man/man3/fido_cred_authdata_ptr.3.gz man/man3/fido_cred_clientdata_hash_len.3.gz man/man3/fido_cred_clientdata_hash_ptr.3.gz +man/man3/fido_cred_display_name.3.gz man/man3/fido_cred_exclude.3.gz +man/man3/fido_cred_flags.3.gz man/man3/fido_cred_fmt.3.gz man/man3/fido_cred_free.3.gz man/man3/fido_cred_id_len.3.gz @@ -109,6 +119,8 @@ man/man3/fido_cred_new.3.gz man/man3/fido_cred_prot.3.gz man/man3/fido_cred_pubkey_len.3.gz man/man3/fido_cred_pubkey_ptr.3.gz +man/man3/fido_cred_rp_id.3.gz +man/man3/fido_cred_rp_name.3.gz man/man3/fido_cred_set_authdata.3.gz man/man3/fido_cred_set_authdata_raw.3.gz man/man3/fido_cred_set_clientdata_hash.3.gz @@ -124,6 +136,10 @@ man/man3/fido_cred_set_uv.3.gz man/man3/fido_cred_set_x509.3.gz man/man3/fido_cred_sig_len.3.gz man/man3/fido_cred_sig_ptr.3.gz +man/man3/fido_cred_type.3.gz +man/man3/fido_cred_user_id_len.3.gz +man/man3/fido_cred_user_id_ptr.3.gz +man/man3/fido_cred_user_name.3.gz man/man3/fido_cred_verify.3.gz man/man3/fido_cred_x5c_len.3.gz man/man3/fido_cred_x5c_ptr.3.gz @@ -156,6 +172,7 @@ man/man3/fido_dev_free.3.gz man/man3/fido_dev_get_assert.3.gz man/man3/fido_dev_get_cbor_info.3.gz man/man3/fido_dev_get_retry_count.3.gz +man/man3/fido_dev_get_touch_begin.3.gz man/man3/fido_dev_info_free.3.gz man/man3/fido_dev_info_manifest.3.gz man/man3/fido_dev_info_manufacturer_string.3.gz @@ -175,6 +192,8 @@ man/man3/fido_dev_protocol.3.gz man/man3/fido_dev_reset.3.gz man/man3/fido_dev_set_io_functions.3.gz man/man3/fido_dev_set_pin.3.gz +man/man3/fido_dev_supports_cred_prot.3.gz +man/man3/fido_dev_supports_pin.3.gz man/man3/fido_init.3.gz man/man3/fido_strerr.3.gz man/man3/rs256_pk_free.3.gz @@ -200,10 +219,14 @@ man/man3/rs256_pk_to_EVP_PKEY.3.gz %%PORTDOCS%%%%DOCSDIR%%/html/fido_assert_clientdata_hash_len.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_assert_clientdata_hash_ptr.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_assert_count.html +%%PORTDOCS%%%%DOCSDIR%%/html/fido_assert_flags.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_assert_free.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_assert_hmac_secret_len.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_assert_hmac_secret_ptr.html +%%PORTDOCS%%%%DOCSDIR%%/html/fido_assert_id_len.html +%%PORTDOCS%%%%DOCSDIR%%/html/fido_assert_id_ptr.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_assert_new.html +%%PORTDOCS%%%%DOCSDIR%%/html/fido_assert_rp_id.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_assert_set_authdata.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_assert_set_clientdata_hash.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_assert_set_count.html @@ -254,6 +277,8 @@ man/man3/rs256_pk_to_EVP_PKEY.3.gz %%PORTDOCS%%%%DOCSDIR%%/html/fido_cbor_info_extensions_ptr.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_cbor_info_free.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_cbor_info_fwversion.html +%%PORTDOCS%%%%DOCSDIR%%/html/fido_cbor_info_maxcredcntlst.html +%%PORTDOCS%%%%DOCSDIR%%/html/fido_cbor_info_maxcredidlen.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_cbor_info_maxmsgsiz.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_cbor_info_new.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_cbor_info_options_len.html @@ -263,11 +288,15 @@ man/man3/rs256_pk_to_EVP_PKEY.3.gz %%PORTDOCS%%%%DOCSDIR%%/html/fido_cbor_info_protocols_ptr.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_cbor_info_versions_len.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_cbor_info_versions_ptr.html +%%PORTDOCS%%%%DOCSDIR%%/html/fido_cred_aaguid_len.html +%%PORTDOCS%%%%DOCSDIR%%/html/fido_cred_aaguid_ptr.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_cred_authdata_len.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_cred_authdata_ptr.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_cred_clientdata_hash_len.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_cred_clientdata_hash_ptr.html +%%PORTDOCS%%%%DOCSDIR%%/html/fido_cred_display_name.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_cred_exclude.html +%%PORTDOCS%%%%DOCSDIR%%/html/fido_cred_flags.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_cred_fmt.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_cred_free.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_cred_id_len.html @@ -276,6 +305,8 @@ man/man3/rs256_pk_to_EVP_PKEY.3.gz %%PORTDOCS%%%%DOCSDIR%%/html/fido_cred_prot.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_cred_pubkey_len.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_cred_pubkey_ptr.html +%%PORTDOCS%%%%DOCSDIR%%/html/fido_cred_rp_id.html +%%PORTDOCS%%%%DOCSDIR%%/html/fido_cred_rp_name.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_cred_set_authdata.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_cred_set_authdata_raw.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_cred_set_clientdata_hash.html @@ -291,6 +322,10 @@ man/man3/rs256_pk_to_EVP_PKEY.3.gz %%PORTDOCS%%%%DOCSDIR%%/html/fido_cred_set_x509.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_cred_sig_len.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_cred_sig_ptr.html +%%PORTDOCS%%%%DOCSDIR%%/html/fido_cred_type.html +%%PORTDOCS%%%%DOCSDIR%%/html/fido_cred_user_id_len.html +%%PORTDOCS%%%%DOCSDIR%%/html/fido_cred_user_id_ptr.html +%%PORTDOCS%%%%DOCSDIR%%/html/fido_cred_user_name.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_cred_verify.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_cred_x5c_len.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_cred_x5c_ptr.html @@ -323,6 +358,7 @@ man/man3/rs256_pk_to_EVP_PKEY.3.gz %%PORTDOCS%%%%DOCSDIR%%/html/fido_dev_get_assert.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_dev_get_cbor_info.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_dev_get_retry_count.html +%%PORTDOCS%%%%DOCSDIR%%/html/fido_dev_get_touch_begin.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_dev_info_free.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_dev_info_manifest.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_dev_info_manufacturer_string.html @@ -342,6 +378,8 @@ man/man3/rs256_pk_to_EVP_PKEY.3.gz %%PORTDOCS%%%%DOCSDIR%%/html/fido_dev_reset.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_dev_set_io_functions.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_dev_set_pin.html +%%PORTDOCS%%%%DOCSDIR%%/html/fido_dev_supports_cred_prot.html +%%PORTDOCS%%%%DOCSDIR%%/html/fido_dev_supports_pin.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_init.html %%PORTDOCS%%%%DOCSDIR%%/html/fido_strerr.html %%PORTDOCS%%%%DOCSDIR%%/html/rs256_pk_free.html
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009061535.086FZeDZ081754>