(autoload 'pgg-insert-key "pgg"
"Insert PGP public key at point." t)
(autoload 'smime-encrypt-region "smime"
- "S/MIME encryption of current region." t)
+ "S/MIME encryption of current region.")
(autoload 'smime-sign-region "smime"
- "S/MIME signature of current region." t)
+ "S/MIME signature of current region.")
+(defvar smime-output-buffer)
+(defvar smime-errors-buffer)
;;; @ version
"A string formatted version of mime-transfer-level")
(make-variable-buffer-local 'mime-transfer-level-string)
-
;;; @@ about content transfer encoding
(defvar mime-content-transfer-encoding-priority-list
" ("
(mime-product-code-name mime-library-product)
") "
- (condition-case nil
- (progn
- (require 'apel-ver)
- (concat (apel-version) " "))
- (file-error nil))
+ (if (fboundp 'apel-version)
+ (concat (apel-version) " "))
(if (featurep 'xemacs)
(concat (cond ((featurep 'utf-2000)
(concat "UTF-2000-MULE/" utf-2000-version))
(mime-create-tag
(mime-edit-set-parameter
(mime-edit-get-contype tag)
- "charset" (upcase (symbol-name charset)))
+ "charset"
+ (let ((comment (get charset 'mime-charset-comment)))
+ (if comment
+ (concat (upcase (symbol-name charset)) " (" comment ")")
+ (upcase (symbol-name charset)))))
(mime-edit-get-encoding tag)))
))))
(replace-match (concat "-" (substring tag 2)))
)))))
+(defvar mime-edit-pgp-user-id nil)
+
(defun mime-edit-sign-pgp-mime (beg end boundary)
(save-excursion
(save-restriction
(goto-char beg)
(insert (format "--[[multipart/signed;
boundary=\"%s\"; micalg=sha1;
- protocol=\"application/x-pkcs7-signature\"][7bit]]
+ protocol=\"application/pkcs7-signature\"][7bit]]
--%s
" smime-boundary smime-boundary))
(goto-char (point-max))
- (insert "\n--" smime-boundary "\n")
+ (insert (format "\n--%s
+Content-Type: application/pkcs7-signature; name=\"smime.p7s\"
+Content-Transfer-Encoding: base64
+Content-Disposition: attachment; filename=\"smime.p7s\"
+Content-Description: S/MIME Cryptographic Signature
+
+" smime-boundary))
(insert-buffer-substring smime-output-buffer)
(goto-char (point-max))
(insert (format "\n--%s--\n" smime-boundary))
(throw 'mime-edit-error 'pgp-error)
)
(delete-region (point-min)(point-max))
- (with-current-buffer smime-output-buffer
- (goto-char (point-min))
- (delete-region (point-min) (progn
- (re-search-forward "^$" nil t)
- (point))))
- (insert "--[[application/x-pkcs7-mime
-Content-Disposition: attachment; filename=\"smime.p7m\"][base64]]\n")
+ (insert "--[[application/pkcs7-mime; name=\"smime.p7m\"
+Content-Disposition: attachment; filename=\"smime.p7m\"
+Content-Description: S/MIME Encrypted Message][base64]]\n")
(insert-buffer-substring smime-output-buffer)
))))
(defvar mime-edit-pgp-processing nil)
(make-variable-buffer-local 'mime-edit-pgp-processing)
-(defvar mime-edit-pgp-user-id nil)
-
(defun mime-edit-set-sign (arg)
(interactive
(list