Replace some obsolete functions in gnus

* lisp/gnus/mml-sec.el (mml-secure-epg-encrypt):
* lisp/gnus/smime.el (smime-ask-passphrase): Replace obsolete functions.

diff --git a/lisp/gnus/mml-sec.el b/lisp/gnus/mml-sec.el
index 099e5372b4885c2e426ba9ec48782e4019a9f495..3855d7b796447ee4528c0313507cb080ec3d69ea 100644 (file)
--- a/lisp/gnus/mml-sec.el
+++ b/lisp/gnus/mml-sec.el
@@ -903,7 +903,7 @@ If no one is selected, symmetric encryption will be performed.  "
 (defun mml-secure-epg-encrypt (protocol cont &optional sign)
   ;; Based on code appearing inside mml2015-epg-encrypt.
   (let* ((context (epg-make-context protocol))
-        (config (epg-configuration))
+        (config (epg-find-configuration 'OpenPGP))
         (sender (message-options-get 'message-sender))
         (recipients (mml-secure-recipients protocol context config sender))
         (signer-names (mml-secure-signer-names protocol sender))

diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el
index 3e722d2d82d540c465ac246a1d4a0d6e233bcd62..d55cea724fbc6ae76342f41367e9dd60c5d1ebb2 100644 (file)
--- a/lisp/gnus/smime.el
+++ b/lisp/gnus/smime.el
@@ -234,10 +234,11 @@ must be set in `ldap-host-parameters-alist'."
 If `cache-key' and `password-cache' is non-nil then cache the
 password under `cache-key'."
   (let ((passphrase
-        (password-read-and-add
+        (password-read
          "Passphrase for secret key (RET for no passphrase): " cache-key)))
     (if (string= passphrase "")
        nil
+      (and passphrase cache-key (password-cache-add cache-key passphrase))
       passphrase)))
 
 ;; OpenSSL wrappers.