Reverted.

[elisp/semi.git] / mime-pgp.el

diff --git a/mime-pgp.el b/mime-pgp.el
index fc1b1db..2373b61 100644 (file)
--- a/mime-pgp.el
+++ b/mime-pgp.el
@@ -22,8 +22,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -51,14 +51,7 @@
 ;;; Code:
 
 (require 'mime-play)
-(require 'pgg-def)
-
-(autoload 'pgg-decrypt-region "pgg"
-  "PGP decryption of current region." t)
-(autoload 'pgg-verify-region "pgg"
-  "PGP verification of current region." t)
-(autoload 'pgg-snarf-keys-region "pgg"
-  "Snarf PGP public keys in current region." t)
+(require 'epg)
 
 ;;; @ Internal method for multipart/signed
 ;;;
@@ -83,14 +76,20 @@
          (format "%s-%s" (buffer-name) (mime-entity-number entity)))
         (mother (current-buffer))
         (preview-buffer (concat "*Preview-" (buffer-name) "*"))
-        representation-type message-buf)
+        representation-type message-buf context plain)
     (set-buffer (setq message-buf (get-buffer-create new-name)))
     (erase-buffer)
     (mime-insert-entity entity)
     (cond ((progn
             (goto-char (point-min))
             (re-search-forward "^-+BEGIN PGP SIGNED MESSAGE-+$" nil t))
-          (pgg-verify-region (match-beginning 0)(point-max) nil 'fetch)
+          (setq context (epg-make-context))
+          (epg-verify-string
+           context
+           (buffer-substring (match-beginning 0)(point-max)))
+          (message "%s"
+                   (epg-verify-result-to-string
+                    (epg-context-result-for context 'verify)))
           (goto-char (point-min))
           (delete-region
            (point-min)
@@ -109,9 +108,13 @@
          ((progn
             (goto-char (point-min))
             (re-search-forward "^-+BEGIN PGP MESSAGE-+$" nil t))
-          (pgg-decrypt-region (point-min)(point-max))
+          (setq context (epg-make-context))
+          (setq plain
+                (epg-decrypt-string
+                 context
+                 (buffer-substring (point-min)(point-max))))
           (delete-region (point-min)(point-max))
-          (insert-buffer pgg-output-buffer)
+          (insert plain)
           (setq representation-type 'binary)))
     (setq major-mode 'mime-show-message-mode)
     (save-window-excursion
@@ -136,30 +139,17 @@
                   (1- knum)
                 (1+ knum)))
         (orig-entity (nth onum (mime-entity-children mother)))
-        (basename (expand-file-name "tm" temporary-file-directory))
-        (sig-file (concat (make-temp-name basename) ".asc"))
-        status)
-    (save-excursion 
-      (mime-show-echo-buffer)
-      (set-buffer mime-echo-buffer-name)
-      (set-window-start 
-       (get-buffer-window mime-echo-buffer-name)
-       (point-max)))
-    (mime-write-entity-content entity sig-file)
-    (unwind-protect
-       (with-temp-buffer
-         (mime-insert-entity orig-entity)
-         (goto-char (point-min))
-         (while (progn (end-of-line) (not (eobp)))
-           (insert "\r")
-           (forward-line 1))
-         (setq status (pgg-verify-region (point-min)(point-max) 
-                                         sig-file 'fetch))
-         (save-excursion 
-           (set-buffer mime-echo-buffer-name)
-           (insert-buffer-substring (if status pgg-output-buffer
-                                      pgg-errors-buffer))))
-      (delete-file sig-file))))
+        (context (epg-make-context)))
+    (epg-verify-string context
+                      (mime-entity-content entity)
+                      (with-temp-buffer
+                        (if (fboundp 'set-buffer-multibyte)
+                            (set-buffer-multibyte nil))
+                        (mime-insert-entity orig-entity)
+                        (buffer-substring)))
+    (message "%s"
+            (epg-verify-result-to-string
+             (epg-context-result-for context 'verify)))))
 
 
 ;;; @ Internal method for application/pgp-encrypted
@@ -184,21 +174,13 @@
 ;;; draft-ietf-openpgp-mime-02.txt (OpenPGP/MIME).
 
 (defun mime-add-application/pgp-keys (entity situation)
-  (save-excursion 
-    (mime-show-echo-buffer)
-    (set-buffer mime-echo-buffer-name)
-    (set-window-start 
-     (get-buffer-window mime-echo-buffer-name)
-     (point-max)))
   (with-temp-buffer
     (mime-insert-entity-content entity)
     (mime-decode-region (point-min) (point-max)
                         (cdr (assq 'encoding situation)))
-    (let ((status (pgg-snarf-keys-region (point-min)(point-max))))
-      (save-excursion 
-       (set-buffer mime-echo-buffer-name)
-       (insert-buffer-substring (if status pgg-output-buffer
-                                  pgg-errors-buffer))))))
+    (epg-import-keys-from-string (epg-make-context)
+                                (buffer-substring (point-min)(point-max)))
+    (epa-list-keys)))
 
 
 ;;; @ Internal method for application/pkcs7-signature