[Mew-dist 03750] Re: can I use PGP 5.0i ?

[Hiroshi Ogata]

どうも, 緒方です。

>>> Wed, 11 Feb 1998 18:49:16 +0900 の刻に 「hiroshi」、すなわち
>>> hiroshi at example.com(Hiroshi Ogata) 氏曰く

hiroshi> pgp5.0 を使った時に署名の検証結果が表示されないので以下の

pgp5.0を使った時にも署名の検証結果が正しく表示されるようにな
りました。
[Mew-dist 03712] の patch は忘れて, (^.^;;) 以下の patch を
当てて下さい。

-------------- next part --------------
--- mew-1.93b13/mew-pgp.el	Tue Feb 10 15:19:49 1998
+++ mew-1.93b13.change/mew-pgp.el	Fri Feb 13 03:04:24 1998
@@ -45,7 +45,6 @@
 (defconst mew-pgp-msg-enter      "Enter")
 (defconst mew-pgp-msg-enter-pass "Enter pass phrase: ")
 (defconst mew-pgp-msg-reenter-pass "Enter pass phrase: ")
-(defconst mew-pgp-msg-no-key     "Key matching")
 (defconst mew-pgp-msg-no-keyring "Keyring file")
 (defconst mew-pgp-msg-no-seckey-or-secring
   "You do not have the secret key")
@@ -55,12 +54,16 @@
 
 (cond
  (mew-use-pgp5
+  (defconst mew-pgp-msg-no-key     "unknown keyid")
+  (defconst mew-pgp-msg-signature "\n\\(.*\\) signature made")
   (setq mew-prog-pgpe-arg "-a")
   (setq mew-prog-pgps-arg "-ba")
   (setq mew-prog-pgpk-add-arg "-a")
   (setq mew-prog-pgpk-ext-arg "-xa")
   )
  (t
+  (defconst mew-pgp-msg-no-key     "Key matching")
+  (defconst mew-pgp-msg-signature "\n\\(.*\\) signature from user \\(.*\\)\\.")
   (setq mew-prog-pgpe-arg "-ea")
   (setq mew-prog-pgps-arg "-sba")
   (setq mew-prog-pgpk-add-arg "-ka")
@@ -111,14 +114,21 @@
   (let (ret)
     (goto-char (point-min))
     (if (not (re-search-forward 
-	      "\n\\(.*\\) signature from user \\(.*\\)\\." nil t))
+	      mew-pgp-msg-signature nil t))
 	;; this is verification, so the error is about public key
 	(if (re-search-forward mew-pgp-msg-no-key nil t)
 	    (setq ret mew-pgp-result-pubkey)
 	  (goto-char (point-min))
 	  (if (re-search-forward  mew-pgp-msg-no-keyring nil t)
 	      (setq ret mew-pgp-result-pubring)))
-      (setq ret (concat (mew-match 1) " PGP sign " (mew-match 2)))
+      (if (not mew-use-pgp5)
+	  (setq ret (concat (mew-match 1) " PGP sign " (mew-match 2)))
+	(setq ret (concat (mew-match 1) " PGP sign "))
+	(goto-char (point-max))
+	(re-search-backward "   \\(.*\\)" nil t)
+	(setq ret (concat ret (mew-match 1)))
+	(goto-char (point-min))
+	)
       (if (re-search-forward "not certified with enough" nil t)
 	  (setq ret (concat ret " MARGINAL"))
 	(goto-char (point-min))
@@ -137,8 +147,11 @@
   (message "PGP verifying ... ")
   (save-excursion
     (mew-set-buffer-tmp)
-    (call-process mew-prog-pgpv nil t nil 
-		  "+batchmode=on" "+language=en" file2 file1)
+    (if mew-use-pgp5 
+	(call-process mew-prog-pgpv nil t nil 
+		      "+batchmode=on" "+language=en" file2 "-o" file1)
+      (call-process mew-prog-pgpv nil t nil 
+		    "+batchmode=on" "+language=en" file2 file1))
     (message "PGP verifying ... done")
     (mew-pgp-verify-check)
     ))