aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2023-11-27 08:34:56 +0100
committerMichael Albinus2023-11-27 08:34:56 +0100
commit30841c71a5ddd70b63908fcbcdcc01ef82d8a770 (patch)
tree67e1dc75b3e29d42ad983abe063dd72b670f502b
parentdab7cc241f426af3c9fe901954fe48e415dcf75a (diff)
downloademacs-30841c71a5ddd70b63908fcbcdcc01ef82d8a770.tar.gz
emacs-30841c71a5ddd70b63908fcbcdcc01ef82d8a770.zip
Mention Titankey in Tramp, which has passed the tests
* doc/misc/tramp.texi (Frequently Asked Questions): * lisp/net/tramp.el (tramp-security-key-confirm-regexp): Mention also Titankey.
-rw-r--r--doc/misc/tramp.texi2
-rw-r--r--lisp/net/tramp.el5
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 0571c91115c..a4583a6074e 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -5069,7 +5069,7 @@ Yes. @command{OpenSSH} has added support for @acronym{FIDO} hardware
5069devices via special key types @option{*-sk}. @value{tramp} supports 5069devices via special key types @option{*-sk}. @value{tramp} supports
5070the additional handshaking messages for them. This requires at least 5070the additional handshaking messages for them. This requires at least
5071@command{OpenSSH} 8.2, and a @acronym{FIDO} @acronym{U2F} compatible 5071@command{OpenSSH} 8.2, and a @acronym{FIDO} @acronym{U2F} compatible
5072security key, like yubikey, solokey, or nitrokey. 5072security key, like yubikey, solokey, nitrokey, or titankey.
5073 5073
5074 5074
5075@item 5075@item
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 8b1a49edbae..5e8d6bbcd08 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -759,8 +759,9 @@ The regexp should match at end of buffer."
759 759
760;; A security key requires the user physically to touch the device 760;; A security key requires the user physically to touch the device
761;; with their finger. We must tell it to the user. 761;; with their finger. We must tell it to the user.
762;; Added in OpenSSH 8.2. I've tested it with yubikey. Nitrokey, 762;; Added in OpenSSH 8.2. I've tested it with yubikey. Nitrokey and
763;; which has also passed the tests, does not show such a message. 763;; Titankey, which have also passed the tests, do not show such a
764;; message.
764(defcustom tramp-security-key-confirm-regexp 765(defcustom tramp-security-key-confirm-regexp
765 (rx bol (* "\r") "Confirm user presence for key " (* nonl) (* (any "\r\n"))) 766 (rx bol (* "\r") "Confirm user presence for key " (* nonl) (* (any "\r\n")))
766 "Regular expression matching security key confirmation message. 767 "Regular expression matching security key confirmation message.