summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/net/tramp.el16
1 files changed, 12 insertions, 4 deletions
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 21757465fad..3a392dd5f8a 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -697,11 +697,19 @@ The regexp should match at end of buffer."
:version "27.1"
:type 'regexp)
-;; Yubikey requires the user physically to touch the device with their
-;; finger. We must tell it to the user.
-(defcustom tramp-yubikey-regexp
+;; 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.
+(defcustom tramp-security-key-confirm-regexp
"^\r*Confirm user presence for key .*[\r\n]*"
- "Regular expression matching yubikey confirmation message.
+ "Regular expression matching security key confirmation message.
+The regexp should match at end of buffer."
+ :version "28.1"
+ :type 'regexp)
+
+(defcustom tramp-security-key-confirmed-regexp
+ "^\r*User presence confirmed[\r\n]*"
+ "Regular expression matching security key confirmation message.
The regexp should match at end of buffer."
:version "28.1"
:type 'regexp)