From: Michael Albinus <michael.albinus@gmx.de>
Date: Mon, 9 Aug 2021 12:45:43 +0000 (+0200)
Subject: Fix last commit of tramp.el
X-Git-Tag: emacs-28.0.90~1579
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e5b2e5356f78e70fbb3dbfdb2abff17bb84efc2d;p=emacs.git

Fix last commit of tramp.el
---

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)