Minor Tramp doc adaption

* doc/misc/tramp.texi (Frequently Asked Questions): Be more
precise with FIDO2 keys.

* lisp/net/tramp.el: Adapt comments.

diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index db9cefbf966059d888eb32e6bbd82e6f9d71b317..0bed7dbe21535b0a7e57d2a91033655712bea869 100644 (file)
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -5075,8 +5075,8 @@ the additional handshaking messages for them.  This requires at least
 nitrokey, or titankey.
 @c @uref{https://docs.fedoraproject.org/en-US/quick-docs/using-yubikeys/}
 
-@strong{Note} that there are reports on problems of handling yubikey
-residential keys by @command{ssh-agent}.  As workaround, you might
+@strong{Note} that there are reports on problems of handling FIDO2
+(residential) keys by @command{ssh-agent}.  As workaround, you might
 disable @command{ssh-agent} for such keys.
 
 @item

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index f3da56e7a4fa936ab838c0517a31ca8e78d2225c..9d883c96252d27853a7ad9e29932d01a5108ecec 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -763,9 +763,8 @@ The regexp should match at end of buffer."
 
 ;; A security key requires the user physically to touch the device
 ;; with their finger.  We must tell it to the user.
-;; Added in OpenSSH 8.2.  I've tested it with yubikey.  Nitrokey and
-;; Titankey, which have also passed the tests, do not show such a
-;; message.
+;; Added in OpenSSH 8.2.  I've tested it with Nitrokey, Titankey, and
+;; Yubikey.
 (defcustom tramp-security-key-confirm-regexp
   (rx bol (* "\r") "Confirm user presence for key " (* nonl) (* (any "\r\n")))
   "Regular expression matching security key confirmation message.
@@ -788,6 +787,7 @@ The regexp should match at end of buffer."
   :version "28.1"
   :type 'regexp)
 
+;; Needed only for FIDO2 (residential) keys.  Tested with Nitrokey and Yubikey.
 (defcustom tramp-security-key-pin-regexp
   (rx bol (* "\r") (group "Enter PIN for " (* nonl)) (* (any "\r\n")))
   "Regular expression matching security key PIN prompt.