(define-calist-field-match-method 'signature-version
#'pgg-field-match-method-with-containment)
-(define-calist-field-match-method 'cipher-algorithm
+(define-calist-field-match-method 'symmetric-key-algorithm
#'pgg-field-match-method-with-containment)
(define-calist-field-match-method 'public-key-algorithm
(define-calist-field-match-method 'hash-algorithm
#'pgg-field-match-method-with-containment)
-(defvar pgg-verify-codition nil
- "Condition-tree about how to display entity.")
+(defvar pgg-verify-condition nil
+ "Condition-tree about which PGP implementation is used for verifying.")
-(defvar pgg-decrypt-codition nil
- "Condition-tree about how to display entity.")
+(defvar pgg-decrypt-condition nil
+ "Condition-tree about which PGP implementation is used for decrypting.")
(ctree-set-calist-strictly
- 'pgg-verify-codition
+ 'pgg-verify-condition
'((signature-version 3)(public-key-algorithm RSA)(hash-algorithm MD5)
(scheme . pgp)))
(ctree-set-calist-strictly
- 'pgg-decrypt-codition
+ 'pgg-decrypt-condition
'((public-key-algorithm RSA)(symmetric-key-algorithm IDEA)
(scheme . pgp)))
(ctree-set-calist-strictly
- 'pgg-verify-codition
+ 'pgg-verify-condition
'((signature-version 3 4)
(public-key-algorithm RSA ELG DSA)
(hash-algorithm MD5 SHA1 RIPEMD160)
(scheme . pgp5)))
(ctree-set-calist-strictly
- 'pgg-decrypt-codition
+ 'pgg-decrypt-condition
'((public-key-algorithm RSA ELG DSA)
(symmetric-key-algorithm 3DES CAST5 IDEA)
(scheme . pgp5)))
(ctree-set-calist-strictly
- 'pgg-verify-codition
+ 'pgg-verify-condition
'((signature-version 3 4)
(public-key-algorithm ELG-E DSA ELG)
(hash-algorithm MD5 SHA1 RIPEMD160)
(scheme . gpg)))
(ctree-set-calist-strictly
- 'pgg-decrypt-codition
+ 'pgg-decrypt-condition
'((public-key-algorithm ELG-E DSA ELG)
(symmetric-key-algorithm 3DES CAST5 BLOWFISH TWOFISH)
(scheme . gpg)))
(luna-define-generic decrypt-region (scheme start end)
"Decrypt the current region between START and END.")
-(luna-define-generic sign-region (scheme start end)
+(luna-define-generic sign-region (scheme start end &optional cleartext)
"Make detached signature from text between START and END.")
(luna-define-generic verify-region (scheme start end &optional signature)
;;; @ interface functions
;;;
+(defvar pgg-fetch-key-function (function pgg-fetch-key-with-w3))
+
(defmacro pgg-make-scheme (scheme)
`(progn
(require (intern (format "pgg-%s" ,scheme)))
(funcall (intern (format "pgg-make-scheme-%s"
,scheme)))))
+;;;###autoload
(defun pgg-encrypt-region (start end rcpts)
(interactive
(list (region-beginning)(region-end)
(split-string (read-string "Recipients: ") "[ \t,]+")))
- (let ((entity (pgg-make-scheme pgg-default-scheme)))
- (luna-send entity 'encrypt-region entity start end rcpts)))
-
+ (let* ((entity (pgg-make-scheme pgg-default-scheme))
+ (status (luna-send entity 'encrypt-region
+ entity start end rcpts)))
+ (when (interactive-p)
+ (if status
+ (progn
+ (delete-region start end)
+ (insert-buffer-substring pgg-output-buffer))
+ (with-output-to-temp-buffer pgg-echo-buffer
+ (set-buffer standard-output)
+ (insert-buffer-substring pgg-errors-buffer))))
+ status))
+
+;;;###autoload
(defun pgg-decrypt-region (start end)
(interactive "r")
(let* ((packet (cdr (assq 1 (pgg-parse-armor-region start end))))
(cdr (assq 'scheme
(progn
(in-calist-package 'pgg)
- (ctree-match-calist pgg-decrypt-codition
+ (ctree-match-calist pgg-decrypt-condition
packet))))
pgg-default-scheme))
- (entity (pgg-make-scheme scheme)))
- (luna-send entity 'decrypt-region entity start end)))
-
-(defun pgg-sign-region (start end)
+ (entity (pgg-make-scheme scheme))
+ (status (luna-send entity 'decrypt-region entity start end)))
+ (when (interactive-p)
+ (if status
+ (progn
+ (delete-region start end)
+ (insert-buffer-substring pgg-output-buffer))
+ (with-output-to-temp-buffer pgg-echo-buffer
+ (set-buffer standard-output)
+ (insert-buffer-substring pgg-errors-buffer))))
+ status))
+
+;;;###autoload
+(defun pgg-sign-region (start end &optional cleartext)
(interactive "r")
- (let ((entity (pgg-make-scheme pgg-default-scheme)))
- (luna-send entity 'sign-region entity start end)))
-
+ (let* ((entity (pgg-make-scheme pgg-default-scheme))
+ (status (luna-send entity 'sign-region
+ entity start end
+ (or (interactive-p) cleartext))))
+ (when (interactive-p)
+ (if status
+ (progn
+ (delete-region start end)
+ (insert-buffer-substring pgg-output-buffer))
+ (with-output-to-temp-buffer pgg-echo-buffer
+ (set-buffer standard-output)
+ (insert-buffer-substring pgg-errors-buffer))))
+ status))
+
+;;;###autoload
(defun pgg-verify-region (start end &optional signature fetch)
(interactive "r")
(let* ((packet
- (with-temp-buffer
- (buffer-disable-undo)
- (set-buffer-multibyte nil)
- (insert-file-contents signature)
- (cdr (assq 2 (pgg-decode-armor-region (point-min)(point-max))))
- ))
- (scheme
+ (if (null signature) nil
+ (with-temp-buffer
+ (buffer-disable-undo)
+ (set-buffer-multibyte nil)
+ (insert-file-contents signature)
+ (cdr (assq 2 (pgg-decode-armor-region (point-min)(point-max))))
+ )))
+ (scheme
(or pgg-scheme
(cdr (assq 'scheme
(progn
(in-calist-package 'pgg)
- (ctree-match-calist pgg-verify-codition
+ (ctree-match-calist pgg-verify-condition
packet))))
pgg-default-scheme))
(entity (pgg-make-scheme scheme))
(key (cdr (assq 'key-identifier packet)))
- keyserver)
+ keyserver
+ status)
(and (stringp key)
(setq key (concat "0x" (pgg-truncate-key-identifier key)))
- (null (pgg-lookup-key-string key))
- fetch
+ (null (let ((pgg-scheme scheme))
+ (pgg-lookup-key-string key)))
+ (or fetch (interactive-p))
(y-or-n-p (format "Key %s not found; attempt to fetch? " key))
(setq keyserver
(or (cdr (assq 'preferred-key-server packet))
pgg-default-keyserver-address))
- (ignore-errors (require 'url))
- (pgg-fetch-key
- (if (url-type (url-generic-parse-url keyserver))
- keyserver
- (format "http://%s:11371/pks/lookup?op=get&search=%s"
- keyserver key))))
- (luna-send entity 'verify-region entity start end signature)))
-
+ (pgg-fetch-key keyserver key))
+ (setq status (luna-send entity 'verify-region
+ entity start end signature))
+ (when (interactive-p)
+ (with-output-to-temp-buffer pgg-echo-buffer
+ (set-buffer standard-output)
+ (insert-buffer-substring
+ (if status pgg-output-buffer pgg-errors-buffer))
+ ))
+ status))
+
+;;;###autoload
(defun pgg-insert-key ()
+ (interactive)
(let ((entity (pgg-make-scheme (or pgg-scheme pgg-default-scheme))))
(luna-send entity 'insert-key entity)))
+;;;###autoload
(defun pgg-snarf-keys-region (start end)
- (let ((entity (pgg-make-scheme (or pgg-scheme pgg-default-scheme))))
- (luna-send entity 'snarf-keys-region entity start end)))
+ (interactive "r")
+ (let* ((entity (pgg-make-scheme (or pgg-scheme pgg-default-scheme)))
+ (status (luna-send entity 'snarf-keys-region entity start end)))
+ (when (interactive-p)
+ (with-output-to-temp-buffer pgg-echo-buffer
+ (set-buffer standard-output)
+ (insert-buffer-substring
+ (if status pgg-output-buffer pgg-errors-buffer))
+ ))
+ status))
(defun pgg-lookup-key-string (string &optional type)
(let ((entity (pgg-make-scheme (or pgg-scheme pgg-default-scheme))))
(luna-send entity 'lookup-key-string entity string type)))
-(defun pgg-fetch-key (url)
- "Attempt to fetch a key for addition to PGP or GnuPG keyring.
+(defvar pgg-insert-url-function (function pgg-insert-url-with-w3))
-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."
+(defun pgg-insert-url-with-w3 (url)
(require 'w3)
(require 'url)
+ (let (buffer-file-name)
+ (url-insert-file-contents url)))
+
+(defvar pgg-insert-url-extra-arguments nil)
+(defvar pgg-insert-url-program nil)
+
+(defun pgg-insert-url-with-program (url)
+ (let ((args (copy-sequence pgg-insert-url-extra-arguments))
+ process)
+ (insert
+ (with-temp-buffer
+ (setq process
+ (apply #'start-process " *PGG url*" (current-buffer)
+ pgg-insert-url-program (nconc args (list url))))
+ (set-process-sentinel process #'ignore)
+ (while (eq 'run (process-status process))
+ (accept-process-output process 5))
+ (delete-process process)
+ (if (and process (eq 'run (process-status process)))
+ (interrupt-process process))
+ (buffer-string)))
+ ))
+
+(defun pgg-fetch-key (keyserver key)
+ "Attempt to fetch a key for addition to PGP or GnuPG keyring."
(with-current-buffer (get-buffer-create pgg-output-buffer)
(buffer-disable-undo)
(erase-buffer)
- (let ((proto (url-type (url-generic-parse-url url)))
- buffer-file-name)
- (unless (memq (intern proto) '(http finger))
- (insert (format "Protocol %s is not supported.\n" proto)))
- (url-insert-file-contents url)
- (if (re-search-forward "^-+BEGIN" nil 'last)
- (progn
- (delete-region (point-min) (match-beginning 0))
- (when (re-search-forward "^-+END" nil t)
- (delete-region (progn (end-of-line) (point))
- (point-max)))
- (insert "\n")
- (with-temp-buffer
- (insert-buffer-substring pgg-output-buffer)
- (pgg-snarf-keys-region (point-min)(point-max))))
- (erase-buffer)
- (insert "Cannot retrieve public key from URL (" url ")\n")))
- ))
+ (let ((proto (if (string-match "^[a-zA-Z\\+\\.\\\\-]+:" keyserver)
+ (substring keyserver 0 (1- (match-end 0))))))
+ (save-excursion
+ (funcall pgg-insert-url-function
+ (if proto keyserver
+ (format "http://%s:11371/pks/lookup?op=get&search=%s"
+ keyserver key))))
+ (when (re-search-forward "^-+BEGIN" nil 'last)
+ (delete-region (point-min) (match-beginning 0))
+ (when (re-search-forward "^-+END" nil t)
+ (delete-region (progn (end-of-line) (point))
+ (point-max)))
+ (insert "\n")
+ (with-temp-buffer
+ (insert-buffer-substring pgg-output-buffer)
+ (pgg-snarf-keys-region (point-min)(point-max))))
+ )))
;;; @ utility functions
(defun pgg-remove-passphrase-cache (key)
(unintern key pgg-passphrase-cache))
+(defmacro pgg-convert-lbt-region (start end lbt)
+ `(let ((pgg-conversion-end (set-marker (make-marker) ,end)))
+ (goto-char ,start)
+ (case ,lbt
+ (CRLF
+ (while (progn
+ (end-of-line)
+ (> (marker-position pgg-conversion-end) (point)))
+ (insert "\r")
+ (forward-line 1)))
+ (LF
+ (while (re-search-forward "\r$" pgg-conversion-end t)
+ (replace-match ""))))
+ ))
+
+(put 'pgg-as-lbt 'lisp-indent-function 3)
+
+(defmacro pgg-as-lbt (start end lbt &rest body)
+ `(let ((inhibit-read-only t)
+ buffer-read-only
+ buffer-undo-list)
+ (pgg-convert-lbt-region ,start ,end ,lbt)
+ (let ((,end (point)))
+ ,@body)
+ (push nil buffer-undo-list)
+ (undo)))
+
+
+;;; @ postprocess macros
+;;;
+
+(put 'pgg-process-when-success 'lisp-indent-function 0)
+
+(defmacro pgg-process-when-success (&rest body)
+ `(with-current-buffer pgg-output-buffer
+ (if (zerop (buffer-size)) nil ,@body t)))
+
(provide 'pgg)
;;; pgg.el ends here
projects / elisp / semi.git / blobdiff