;;;
;;; It is based on draft-kazu-pgp-mime-00.txt (PGP-kazu).
-(defun mime-method-for-application/pgp (start end cal)
- (let* ((entity-number (mime-raw-point-to-entity-number start))
+(defun mime-method-for-application/pgp (entity cal)
+ (let* ((start (mime-entity-point-min entity))
+ (end (mime-entity-point-max entity))
+ (entity-number (mime-raw-point-to-entity-number start))
(p-win (or (get-buffer-window mime-preview-buffer)
(get-largest-window)))
(new-name (format "%s-%s" (buffer-name) entity-number))
(the-buf (current-buffer))
(mother mime-preview-buffer)
(mode major-mode)
- text-decoder)
+ representation-type)
(set-buffer (get-buffer-create new-name))
(erase-buffer)
(insert-buffer-substring the-buf start end)
(while (re-search-forward "^- -" nil t)
(replace-match "-")
)
- (setq text-decoder
- (cdr (or (assq mode mime-text-decoder-alist)
- (assq t mime-text-decoder-alist))))
+ (setq representation-type
+ (cdr (or (assq mode mime-raw-representation-type-alist)
+ (assq t mime-raw-representation-type-alist))))
)
((progn
(goto-char (point-min))
(and
(search-forward "\n\n")
(match-end 0)))
- (setq text-decoder (function mime-text-decode-buffer))
+ (setq representation-type (function mime-text-decode-buffer))
))
(setq major-mode 'mime-show-message-mode)
- (setq mime-text-decoder text-decoder)
+ (setq mime-raw-representation-type representation-type)
(save-window-excursion (mime-view-mode mother))
(set-window-buffer p-win mime-preview-buffer)
))
-(set-atype 'mime-acting-condition
- '((type . application)(subtype . pgp)
- (method . mime-method-for-application/pgp)))
-
-(set-atype 'mime-acting-condition
- '((type . text)(subtype . x-pgp)
- (method . mime-method-for-application/pgp)))
-
;;; @ Internal method for multipart/signed
;;;
;;; It is based on RFC 1847 (security-multipart).
-(defun mime-method-to-verify-multipart/signed (start end cal)
+(defun mime-method-to-verify-multipart/signed (entity cal)
"Internal method to verify multipart/signed."
(mime-raw-play-entity
- ;; entity-info of signature
- (mime-raw-entity-node-id-to-entity-info
- ;; entity-node-id of signature
- (cons 1 (mime-raw-point-to-entity-node-id start)))
+ (nth 1 (mime-entity-children entity)) ; entity-info of signature
(cdr (assq 'mode cal)) ; play-mode
))
-(set-atype 'mime-acting-condition
- '((type . multipart)(subtype . signed)
- (method . mime-method-to-verify-multipart/signed)))
-
;;; @ Internal method for application/pgp-signature
;;;
(t "Bad signature")))
))))
-(defun mime-method-to-verify-application/pgp-signature (start end cal)
+(defun mime-method-to-verify-application/pgp-signature (entity cal)
"Internal method to check PGP/MIME signature."
- (let* ((encoding (cdr (assq 'encoding cal)))
+ (let* ((start (mime-entity-point-min entity))
+ (end (mime-entity-point-max entity))
+ (encoding (cdr (assq 'encoding cal)))
(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-entity-node-id-to-entity-info
+ (oinfo (mime-raw-find-entity-from-node-id
(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"))
)
- (write-region-as-binary (mime-entity-info-point-min oinfo)
- (mime-entity-info-point-max oinfo)
- orig-file)
+ (mime-raw-write-region (mime-entity-point-min oinfo)
+ (mime-entity-point-max oinfo)
+ orig-file)
(save-excursion (mime-show-echo-buffer))
(mime-write-decoded-region (save-excursion
(goto-char start)
(delete-file sig-file)
))
-(set-atype 'mime-acting-condition
- '((type . application)(subtype . pgp-signature)
- (method . mime-method-to-verify-application/pgp-signature)))
-
;;; @ Internal method for application/pgp-encrypted
;;;
;;; It is based on RFC 2015 (PGP/MIME).
-(defun mime-method-to-decrypt-application/pgp-encrypted (start end cal)
- (let* ((entity-node-id (mime-raw-point-to-entity-node-id start))
+(defun mime-method-to-decrypt-application/pgp-encrypted (entity cal)
+ (let* ((entity-node-id (mime-entity-node-id entity))
(mother-node-id (cdr entity-node-id))
(knum (car entity-node-id))
(onum (if (> knum 0)
(1- knum)
(1+ knum)))
- (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))
- )
- (mime-method-for-application/pgp obeg oend cal)
+ (oinfo (mime-raw-find-entity-from-node-id
+ (cons onum mother-node-id) mime-raw-message-info)))
+ (mime-method-for-application/pgp oinfo cal)
))
-(set-atype 'mime-acting-condition
- '((type . application)(subtype . pgp-encrypted)
- (method . mime-method-to-decrypt-application/pgp-encrypted)))
-
;;; @ Internal method for application/pgp-keys
;;;
;;; It is based on RFC 2015 (PGP/MIME).
-(defun mime-method-to-add-application/pgp-keys (start end cal)
- (let* ((entity-number (mime-raw-point-to-entity-number start))
+(defun mime-method-to-add-application/pgp-keys (entity cal)
+ (let* ((start (mime-entity-point-min entity))
+ (end (mime-entity-point-max entity))
+ (entity-number (mime-raw-point-to-entity-number start))
(new-name (format "%s-%s" (buffer-name) entity-number))
(encoding (cdr (assq 'encoding cal)))
str)
(kill-buffer (current-buffer))
))
-(set-atype 'mime-acting-condition
- '((type . application)(subtype . pgp-keys)
- (method . mime-method-to-add-application/pgp-keys)))
-
;;; @ end
;;;
projects / elisp / semi.git / blobdiff