(mime-method-to-verify-application/pgp-signature): Don't use temporary

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

diff --git a/mime-pgp.el b/mime-pgp.el
index 0ff9edb..0eb5ae8 100644 (file)
--- a/mime-pgp.el
+++ b/mime-pgp.el
@@ -121,10 +121,9 @@
   "Internal method to verify multipart/signed."
   (mime-raw-play-entity
    ;; entity-info of signature
-   (mime-raw-reversed-entity-number-to-entity-info
-    ;; reversed-entity-number of signature
-    (cons 1 (reverse (mime-raw-point-to-entity-number start)))
-    mime-raw-message-info)
+   (mime-raw-entity-node-id-to-entity-info
+    ;; entity-node-id of signature
+    (cons 1 (mime-raw-point-to-entity-node-id start)))
    (cdr (assq 'mode cal)) ; play-mode
    ))
 
@@ -177,17 +176,15 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
 (defun mime-method-to-verify-application/pgp-signature (start end cal)
   "Internal method to check PGP/MIME signature."
   (let* ((encoding (cdr (assq 'encoding cal)))
-        (entity-number (mime-raw-point-to-entity-number start))
-        (reversed-entity-number (reverse entity-number))
-        (rmcnum (cdr reversed-entity-number))
-        (knum (car reversed-entity-number))
+        (entity-node-id (mime-raw-point-to-entity-node-id start))
+        (mother-node-id (cdr entity-node-id))
+        (knum (car entity-node-id))
         (onum (if (> knum 0)
                   (1- knum)
                 (1+ knum)))
         (raw-buf (current-buffer))
-        (oinfo (mime-raw-reversed-entity-number-to-entity-info
-                (cons onum rmcnum) mime-raw-message-info))
-        kbuf
+        (oinfo (mime-raw-entity-node-id-to-entity-info
+                (cons onum mother-node-id) mime-raw-message-info))
         (basename (expand-file-name "tm" mime-temp-directory))
         (orig-file (make-temp-name basename))
         (sig-file (concat orig-file ".sig"))
@@ -203,7 +200,7 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
       (while (re-search-forward "\n" nil t)
        (replace-match "\r\n")
        )
-      (as-binary-output-file (write-region (point-min)(point-max) orig-file))
+      (write-region-as-binary (point-min)(point-max) orig-file)
       (kill-buffer (current-buffer))
       )
     (save-excursion (mime-show-echo-buffer))
@@ -213,11 +210,8 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
                     (and (search-forward "\n\n")
                          (match-end 0))
                     )))
-       (set-buffer (setq kbuf (get-buffer-create mime-temp-buffer-name)))
-       (insert-buffer-substring raw-buf p-min end)
+       (mime-write-decoded-region p-min end sig-file encoding)
        )
-      (mime-decode-region (point-min)(point-max) encoding)
-      (as-binary-output-file (write-region (point-min)(point-max) sig-file))
       (or (mime-pgp-check-signature mime-echo-buffer-name orig-file)
          (let (pgp-id)
            (save-excursion
@@ -247,7 +241,6 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
       (let ((other-window-scroll-buffer mime-echo-buffer-name))
        (scroll-other-window 8)
        )
-      (kill-buffer kbuf)
       (delete-file orig-file)
       (delete-file sig-file)
       )))
@@ -262,15 +255,14 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
 ;;; It is based on RFC 2015 (PGP/MIME).
 
 (defun mime-method-to-decrypt-application/pgp-encrypted (start end cal)
-  (let* ((entity-number (mime-raw-point-to-entity-number start))
-        (reversed-entity-number (reverse entity-number))
-        (rmcnum (cdr reversed-entity-number))
-        (knum (car reversed-entity-number))
+  (let* ((entity-node-id (mime-raw-point-to-entity-node-id start))
+        (mother-node-id (cdr entity-node-id))
+        (knum (car entity-node-id))
         (onum (if (> knum 0)
                   (1- knum)
                 (1+ knum)))
-        (oinfo (mime-raw-reversed-entity-number-to-entity-info
-                (cons onum rmcnum) mime-raw-message-info))
+        (oinfo (mime-raw-entity-node-id-to-entity-info
+                (cons onum mother-node-id) mime-raw-message-info))
         (obeg (mime-entity-info-point-min oinfo))
         (oend (mime-entity-info-point-max oinfo))
         )