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

[Hiroshi Ogata]

どうも, 緒方です。

>>> Fri, 6 Feb 1998 00:03:27 +0900 の刻に 「ksakai」、すなわち
>>> ksakai at example.com(SAKAI Kiyotaka) 氏曰く

>> In article <19980205223540Q.nob at example.com>, MURATA Nobuhiro <nob at example.com> writes:

> 以下のようなpatchで pgp5.0i だけに対応させてみました。

ksakai> どっちを使うかは変数で切り換えられるようになっていると嬉しいと思うので

ちょっと, 手を加えてみました。こんな感じでどうでしょうか。
変数 mew-use-pgp50 を新設しました。
もうちょっと, スマートな切り替え方があるかも知れませんが..
(^.^;;)

-------------- next part --------------
diff -ur mew-1.93b12/mew-pgp.el mew-1.93b12-pgp50/mew-pgp.el
--- mew-1.93b12/mew-pgp.el	Wed Jan 28 21:39:09 1998
+++ mew-1.93b12-pgp50/mew-pgp.el	Sat Feb  7 02:34:02 1998
@@ -122,8 +122,12 @@
   (message "PGP verifying ... ")
   (save-excursion
     (mew-set-buffer-tmp)
-    (call-process mew-prog-pgp nil t nil 
-		  "+batchmode=on" "+language=en" file2 file1)
+    (if mew-use-pgp50
+	(call-process mew-prog-pgpv nil t nil 
+		      "+batchmode=on" "+language=en" file2 file1)
+      (call-process mew-prog-pgp nil t nil 
+		    "+batchmode=on" "+language=en" file2 file1)
+      )
     (message "PGP verifying ... done")
     (mew-pgp-verify-check)
     ))
@@ -154,10 +158,16 @@
       (write-region (point-min) (point-max) file2  nil 'no-msg)
       (setq file3 (concat (mew-make-temp-name) mew-pgp-ascii-suffix))
       (mew-set-buffer-tmp)
-      (apply (function call-process) 
-	     mew-prog-pgp nil t nil
-	     "-ea" "+language=en" "+batchmode=on" "+armorlines=0"
-	     "-o" file3 file1 decrypters)
+      (if mew-use-pgp50
+	  (apply (function call-process) 
+		 mew-prog-pgpe nil t nil
+		 "-a" "+language=en" "+batchmode=on" "+armorlines=0"
+		 "-o" file3 file1 "-r" decrypters)
+	(apply (function call-process) 
+	       mew-prog-pgp nil t nil
+	       "-ea" "+language=en" "+batchmode=on" "+armorlines=0"
+	       "-o" file3 file1 decrypters)
+	)
       (message "PGP encrypting ... done")
       (list file2 nil file3 nil (mew-pgp-encrypt-check)) ;; both ctes are 7bit
       )
@@ -179,11 +189,19 @@
   (let ((process-connection-type mew-connection-type2)
 	file3 process verify)
     (setq file3 (mew-make-temp-name))
-    (setq process (start-process "PGP decrypt"
-				 (current-buffer)
-				 mew-prog-pgp
-				 "+language=en" "+batchmode=off"
-				 "-o" file3 file2))
+    (setq process 
+	  (if mew-use-pgp50 
+	      (start-process "PGP decrypt"
+			     (current-buffer)
+			     mew-prog-pgpv
+			     "+language=en" "+batchmode=off"
+			     "-o" file3 file2)
+	    (start-process "PGP decrypt"
+			   (current-buffer)
+			   mew-prog-pgp
+			   "+language=en" "+batchmode=off"
+			   "-o" file3 file2))
+	  )
     (mew-set-process-cs process mew-cs-autoconv mew-cs-noconv)
     (set-process-filter process 'mew-pgp-process-filter1)
     (set-process-sentinel process 'mew-pgp-process-sentinel)
@@ -223,13 +241,23 @@
 	file2 process)
     (setq file2 (concat (mew-make-temp-name) mew-pgp-ascii-suffix))
     ;; not perfectly unique but OK
-    (setq process (start-process "PGP sign"
-				 (current-buffer)
-				 mew-prog-pgp
-				 "+language=en" "+batchmode=off"
-				 "-u" inherit-signer
-				 "-o" file2
-				 "-sab" file1))
+    (setq process 
+	  (if mew-use-pgp50 
+	      (start-process "PGP sign"
+			     (current-buffer)
+			     mew-prog-pgps
+			     "+language=en" "+batchmode=off"
+			     "-u" inherit-signer
+			     "-o" file2
+			     "-ab" file1)
+	    (start-process "PGP sign"
+			   (current-buffer)
+			   mew-prog-pgp
+			   "+language=en" "+batchmode=off"
+			   "-u" inherit-signer
+			   "-o" file2
+			   "-sab" file1))
+	  )
     (mew-set-process-cs process mew-cs-autoconv mew-cs-noconv)
     (set-process-filter process 'mew-pgp-process-filter1)
     (set-process-sentinel process 'mew-pgp-process-sentinel)
@@ -469,7 +497,10 @@
 	(setq user (mew-input-address2 "Who's key? (%s): " mew-mail-address))
 	(save-excursion
 	  (mew-set-buffer-tmp)
-	  (call-process mew-prog-pgp nil t nil "-fkxa" user)
+	  (if mew-use-pgp50
+	      (call-process mew-prog-pgpk nil t nil "-xa" user)
+	    (call-process mew-prog-pgp nil t nil "-fkxa" user)
+	    )
 	  (goto-char (point-min))
 	  (if (not (re-search-forward mew-pgp-key-begin nil t))
 	      (setq error t)
@@ -511,8 +542,12 @@
 	(set-buffer (mew-buffer-message))
 	(let ((buffer-read-only nil))
 	  (message "Adding PGP keys ... ")
-	  (call-process mew-prog-pgp nil t nil 
-			"+batchmode=on" "-ka" mew-pgp-tmp-file)
+	  (if mew-use-pgp50
+	      (call-process mew-prog-pgpk nil t nil 
+			    "+batchmode=on" "-a" mew-pgp-tmp-file)
+	    (call-process mew-prog-pgp nil t nil 
+			  "+batchmode=on" "-ka" mew-pgp-tmp-file)
+	    )
 	  (message "Adding PGP keys ... done")
 	  (insert "\n\n"
 		  "**************** IMPORTANT NOTE ****************\n"
diff -ur mew-1.93b12/mew-vars.el mew-1.93b12-pgp50/mew-vars.el
--- mew-1.93b12/mew-vars.el	Thu Jan 29 22:44:53 1998
+++ mew-1.93b12-pgp50/mew-vars.el	Sat Feb  7 01:26:40 1998
@@ -103,6 +103,7 @@
 (defvar mew-decode-error nil)
 (defvar mew-encode-syntax nil)
 (defvar mew-overlay-cursor-line nil)
+(defvar mew-use-pgp50 t)
 
 (mapcar
  (function make-variable-buffer-local)
@@ -186,6 +187,10 @@
 (defvar mew-prog-gzip        "gzip")
 (defvar mew-prog-utime       "utime")
 (defvar mew-prog-pgp         "pgp")
+(defvar mew-prog-pgpe        "pgpe")
+(defvar mew-prog-pgps        "pgps")
+(defvar mew-prog-pgpv        "pgpv")
+(defvar mew-prog-pgpk        "pgpk")
 (defvar mew-prog-uncompface  "uncompface")
 (defvar mew-prog-shell       "/bin/sh")
 ;(defvar mew-prog-shell       "cmd.exe")