procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor Tramp doc adaption

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

* lisp/net/tramp.el: Adapt comments.
This commit is contained in:
Michael Albinus 2024-02-14 17:27:43 +01:00
parent df243f785d
commit 0c7c8210cb
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/misc/tramp.texi
View file

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

6
lisp/net/tramp.el
View file

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