git: 60a517b66a69 - main - libfido2: update to 1.14.0
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 04 May 2024 16:52:31 UTC
The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=60a517b66a69b8c011b04063ef63a938738719bd commit 60a517b66a69b8c011b04063ef63a938738719bd Merge: cb808de400c7 e85dbcdab023 Author: Ed Maste <emaste@FreeBSD.org> AuthorDate: 2024-05-04 16:51:08 +0000 Commit: Ed Maste <emaste@FreeBSD.org> CommitDate: 2024-05-04 16:51:08 +0000 libfido2: update to 1.14.0 Sponsored by: The FreeBSD Foundation contrib/libfido2/.actions/build-bsd | 97 +++++++++++ contrib/libfido2/.actions/build-linux-clang | 21 +++ contrib/libfido2/.actions/build-linux-gcc | 23 +++ .../.actions/build-linux-i686-w64-mingw32-gcc | 58 +++++++ .../libfido2/.actions/build-linux-openssl3-clang | 33 ++++ contrib/libfido2/.actions/build-linux-openssl3-gcc | 28 ++++ .../build-linux-openssl3-i686-w64-mingw32-gcc | 59 +++++++ contrib/libfido2/.actions/build-osx-clang | 19 +++ contrib/libfido2/.actions/fuzz-linux | 93 +++++++++++ contrib/libfido2/.actions/llvm.gpg | 52 ++++++ contrib/libfido2/.actions/setup_clang | 17 ++ contrib/libfido2/.gitattributes | 1 + .../libfido2/.github/ISSUE_TEMPLATE/bug_report.md | 80 ++++++++++ contrib/libfido2/.github/ISSUE_TEMPLATE/config.yml | 8 + .../libfido2/.github/workflows/alpine_builds.yml | 39 +++++ contrib/libfido2/.github/workflows/bsd_builds.yml | 32 ++++ contrib/libfido2/.github/workflows/cifuzz_oss.yml | 46 ++++++ .../libfido2/.github/workflows/codeql-analysis.yml | 42 +++++ .../libfido2/.github/workflows/cygwin_builds.yml | 30 ++++ .../libfido2/.github/workflows/linux_builds.yml | 57 +++++++ contrib/libfido2/.github/workflows/linux_fuzz.yml | 41 +++++ .../libfido2/.github/workflows/macos_builds.yml | 32 ++++ contrib/libfido2/.github/workflows/openssl3.yml | 51 ++++++ .../libfido2/.github/workflows/windows_builds.yml | 32 ++++ contrib/libfido2/.gitignore | 9 ++ contrib/libfido2/CMakeLists.txt | 4 +- contrib/libfido2/NEWS | 10 ++ contrib/libfido2/README.adoc | 2 +- contrib/libfido2/examples/README.adoc | 5 +- contrib/libfido2/examples/cred.c | 30 +++- contrib/libfido2/fuzz/Dockerfile | 2 +- contrib/libfido2/fuzz/Makefile | 2 +- contrib/libfido2/fuzz/export.gnu | 2 + contrib/libfido2/fuzz/functions.txt | 63 ++++---- contrib/libfido2/fuzz/fuzz_assert.c | 4 +- contrib/libfido2/fuzz/report.tgz | Bin 357005 -> 361946 bytes contrib/libfido2/fuzz/summary.txt | 18 +-- contrib/libfido2/man/CMakeLists.txt | 3 + contrib/libfido2/man/fido2-assert.1 | 13 +- contrib/libfido2/man/fido2-cred.1 | 13 +- contrib/libfido2/man/fido_assert_new.3 | 14 +- contrib/libfido2/man/fido_assert_set_authdata.3 | 59 ++++++- contrib/libfido2/regress/assert.c | 50 +++++- contrib/libfido2/regress/cred.c | 18 ++- contrib/libfido2/regress/eddsa.c | 2 +- contrib/libfido2/src/assert.c | 68 +++++++- contrib/libfido2/src/export.gnu | 3 + contrib/libfido2/src/export.llvm | 3 + contrib/libfido2/src/export.msvc | 3 + contrib/libfido2/src/fido.h | 4 + contrib/libfido2/src/fido/types.h | 2 + contrib/libfido2/src/webauthn.h | 177 +++++++++++++++++++-- contrib/libfido2/src/winhello.c | 63 +++++++- contrib/libfido2/tools/assert_get.c | 19 ++- contrib/libfido2/tools/cred_make.c | 20 ++- contrib/libfido2/tools/extern.h | 19 +-- contrib/libfido2/tools/fido2-assert.c | 4 +- contrib/libfido2/tools/fido2-cred.c | 4 +- contrib/libfido2/udev/70-u2f.rules | 32 +++- contrib/libfido2/udev/fidodevs | 16 +- contrib/libfido2/windows/build.ps1 | 1 + contrib/libfido2/windows/const.ps1 | 16 +- lib/libfido2/Makefile | 2 +- 63 files changed, 1646 insertions(+), 124 deletions(-) diff --cc contrib/libfido2/.actions/build-bsd index 000000000000,66fc4e3ba281..66fc4e3ba281 mode 000000,100755..100755 --- a/contrib/libfido2/.actions/build-bsd +++ b/contrib/libfido2/.actions/build-bsd diff --cc contrib/libfido2/.actions/build-linux-clang index 000000000000,ba20f1279ec9..ba20f1279ec9 mode 000000,100755..100755 --- a/contrib/libfido2/.actions/build-linux-clang +++ b/contrib/libfido2/.actions/build-linux-clang diff --cc contrib/libfido2/.actions/build-linux-gcc index 000000000000,cd42b5eb7bed..cd42b5eb7bed mode 000000,100755..100755 --- a/contrib/libfido2/.actions/build-linux-gcc +++ b/contrib/libfido2/.actions/build-linux-gcc diff --cc contrib/libfido2/.actions/build-linux-i686-w64-mingw32-gcc index 000000000000,a89578da0886..a89578da0886 mode 000000,100755..100755 --- a/contrib/libfido2/.actions/build-linux-i686-w64-mingw32-gcc +++ b/contrib/libfido2/.actions/build-linux-i686-w64-mingw32-gcc diff --cc contrib/libfido2/.actions/build-linux-openssl3-clang index 000000000000,2383e51ad8f5..2383e51ad8f5 mode 000000,100755..100755 --- a/contrib/libfido2/.actions/build-linux-openssl3-clang +++ b/contrib/libfido2/.actions/build-linux-openssl3-clang diff --cc contrib/libfido2/.actions/build-linux-openssl3-gcc index 000000000000,344fc12bce8c..344fc12bce8c mode 000000,100755..100755 --- a/contrib/libfido2/.actions/build-linux-openssl3-gcc +++ b/contrib/libfido2/.actions/build-linux-openssl3-gcc diff --cc contrib/libfido2/.actions/build-linux-openssl3-i686-w64-mingw32-gcc index 000000000000,3bbb141dad0d..3bbb141dad0d mode 000000,100755..100755 --- a/contrib/libfido2/.actions/build-linux-openssl3-i686-w64-mingw32-gcc +++ b/contrib/libfido2/.actions/build-linux-openssl3-i686-w64-mingw32-gcc diff --cc contrib/libfido2/.actions/build-osx-clang index 000000000000,b4beea221315..b4beea221315 mode 000000,100755..100755 --- a/contrib/libfido2/.actions/build-osx-clang +++ b/contrib/libfido2/.actions/build-osx-clang diff --cc contrib/libfido2/.actions/fuzz-linux index 000000000000,3f57ac40ff4b..3f57ac40ff4b mode 000000,100755..100755 --- a/contrib/libfido2/.actions/fuzz-linux +++ b/contrib/libfido2/.actions/fuzz-linux diff --cc contrib/libfido2/.actions/llvm.gpg index 000000000000,aa6b105aa3d7..aa6b105aa3d7 mode 000000,100644..100644 --- a/contrib/libfido2/.actions/llvm.gpg +++ b/contrib/libfido2/.actions/llvm.gpg diff --cc contrib/libfido2/.actions/setup_clang index 000000000000,be06709c88b6..be06709c88b6 mode 000000,100755..100755 --- a/contrib/libfido2/.actions/setup_clang +++ b/contrib/libfido2/.actions/setup_clang diff --cc contrib/libfido2/.gitattributes index 000000000000,000000000000..998f601da4d0 new file mode 100644 --- /dev/null +++ b/contrib/libfido2/.gitattributes @@@ -1,0 -1,0 +1,1 @@@ ++.* export-ignore diff --cc contrib/libfido2/.github/ISSUE_TEMPLATE/bug_report.md index 000000000000,6e88c1ff8006..6e88c1ff8006 mode 000000,100644..100644 --- a/contrib/libfido2/.github/ISSUE_TEMPLATE/bug_report.md +++ b/contrib/libfido2/.github/ISSUE_TEMPLATE/bug_report.md diff --cc contrib/libfido2/.github/ISSUE_TEMPLATE/config.yml index 000000000000,3ecb227ffeb0..3ecb227ffeb0 mode 000000,100644..100644 --- a/contrib/libfido2/.github/ISSUE_TEMPLATE/config.yml +++ b/contrib/libfido2/.github/ISSUE_TEMPLATE/config.yml diff --cc contrib/libfido2/.github/workflows/alpine_builds.yml index 000000000000,c6d826f39835..c6d826f39835 mode 000000,100644..100644 --- a/contrib/libfido2/.github/workflows/alpine_builds.yml +++ b/contrib/libfido2/.github/workflows/alpine_builds.yml diff --cc contrib/libfido2/.github/workflows/bsd_builds.yml index 000000000000,366ea2141aca..366ea2141aca mode 000000,100644..100644 --- a/contrib/libfido2/.github/workflows/bsd_builds.yml +++ b/contrib/libfido2/.github/workflows/bsd_builds.yml diff --cc contrib/libfido2/.github/workflows/cifuzz_oss.yml index 000000000000,556d5ad36f7c..556d5ad36f7c mode 000000,100644..100644 --- a/contrib/libfido2/.github/workflows/cifuzz_oss.yml +++ b/contrib/libfido2/.github/workflows/cifuzz_oss.yml diff --cc contrib/libfido2/.github/workflows/codeql-analysis.yml index 000000000000,a3a8d54d2daa..a3a8d54d2daa mode 000000,100644..100644 --- a/contrib/libfido2/.github/workflows/codeql-analysis.yml +++ b/contrib/libfido2/.github/workflows/codeql-analysis.yml diff --cc contrib/libfido2/.github/workflows/cygwin_builds.yml index 000000000000,d8146c54904e..d8146c54904e mode 000000,100644..100644 --- a/contrib/libfido2/.github/workflows/cygwin_builds.yml +++ b/contrib/libfido2/.github/workflows/cygwin_builds.yml diff --cc contrib/libfido2/.github/workflows/linux_builds.yml index 000000000000,ec911cb92d92..ec911cb92d92 mode 000000,100644..100644 --- a/contrib/libfido2/.github/workflows/linux_builds.yml +++ b/contrib/libfido2/.github/workflows/linux_builds.yml diff --cc contrib/libfido2/.github/workflows/linux_fuzz.yml index 000000000000,296c0d9fab23..296c0d9fab23 mode 000000,100644..100644 --- a/contrib/libfido2/.github/workflows/linux_fuzz.yml +++ b/contrib/libfido2/.github/workflows/linux_fuzz.yml diff --cc contrib/libfido2/.github/workflows/macos_builds.yml index 000000000000,7d84a750ac37..7d84a750ac37 mode 000000,100644..100644 --- a/contrib/libfido2/.github/workflows/macos_builds.yml +++ b/contrib/libfido2/.github/workflows/macos_builds.yml diff --cc contrib/libfido2/.github/workflows/openssl3.yml index 000000000000,ee70c087d285..ee70c087d285 mode 000000,100644..100644 --- a/contrib/libfido2/.github/workflows/openssl3.yml +++ b/contrib/libfido2/.github/workflows/openssl3.yml diff --cc contrib/libfido2/.github/workflows/windows_builds.yml index 000000000000,bfc1eb3c1deb..bfc1eb3c1deb mode 000000,100644..100644 --- a/contrib/libfido2/.github/workflows/windows_builds.yml +++ b/contrib/libfido2/.github/workflows/windows_builds.yml diff --cc contrib/libfido2/.gitignore index 000000000000,000000000000..0915625a059c new file mode 100644 --- /dev/null +++ b/contrib/libfido2/.gitignore @@@ -1,0 -1,0 +1,9 @@@ ++build/ ++cscope.out ++fuzz/build/ ++fuzz/corpus.tgz- ++fuzz/fuzz_*/ ++fuzz/obj/ ++fuzz/report ++fuzz/*.so ++output/ diff --cc contrib/libfido2/fuzz/report.tgz index e984ee9dc765,9c01263576f1..9c01263576f1 Binary files differ diff --cc lib/libfido2/Makefile index dc985e2797ed,000000000000..10c008967e3d mode 100644,000000..100644 --- a/lib/libfido2/Makefile +++ b/lib/libfido2/Makefile @@@ -1,82 -1,0 +1,82 @@@ +PACKAGE=ssh +LIB= fido2 +PRIVATELIB= +DIST= ${SRCTOP}/contrib/libfido2 + +.PATH: ${DIST}/src ${DIST} + +SRCS+= aes256.c +SRCS+= assert.c +SRCS+= authkey.c +SRCS+= bio.c +SRCS+= blob.c +SRCS+= buf.c +SRCS+= cbor.c +SRCS+= compress.c +SRCS+= config.c +SRCS+= cred.c +SRCS+= credman.c +SRCS+= dev.c +SRCS+= ecdh.c +SRCS+= eddsa.c +SRCS+= err.c +SRCS+= es256.c +SRCS+= es384.c +SRCS+= hid_freebsd.c +SRCS+= hid_unix.c +SRCS+= hid.c +SRCS+= info.c +SRCS+= io.c +SRCS+= iso7816.c +SRCS+= largeblob.c +SRCS+= log.c +SRCS+= pin.c +SRCS+= random.c +SRCS+= reset.c +SRCS+= rs1.c +SRCS+= rs256.c +SRCS+= time.c +SRCS+= touch.c +SRCS+= tpm.c +SRCS+= types.c +SRCS+= u2f.c +SRCS+= util.c + +SRCS+= openbsd-compat/freezero.c +SRCS+= openbsd-compat/recallocarray.c + +CFLAGS+= -I ${DIST}/src -I${SRCTOP}/contrib/libcbor/src -I${.CURDIR}/../libcbor +CFLAGS+= -D_FIDO_INTERNAL +CFLAGS+= -DHAVE_ARC4RANDOM_BUF +CFLAGS+= -DHAVE_ASPRINTF +CFLAGS+= -DHAVE_CLOCK_GETTIME +CFLAGS+= -DHAVE_DEV_URANDOM +CFLAGS+= -DHAVE_ERR_H +CFLAGS+= -DHAVE_EXPLICIT_BZERO +CFLAGS+= -DHAVE_GETLINE +CFLAGS+= -DHAVE_GETOPT +CFLAGS+= -DHAVE_GETPAGESIZE +CFLAGS+= -DHAVE_GETRANDOM +CFLAGS+= -DHAVE_OPENSSLV_H +CFLAGS+= -DHAVE_READPASSPHRASE +CFLAGS+= -DHAVE_SIGNAL_H +CFLAGS+= -DHAVE_STRLCAT +CFLAGS+= -DHAVE_STRLCPY +CFLAGS+= -DHAVE_STRSEP +CFLAGS+= -DHAVE_SYSCONF +CFLAGS+= -DHAVE_SYS_RANDOM_H +CFLAGS+= -DHAVE_TIMESPECSUB +CFLAGS+= -DHAVE_TIMINGSAFE_BCMP +CFLAGS+= -DHAVE_UNISTD_H +CFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L +CFLAGS+= -DTLS=__thread +CFLAGS+= -D_FIDO_MAJOR=1 - CFLAGS+= -D_FIDO_MINOR=13 ++CFLAGS+= -D_FIDO_MINOR=14 +CFLAGS+= -D_FIDO_PATCH=0 + +LIBADD= crypto z + +WARNS=2 +MAN= + +.include <bsd.lib.mk>