passkey: change fido2 to passkey

Passkey is a more general term that the industry is using currently.

Signed-off-by: Iker Pedrosa <[email protected]>

Reviewed-by: Justin Stephenson <[email protected]>
Reviewed-by: Sumit Bose <[email protected]>

Makefile.am

@@ -188,9 +188,9 @@ if BUILD_SEMANAGE
 sssdlibexec_PROGRAMS += selinux_child
 endif
 sssdlibexec_PROGRAMS += p11_child
-if BUILD_FIDO2
-sssdlibexec_PROGRAMS += fido2_child
-endif # BUILD_FIDO2
+if BUILD_PASSKEY
+sssdlibexec_PROGRAMS += passkey_child
+endif # BUILD_PASSKEY
 if BUILD_OIDC_CHILD
 sssdlibexec_PROGRAMS += oidc_child
 endif
@@ -327,9 +327,9 @@ if BUILD_KCM_RENEWAL
 non_interactive_cmocka_based_tests += test_kcm_renewals
 endif # BUILD_KCM_RENEWAL
 
-if BUILD_FIDO2
-non_interactive_cmocka_based_tests += test_fido2
-endif # BUILD_FIDO2
+if BUILD_PASSKEY
+non_interactive_cmocka_based_tests += test_passkey
+endif # BUILD_PASSKEY
 
 
 if BUILD_SAMBA
@@ -916,7 +916,7 @@ dist_noinst_HEADERS = \
     src/shared/safealign.h \
     src/p11_child/p11_child.h \
     src/oidc_child/oidc_child_util.h \
-    src/fido2_child/fido2_child.h \
+    src/passkey_child/passkey_child.h \
     $(NULL)
 
 
@@ -3788,17 +3788,17 @@ test_sssd_krb5_locator_plugin_LDADD = \
     libsss_test_common.la \
     $(NULL)
 
-if BUILD_FIDO2
-test_fido2_SOURCES = \
-    src/fido2_child/fido2_child_common.c \
-    src/fido2_child/fido2_child_credentials.c \
-    src/fido2_child/fido2_child_devices.c \
-    src/tests/cmocka/test_fido2_child.c \
+if BUILD_PASSKEY
+test_passkey_SOURCES = \
+    src/passkey_child/passkey_child_common.c \
+    src/passkey_child/passkey_child_credentials.c \
+    src/passkey_child/passkey_child_devices.c \
+    src/tests/cmocka/test_passkey_child.c \
     $(NULL)
-test_fido2_CFLAGS = \
+test_passkey_CFLAGS = \
     $(AM_CFLAGS) \
     $(NULL)
-test_fido2_LDFLAGS = \
+test_passkey_LDFLAGS = \
     -Wl,-wrap,tcgetattr \
     -Wl,-wrap,tcsetattr \
     -Wl,-wrap,getline \
@@ -3815,15 +3815,15 @@ test_fido2_LDFLAGS = \
     -Wl,-wrap,fido_cred_id_len \
     -Wl,-wrap,fido_cred_pubkey_ptr \
     -Wl,-wrap,fido_cred_pubkey_len
-test_fido2_LDADD = \
+test_passkey_LDADD = \
     $(CMOCKA_LIBS) \
     $(SSSD_LIBS) \
     $(SSSD_INTERNAL_LTLIBS) \
     $(LIBADD_DL) \
-    $(FIDO2_LIBS) \
+    $(PASSKEY_LIBS) \
     libsss_test_common.la \
     $(NULL)
-endif # BUILD_FIDO2
+endif # BUILD_PASSKEY
 
 if BUILD_KCM
 test_kcm_marshalling_SOURCES = \
@@ -4722,28 +4722,28 @@ p11_child_LDADD += \
     $(SSL_LIBS) \
     $(NULL)
 
-if BUILD_FIDO2
-fido2_child_SOURCES = \
-    src/fido2_child/fido2_child.c \
-    src/fido2_child/fido2_child_common.c \
-    src/fido2_child/fido2_child_credentials.c \
-    src/fido2_child/fido2_child_devices.c \
+if BUILD_PASSKEY
+passkey_child_SOURCES = \
+    src/passkey_child/passkey_child.c \
+    src/passkey_child/passkey_child_common.c \
+    src/passkey_child/passkey_child_credentials.c \
+    src/passkey_child/passkey_child_devices.c \
     $(NULL)
 
-fido2_child_CFLAGS = \
+passkey_child_CFLAGS = \
     $(AM_CFLAGS) \
     $(POPT_CFLAGS)
 
-fido2_child_LDADD = \
+passkey_child_LDADD = \
     libsss_crypt.la \
     libsss_debug.la \
     $(TALLOC_LIBS) \
     $(DHASH_LIBS) \
     $(POPT_LIBS) \
-    $(FIDO2_LIBS) \
+    $(PASSKEY_LIBS) \
     $(SSSD_INTERNAL_LTLIBS) \
     $(NULL)
-endif # BUILD_FIDO2
+endif # BUILD_PASSKEY
 
 if BUILD_OIDC_CHILD
 oidc_child_SOURCES = \

configure.ac

@@ -186,7 +186,7 @@ WITH_SUDO_LIB_PATH
 WITH_AUTOFS
 WITH_SUBID
 WITH_SUBID_LIB_PATH
-WITH_FIDO2
+WITH_PASSKEY
 WITH_SSH
 WITH_IFP
 WITH_SYSLOG
@@ -261,13 +261,13 @@ AS_IF([test x$with_kcm = xyes], [
 ])
 
 m4_include([src/external/libunistring.m4])
-AS_IF([test x$with_fido2 = xyes], [
-    m4_include([src/external/libfido2.m4])
+AS_IF([test x$with_passkey = xyes], [
+    m4_include([src/external/libpasskey.m4])
 ])
-if test x"$found_fido2" = xyes; then
-    AC_DEFINE(BUILD_FIDO2, 1, [whether to build with FIDO2 support])
+if test x"$found_passkey" = xyes; then
+    AC_DEFINE(BUILD_PASSKEY, 1, [whether to build with passkey support])
 fi
-AM_CONDITIONAL([BUILD_FIDO2], [test x"$found_fido2" = xyes])
+AM_CONDITIONAL([BUILD_PASSKEY], [test x"$found_passkey" = xyes])
 
 UNICODE_LIBS=$UNISTRING_LIBS
 AC_SUBST(UNICODE_LIBS)

contrib/ci/configure.sh

@@ -83,7 +83,7 @@ fi
 
 if [[ "$DISTRO_BRANCH" == -redhat-fedora-* ]]; then
     CONFIGURE_ARG_LIST+=(
-        "--with-fido2"
+        "--with-passkey"
     )
 fi
 

contrib/fedora/bashrc_sssd

@@ -51,7 +51,7 @@ fedconfig()
         --with-test-dir=/dev/shm \
         --enable-all-experimental-features \
         --cache-file=/tmp/fedconfig.cache \
-        --with-fido2 \
+        --with-passkey \
         ${SSSD_NO_MANPAGES-} \
         "$@"
 }

src/conf_macros.m4

@@ -670,14 +670,14 @@ AC_DEFUN([WITH_SUBID_LIB_PATH],
     AC_SUBST(subidlibpath)
   ])
 
-AC_DEFUN([WITH_FIDO2],
-  [ AC_ARG_WITH([fido2],
-                [AC_HELP_STRING([--with-fido2],
-                                [Whether to build with FIDO2 support [no]]
+AC_DEFUN([WITH_PASSKEY],
+  [ AC_ARG_WITH([passkey],
+                [AC_HELP_STRING([--with-passkey],
+                                [Whether to build with passkey support [no]]
                                )
                 ],
-                [with_fido2=$withval],
-                with_fido2=no
+                [with_passkey=$withval],
+                with_passkey=no
                )
   ])
 

src/external/libpasskey.m4

@@ -0,0 +1,15 @@
+AC_SUBST(PASSKEY_LIBS)
+AC_SUBST(PASSKEY_CFLAGS)
+
+PKG_CHECK_MODULES([FIDO2], [libfido2], [found_passkey=yes], [found_passkey=no])
+
+SSS_AC_EXPAND_LIB_DIR()
+AS_IF([test x"$found_passkey" = xyes],
+    [AC_CHECK_HEADER([fido.h],
+        [AC_CHECK_LIB([fido2],
+                      [fido_dev_has_uv],
+                      [found_passkey=yes] [PASSKEY_LIBS="-lfido2"],
+                      [found_passkey=no])],
+        [found_passkey=no]
+    )]
+)

src/fido2_child/fido2_child.c → src/passkey_child/passkey_child.c

@@ -1,7 +1,7 @@
 /*
     SSSD
 
-    Helper child to commmunicate with FIDO2 devices
+    Helper child to commmunicate with passkey devices
 
     Authors:
         Iker Pedrosa <[email protected]>
@@ -28,12 +28,12 @@
 #include "util/debug.h"
 #include "util/util.h"
 
-#include "fido2_child.h"
+#include "passkey_child.h"
 
 int main(int argc, const char *argv[])
 {
     TALLOC_CTX *main_ctx = NULL;
-    struct fido2_data data;
+    struct passkey_data data;
     int init_flags = 0;
     errno_t ret = EOK;
 
@@ -43,7 +43,7 @@ int main(int argc, const char *argv[])
         goto done;
     }
 
-    DEBUG(SSSDBG_TRACE_FUNC, "fido2_child started.\n");
+    DEBUG(SSSDBG_TRACE_FUNC, "passkey_child started.\n");
 
     main_ctx = talloc_new(NULL);
     if (main_ctx == NULL) {