[Emacs-diffs] Changes to emacs/lisp/gnus/smime.el

[Miles Bader]

Index: emacs/lisp/gnus/smime.el
diff -c emacs/lisp/gnus/smime.el:1.4 emacs/lisp/gnus/smime.el:1.5
*** emacs/lisp/gnus/smime.el:1.4        Wed Feb  9 15:50:37 2005
--- emacs/lisp/gnus/smime.el    Fri Feb 25 01:52:09 2005
***************
*** 332,347 ****
  KEYFILE should contain a PEM encoded key and certificate."
    (interactive)
    (with-current-buffer (or buffer (current-buffer))
!     (smime-sign-region
!      (point-min) (point-max)
!      (if keyfile
!        keyfile
!        (smime-get-key-with-certs-by-email
!       (completing-read
!        (concat "Sign using which key? "
!                (if smime-keys (concat "(default " (caar smime-keys) ") ")
!                  ""))
!        smime-keys nil nil (car-safe (car-safe smime-keys))))))))
  
  (defun smime-encrypt-buffer (&optional certfiles buffer)
    "S/MIME encrypt BUFFER for recipients specified in CERTFILES.
--- 332,348 ----
  KEYFILE should contain a PEM encoded key and certificate."
    (interactive)
    (with-current-buffer (or buffer (current-buffer))
!     (unless (smime-sign-region
!            (point-min) (point-max)
!            (if keyfile
!                keyfile
!              (smime-get-key-with-certs-by-email
!               (completing-read
!                (concat "Sign using which key? "
!                        (if smime-keys (concat "(default " (caar smime-keys) 
") ")
!                          ""))
!                smime-keys nil nil (car-safe (car-safe smime-keys))))))
!       (error "Signing failed"))))
  
  (defun smime-encrypt-buffer (&optional certfiles buffer)
    "S/MIME encrypt BUFFER for recipients specified in CERTFILES.
***************
*** 350,360 ****
  nil."
    (interactive)
    (with-current-buffer (or buffer (current-buffer))
!     (smime-encrypt-region
!      (point-min) (point-max)
!      (or certfiles
!        (list (read-file-name "Recipient's S/MIME certificate: "
!                              smime-certificate-directory nil))))))
  
  ;; Verify+decrypt region
  
--- 351,362 ----
  nil."
    (interactive)
    (with-current-buffer (or buffer (current-buffer))
!     (unless (smime-encrypt-region
!            (point-min) (point-max)
!            (or certfiles
!                (list (read-file-name "Recipient's S/MIME certificate: "
!                                      smime-certificate-directory nil))))
!       (error "Encryption failed"))))
  
  ;; Verify+decrypt region