From: Michael Albinus <michael.albinus@gmx.de>
Date: Wed, 14 Feb 2024 16:27:43 +0000 (+0100)
Subject: Minor Tramp doc adaption
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7e5bf788f50ae6c58e98f8e4ba82f639a259a6fa;p=emacs.git

Minor Tramp doc adaption

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

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

(cherry picked from commit 0c7c8210cb6a87a06b61451d19f3601975569946)
---

diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index bdc7de37556..d8ed22e77a3 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -5243,8 +5243,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 3c63d3fe6c3..08444e020b8 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -745,9 +745,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.
@@ -770,6 +769,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.