From: ueno <ueno>
Date: Wed, 3 Nov 1999 09:40:02 +0000 (+0000)
Subject: * mime-pgp.el (mime-pgp-keyserver-url-template): New variable
X-Git-Tag: emiko-1_13_7~93
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=cdf5e3a7b25636259377f5d2339e94a77de1b384;p=elisp%2Fsemi.git

* mime-pgp.el (mime-pgp-keyserver-url-template): New variable
imported from semi-pgpgpg.
(mime-pgp-keyserver-address): Ditto.
(mime-pgp-keyserver-port): Ditto.
(mime-pgp-keyserver-protocol): New variable.
(mime-pgp-fetch-key): New function.
(mime-verify-application/pgp-signature): Prompt user to fetch
signer's public key.
---

diff --git a/mime-pgp.el b/mime-pgp.el
index 5f0d59f..42a2e3b 100644
--- a/mime-pgp.el
+++ b/mime-pgp.el
@@ -175,9 +175,22 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
       (while (progn (end-of-line) (not (eobp)))
 	(insert "\r")
 	(forward-line 1))
-      (let ((pgg-output-buffer mime-echo-buffer-name))
-	(funcall (pgp-function 'verify) 
-		 (point-min)(point-max) sig-file)))
+      (let ((packet 
+	     (cdr (assq 2 (pgg-parse-armor (mime-entity-content entity)))))
+	    (pgg-output-buffer mime-echo-buffer-name)
+	    key)
+	(cond
+	 ((or (null (setq key (cdr (assq 'key-identifier packet))))
+	      (funcall (pgp-function 'lookup-key)
+		       (setq key (concat "0x" (pgg-truncate-key-identifier key)))))
+	  (funcall (pgp-function 'verify) 
+		   (point-min)(point-max) sig-file)
+	  )
+	 ((y-or-n-p
+	   (format "Key %s not found; attempt to fetch? " key))
+	  (mime-pgp-fetch-key 
+	   key (cdr (assq 'preferred-key-server packet)))
+	  ))))
     (delete-file sig-file)
     ))
 
@@ -334,6 +347,45 @@ It should be ISO 639 2 letter language code such as en, ja, ...")
     ))
 
 
+;;; @ Internal method for fetching a public key
+;;;
+
+(defcustom mime-pgp-keyserver-url-template "/pks/lookup?op=get&search=%s"
+  "The URL to pass to the keyserver."
+  :group 'mime-pgp
+  :type 'string)
+
+(defcustom mime-pgp-keyserver-protocol "http"
+  "Protocol name of keyserver."
+  :group 'mime-pgp
+  :type 'string)
+
+(defcustom mime-pgp-keyserver-address "pgp.nic.ad.jp"
+  "Host name of keyserver."
+  :group 'mime-pgp
+  :type 'string)
+
+(defcustom mime-pgp-keyserver-port 11371
+  "Port on which the keyserver's HKP daemon lives."
+  :group 'mime-pgp
+  :type 'integer)
+
+(defun mime-pgp-fetch-key (string &optional url)
+  "Attempt to fetch a key for addition to PGP or GnuPG keyring.
+Interactively, prompt for string matching key to fetch.
+
+Return t if we think we were successful; nil otherwise.  Note that nil
+is not necessarily an error, since we may have merely fired off an Email
+request for the key."
+  (let ((url (or url 
+		 (concat mime-pgp-keyserver-protocol "://"
+			 mime-pgp-keyserver-address ":"
+			 mime-pgp-keyserver-port
+			 (format mime-pgp-keyserver-url-template
+				 string)))))
+    (pgg-fetch-key url)))
+
+
 ;;; @ end
 ;;;