From 8bb28e740dd2cc8058d7833dd60b0ef9a8765c1b Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Sun, 26 Sep 2021 01:53:56 +0200 Subject: ; Minor stylistic checkdoc fixes in test/**/*.el --- test/lisp/comint-tests.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test/lisp/comint-tests.el') diff --git a/test/lisp/comint-tests.el b/test/lisp/comint-tests.el index 8a9a41f452f..19d0cca88c8 100644 --- a/test/lisp/comint-tests.el +++ b/test/lisp/comint-tests.el @@ -1,4 +1,4 @@ -;;; comint-tests.el -*- lexical-binding:t -*- +;;; comint-tests.el --- Tests for comint.el -*- lexical-binding:t -*- ;; Copyright (C) 2010-2021 Free Software Foundation, Inc. @@ -94,4 +94,4 @@ password flow if it returns a nil value." ;; no-byte-compile: t ;; End: -;;; comint-testsuite.el ends here +;;; comint-tests.el ends here -- cgit v1.2.3 From bec88ecc82fd6154351a22b67315d9e0b358c046 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Mon, 27 Sep 2021 07:55:37 +0200 Subject: Add "passwd" (change password) prompt to comint * lisp/comint.el (comint-password-prompt-regexp): Add "passwd" (to change the password) first promp in Debian bullseye. --- lisp/comint.el | 1 + test/lisp/comint-tests.el | 1 + 2 files changed, 2 insertions(+) (limited to 'test/lisp/comint-tests.el') diff --git a/lisp/comint.el b/lisp/comint.el index 8bf23897f9e..26aa5547a31 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -372,6 +372,7 @@ This variable is buffer-local." "\\(^ *\\|" (regexp-opt '("Enter" "enter" "Enter same" "enter same" "Enter the" "enter the" + "Current" "Enter Auth" "enter auth" "Old" "old" "New" "new" "'s" "login" "Kerberos" "CVS" "UNIX" " SMB" "LDAP" "PEM" "SUDO" "[sudo]" "doas" "Repeat" "Bad" "Retype" "Verify") diff --git a/test/lisp/comint-tests.el b/test/lisp/comint-tests.el index 19d0cca88c8..4cba1e4cf23 100644 --- a/test/lisp/comint-tests.el +++ b/test/lisp/comint-tests.el @@ -43,6 +43,7 @@ "PIN for user:" ; Bug#35523 "Password (again):" "Enter password:" + "Current password:" ; "passwd" (to change password) in Debian. "Enter Auth Password:" ; OpenVPN (Bug#35724) "Verify password: " ; zip -e zipfile.zip ... (Bug#47209) "Mot de Passe :" ; localized (Bug#29729) -- cgit v1.2.3 From 00011c0ad28cdf1516c854e5fe088a2681aa641c Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Mon, 27 Sep 2021 08:15:24 +0200 Subject: Make comint understand the ccrypt password phrases * lisp/comint.el (comint-password-prompt-regexp): Add the ccrypt confirmation phrase (bug#50837). * lisp/international/mule-conf.el (password-word-equivalents): Add the ccrypt phrases. --- lisp/comint.el | 5 ++++- lisp/international/mule-conf.el | 1 + test/lisp/comint-tests.el | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) (limited to 'test/lisp/comint-tests.el') diff --git a/lisp/comint.el b/lisp/comint.el index 26aa5547a31..1e5b990c77a 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -382,7 +382,10 @@ This variable is buffer-local." "\\(?:" (regexp-opt password-word-equivalents) "\\|Response\\)" "\\(?:\\(?:, try\\)? *again\\| (empty for no passphrase)\\| (again)\\)?" ;; "[[:alpha:]]" used to be "for", which fails to match non-English. - "\\(?: [[:alpha:]]+ .+\\)?[[:blank:]]*[:：៖][[:space:]]*\\'") + "\\(?: [[:alpha:]]+ .+\\)?[[:blank:]]*[:：៖][[:space:]]*\\'" + ;; The ccrypt encryption dialogue doesn't end with a colon, so + ;; treat it specially. + "\\|^Enter encryption key: (repeat) *\\'") "Regexp matching prompts for passwords in the inferior process. This is used by `comint-watch-for-password-prompt'." :version "28.1" diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el index 2d36dab6320..9a68fce2e81 100644 --- a/lisp/international/mule-conf.el +++ b/lisp/international/mule-conf.el @@ -1679,6 +1679,7 @@ for decoding and encoding files, process I/O, etc." (defcustom password-word-equivalents '("password" "passcode" "passphrase" "pass phrase" "pin" + "decryption key" "encryption key" ; From ccrypt. ; These are sorted according to the GNU en_US locale. "암호" ; ko "パスワード" ; ja diff --git a/test/lisp/comint-tests.el b/test/lisp/comint-tests.el index 4cba1e4cf23..e1bac81a185 100644 --- a/test/lisp/comint-tests.el +++ b/test/lisp/comint-tests.el @@ -44,6 +44,9 @@ "Password (again):" "Enter password:" "Current password:" ; "passwd" (to change password) in Debian. + "Enter encryption key: " ; ccrypt + "Enter decryption key: " ; ccrypt + "Enter encryption key: (repeat) " ; ccrypt "Enter Auth Password:" ; OpenVPN (Bug#35724) "Verify password: " ; zip -e zipfile.zip ... (Bug#47209) "Mot de Passe :" ; localized (Bug#29729) -- cgit v1.2.3 From 14bbebcf1d217dcfc679fc95f195867cdf267f89 Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Sun, 7 Nov 2021 21:34:41 +0100 Subject: Match password prompts from new OpenSSH * lisp/comint.el (comint-password-prompt-regexp): Add support for the openssh-8.6p1 "(user@host) Password:" format (bug#51666). --- lisp/comint.el | 6 ++++-- test/lisp/comint-tests.el | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'test/lisp/comint-tests.el') diff --git a/lisp/comint.el b/lisp/comint.el index c114bdf758a..adae971eff2 100644 --- a/lisp/comint.el +++ b/lisp/comint.el @@ -385,10 +385,12 @@ This variable is buffer-local." "\\(?: [[:alpha:]]+ .+\\)?[[:blank:]]*[:：៖][[:space:]]*\\'" ;; The ccrypt encryption dialogue doesn't end with a colon, so ;; treat it specially. - "\\|^Enter encryption key: (repeat) *\\'") + "\\|^Enter encryption key: (repeat) *\\'" + ;; openssh-8.6p1 format: "(user@host) Password:". + "\\|^([^)@ \t\n]+@[^)@ \t\n]+) Password: *\\'") "Regexp matching prompts for passwords in the inferior process. This is used by `comint-watch-for-password-prompt'." - :version "28.1" + :version "29.1" :type 'regexp :group 'comint) diff --git a/test/lisp/comint-tests.el b/test/lisp/comint-tests.el index e1bac81a185..0bd5c1e9d15 100644 --- a/test/lisp/comint-tests.el +++ b/test/lisp/comint-tests.el @@ -43,6 +43,7 @@ "PIN for user:" ; Bug#35523 "Password (again):" "Enter password:" + "(user@host) Password: " ; openssh-8.6p1 "Current password:" ; "passwd" (to change password) in Debian. "Enter encryption key: " ; ccrypt "Enter decryption key: " ; ccrypt -- cgit v1.2.3