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.

diff --git a/lisp/comint.el b/lisp/comint.el
index 26aa5547a31acc4480f2060e179a7c1999952c70..1e5b990c77a58d4dad90ab0724c0897846c9c581 100644 (file)
--- 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 2d36dab63204aab8afe891b840ef7e18b20f1150..9a68fce2e815a3e3fe491d4f85f365b387f7832a 100644 (file)
--- 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 4cba1e4cf233495c9cedc04cb6c459d90b2b96f6..e1bac81a185afe53c9a0e076439e7e3087297f96 100644 (file)
--- 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)