From b45c19b8f6802a82335790d0d7b973dae769e422 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Thu, 14 Nov 2019 01:42:22 -0800
Subject: openssh, libfido2: Update to latest git

This enables support for ed25519-sk keys.

Support for building in sk provider is now in upstream openssh.
---
 pkg/libfido2/gen.lua | 10 +++++-----
 pkg/libfido2/src     |  2 +-
 pkg/libfido2/ver     |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'pkg/libfido2')

diff --git a/pkg/libfido2/gen.lua b/pkg/libfido2/gen.lua
index cced1a40..bc9801a2 100644
--- a/pkg/libfido2/gen.lua
+++ b/pkg/libfido2/gen.lua
@@ -7,6 +7,11 @@ cflags{
 	'-I pkg/openbsd/include',
 }
 
+pkg.hdrs = copy('$outdir/include', '$srcdir/src', {
+	'fido.h',
+	'fido/err.h',
+	'fido/param.h',
+})
 pkg.deps = {
 	'pkg/libcbor/headers',
 	'pkg/libressl/headers',
@@ -43,9 +48,4 @@ lib('libfido2.a', [[
 	$builddir/pkg/libcbor/libcbor.a
 ]])
 
-lib('libsk-libfido2.a', {
-	'tools/sk-libfido2.c',
-	'libfido2.a.d',
-})
-
 fetch 'git'
diff --git a/pkg/libfido2/src b/pkg/libfido2/src
index 6a628b3d..12099171 160000
--- a/pkg/libfido2/src
+++ b/pkg/libfido2/src
@@ -1 +1 @@
-Subproject commit 6a628b3d3a9d62a58f94d48340ef9eeca2d672b9
+Subproject commit 12099171ba5ae230aa7d114115a5d1a10cf5975b
diff --git a/pkg/libfido2/ver b/pkg/libfido2/ver
index 6b655c30..c24ad255 100644
--- a/pkg/libfido2/ver
+++ b/pkg/libfido2/ver
@@ -1 +1 @@
-1.2.0-55-g6a628b3 r0
+1.2.0-74-g1209917 r0
-- 
cgit v1.2.3