oasis

commit: 0c85e3929aa25af6ab6e02788b32092897b5384e
parent 41bded8245057d21f757beff2d32367ab217c488
Author: Michael Forney <mforney@mforney.org>
Date:   Thu, 15 Apr 2021 03:01:36 -0700

libfido2: Update to 1.7.0

Diffstat:
M
pkg/libfido2/config.h
34
++++++++++++++++++++--------------
M
pkg/libfido2/gen.lua
9
+++++++++
M
pkg/libfido2/ver
2
+-

3 files changed, 30 insertions(+), 15 deletions(-)
diff --git a/pkg/libfido2/config.h b/pkg/libfido2/config.h
@@ -1,25 +1,31 @@
 #define _FIDO_MAJOR 1
-#define _FIDO_MINOR 6
+#define _FIDO_MINOR 7
 #define _FIDO_PATCH 0
 #ifdef HAVE__THREAD_LOCAL
 # define TLS _Thread_local
 #endif
+/* #undef HAVE_ARC4RANDOM_BUF */
+#define HAVE_CBOR_H
+#define HAVE_CLOCK_GETTIME
+#define HAVE_DEV_URANDOM
 #define HAVE_ENDIAN_H
 #define HAVE_ERR_H
-#define HAVE_UNISTD_H
-#define HAVE_SIGNAL_H
-#define HAVE_SYS_RANDOM_H
-#define HAVE_STRLCPY
-#define HAVE_STRLCAT
-#define HAVE_RECALLOCARRAY
-#define HAVE_GETPAGESIZE
-#define HAVE_SYSCONF
-/* #undef HAVE_MEMSET_S */
 #define HAVE_EXPLICIT_BZERO
-#define HAVE_TIMINGSAFE_BCMP
-#define HAVE_READPASSPHRASE
+#define HAVE_FREEZERO
 #define HAVE_GETLINE
 #define HAVE_GETOPT
-/* #undef HAVE_ARC4RANDOM_BUF */
+#define HAVE_GETPAGESIZE
 #define HAVE_GETRANDOM
-#define HAVE_DEV_URANDOM
+/* #undef HAVE_MEMSET_S */
+#define HAVE_POSIX_IOCTL
+#define HAVE_READPASSPHRASE
+#define HAVE_RECALLOCARRAY
+#define HAVE_SIGACTION
+#define HAVE_SIGNAL_H
+#define HAVE_STRLCAT
+#define HAVE_STRLCPY
+#define HAVE_SYSCONF
+#define HAVE_SYS_RANDOM_H
+/* #undef HAVE_TIMESPECSUB */
+#define HAVE_TIMINGSAFE_BCMP
+#define HAVE_UNISTD_H
diff --git a/pkg/libfido2/gen.lua b/pkg/libfido2/gen.lua
@@ -2,6 +2,7 @@ cflags{
 	'-std=c11', '-Wall', '-Wpedantic',
 	'-Wno-overflow',  -- ioctl opcode conversion
 	'-include $outdir/config.h',
+	'-D _GNU_SOURCE',
 	'-D _DEFAULT_SOURCE',
 	'-D _FIDO_INTERNAL',
 	'-I $srcdir/src',
@@ -9,6 +10,7 @@ cflags{
 	'-isystem $builddir/pkg/bearssl/include',
 	'-isystem $builddir/pkg/libcbor/include',
 	'-isystem $builddir/pkg/linux-headers/include',
+	'-isystem $builddir/pkg/zlib/include',
 }
 
 pkg.hdrs = copy('$outdir/include', '$srcdir/src', {
@@ -23,6 +25,7 @@ pkg.deps = {
 	'pkg/bearssl/headers',
 	'pkg/libcbor/headers',
 	'pkg/linux-headers/headers',
+	'pkg/zlib/headers',
 }
 
 build('cat', '$outdir/config.h', {
@@ -39,6 +42,8 @@ lib('libfido2.a', [[
 		blob.c
 		buf.c
 		cbor.c
+		compress.c
+		config.c
 		cred.c
 		credman.c
 		dev.c
@@ -50,6 +55,7 @@ lib('libfido2.a', [[
 		info.c
 		io.c
 		iso7816.c
+		largeblob.c
 		log.c
 		pin.c
 		random.c
@@ -63,6 +69,7 @@ lib('libfido2.a', [[
 	$builddir/pkg/bearssl/libbearssl.a
 	$builddir/pkg/libcbor/libcbor.a
 	$builddir/pkg/openbsd/libbsd.a
+	$builddir/pkg/zlib/libz.a
 ]])
 
 lib('libcommon.a', [[tools/(base64.c util.c)]])
@@ -83,7 +90,9 @@ exe('fido2-token', [[
 	tools/(
 		fido2-token.c
 		bio.c
+		config.c
 		credman.c
+		largeblob.c
 		pin.c
 		token.c
 	)
diff --git a/pkg/libfido2/ver b/pkg/libfido2/ver
@@ -1 +1 @@
-1.6.0 r0
+1.7.0 r0