;;; Code:
(defgroup epg ()
- "The EasyPG Library")
+ "The EasyPG Library"
+ :group 'emacs)
(defcustom epg-gpg-program "gpg"
"The `gpg' executable."
:group 'epg
:type 'string)
-(defconst epg-version-number "0.0.1")
+(defconst epg-version-number "0.0.2")
(defvar epg-user-id nil
"GnuPG ID of your default identity.")
(2 . "ZLIB")
(3 . "BZIP2")))
-(defconst epg-invalid-recipients-alist
+(defconst epg-invalid-recipients-reason-alist
'((0 . "No specific reason given")
(1 . "Not Found")
(2 . "Ambigious specification")
(9 . "Not a secret key")
(10 . "Key not trusted")))
-(defconst epg-delete-problem-alist
+(defconst epg-delete-problem-reason-alist
'((1 . "No such key")
(2 . "Must delete secret key first")
(3 . "Ambigious specification")))
+(defconst epg-import-ok-reason-alist
+ '((0 . "Not actually changed")
+ (1 . "Entirely new key")
+ (2 . "New user IDs")
+ (4 . "New signatures")
+ (8 . "New subkeys")
+ (16 . "Contains private key")))
+
+(defconst epg-import-problem-reason-alist
+ '((0 . "No specific reason given")
+ (1 . "Invalid Certificate")
+ (2 . "Issuer Certificate missing")
+ (3 . "Certificate Chain too long")
+ (4 . "Error storing certificate")))
+
+(defconst epg-no-data-reason-alist
+ '((1 . "No armored data")
+ (2 . "Expected a packet but did not found one")
+ (3 . "Invalid packet found, this may indicate a non OpenPGP message")
+ (4 . "Signature expected but not found")))
+
+(defconst epg-unexpected-reason-alist nil)
+
(defvar epg-key-validity-alist
'((?o . unknown)
(?i . invalid)
(?c . certify)
(?a . authentication)))
+(defvar epg-new-signature-type-alist
+ '((?D . detached)
+ (?C . clear)
+ (?S . normal)))
+
(defvar epg-dn-type-alist
'(("1.2.840.113549.1.9.1" . "EMail")
("2.5.4.12" . "T")
cipher-algorithm digest-algorithm compress-algorithm
#'epg-passphrase-callback-function
#'epg-progress-callback-function
- nil nil nil nil)))
+ nil nil nil nil nil)))
(defun epg-context-protocol (context)
"Return the protocol used within CONTEXT."
(signal 'wrong-type-argument (list 'epg-context-p context)))
(aref (cdr context) 12))
+(defun epg-context-operation (context)
+ "Return the name of the current cryptographic operation."
+ (unless (eq (car context) 'epg-context)
+ (signal 'wrong-type-argument (list 'epg-context-p context)))
+ (aref (cdr context) 13))
+
(defun epg-context-set-protocol (context protocol)
"Set the protocol used within CONTEXT."
(unless (eq (car context) 'epg-context)
(signal 'wrong-type-argument (list 'epg-context-p context)))
(aset (cdr context) 12 result))
+(defun epg-context-set-operation (context operation)
+ "Set the name of the current cryptographic operation."
+ (unless (eq (car context) 'epg-context)
+ (signal 'wrong-type-argument (list 'epg-context-p context)))
+ (aset (cdr context) 13 operation))
+
(defun epg-make-signature (status &optional key-id)
"Return a signature object."
- (cons 'epg-signature (vector status key-id nil nil nil nil nil nil)))
+ (cons 'epg-signature (vector status key-id nil nil nil nil nil nil nil nil)))
(defun epg-signature-status (signature)
"Return the status code of SIGNATURE."
(signal 'wrong-type-argument (list 'epg-signature-p signature)))
(aref (cdr signature) 7))
+(defun epg-signature-class (signature)
+ "Return the class of SIGNATURE."
+ (unless (eq (car signature) 'epg-signature)
+ (signal 'wrong-type-argument (list 'epg-signature-p signature)))
+ (aref (cdr signature) 8))
+
+(defun epg-signature-version (signature)
+ "Return the version of SIGNATURE."
+ (unless (eq (car signature) 'epg-signature)
+ (signal 'wrong-type-argument (list 'epg-signature-p signature)))
+ (aref (cdr signature) 9))
+
(defun epg-signature-set-status (signature status)
"Set the status code of SIGNATURE."
(unless (eq (car signature) 'epg-signature)
(signal 'wrong-type-argument (list 'epg-signature-p signature)))
(aset (cdr signature) 7 digest-algorithm))
+(defun epg-signature-set-class (signature class)
+ "Set the class of SIGNATURE."
+ (unless (eq (car signature) 'epg-signature)
+ (signal 'wrong-type-argument (list 'epg-signature-p signature)))
+ (aset (cdr signature) 8 class))
+
+(defun epg-signature-set-version (signature version)
+ "Set the version of SIGNATURE."
+ (unless (eq (car signature) 'epg-signature)
+ (signal 'wrong-type-argument (list 'epg-signature-p signature)))
+ (aset (cdr signature) 9 version))
+
+(defun epg-make-new-signature (type pubkey-algorithm digest-algorithm
+ class creation-time fingerprint)
+ "Return a new signature object."
+ (cons 'epg-new-signature (vector type pubkey-algorithm digest-algorithm
+ class creation-time fingerprint)))
+
+(defun epg-new-signature-type (new-signature)
+ "Return the type of NEW-SIGNATURE."
+ (unless (eq (car new-signature) 'epg-new-signature)
+ (signal 'wrong-type-argument (list 'epg-new-signature-p new-signature)))
+ (aref (cdr new-signature) 0))
+
+(defun epg-new-signature-pubkey-algorithm (new-signature)
+ "Return the public key algorithm of NEW-SIGNATURE."
+ (unless (eq (car new-signature) 'epg-new-signature)
+ (signal 'wrong-type-argument (list 'epg-new-signature-p new-signature)))
+ (aref (cdr new-signature) 1))
+
+(defun epg-new-signature-digest-algorithm (new-signature)
+ "Return the digest algorithm of NEW-SIGNATURE."
+ (unless (eq (car new-signature) 'epg-new-signature)
+ (signal 'wrong-type-argument (list 'epg-new-signature-p new-signature)))
+ (aref (cdr new-signature) 2))
+
+(defun epg-new-signature-class (new-signature)
+ "Return the class of NEW-SIGNATURE."
+ (unless (eq (car new-signature) 'epg-new-signature)
+ (signal 'wrong-type-argument (list 'epg-new-signature-p new-signature)))
+ (aref (cdr new-signature) 3))
+
+(defun epg-new-signature-creation-time (new-signature)
+ "Return the creation time of NEW-SIGNATURE."
+ (unless (eq (car new-signature) 'epg-new-signature)
+ (signal 'wrong-type-argument (list 'epg-new-signature-p new-signature)))
+ (aref (cdr new-signature) 4))
+
+(defun epg-new-signature-fingerprint (new-signature)
+ "Return the fingerprint of NEW-SIGNATURE."
+ (unless (eq (car new-signature) 'epg-new-signature)
+ (signal 'wrong-type-argument (list 'epg-new-signature-p new-signature)))
+ (aref (cdr new-signature) 5))
+
(defun epg-make-key (owner-trust)
"Return a key object."
(cons 'epg-key (vector owner-trust nil nil)))
(signal 'wrong-type-argument (list 'epg-key-p key)))
(aset (cdr key) 2 user-id-list))
-(defun epg-make-sub-key (validity capability secret algorithm length id
+(defun epg-make-sub-key (validity capability secret-p algorithm length id
creation-time expiration-time)
"Return a sub key object."
(cons 'epg-sub-key
- (vector validity capability secret algorithm length id creation-time
+ (vector validity capability secret-p algorithm length id creation-time
expiration-time nil)))
(defun epg-sub-key-validity (sub-key)
(signal 'wrong-type-argument (list 'epg-sub-key-p sub-key)))
(aref (cdr sub-key) 1))
-(defun epg-sub-key-secret (sub-key)
+(defun epg-sub-key-secret-p (sub-key)
"Return non-nil if SUB-KEY is a secret key."
(unless (eq (car sub-key) 'epg-sub-key)
(signal 'wrong-type-argument (list 'epg-sub-key-p sub-key)))
(signal 'wrong-type-argument (list 'epg-user-id-p user-id)))
(aset (cdr user-id) 2 signature-list))
+(defun epg-make-key-signature (validity pubkey-algorithm key-id creation-time
+ expiration-time user-id class
+ exportable-p)
+ "Return a key signature object."
+ (cons 'epg-key-signature
+ (vector validity pubkey-algorithm key-id creation-time expiration-time
+ user-id class exportable-p)))
+
+(defun epg-key-signature-validity (key-signature)
+ "Return the validity of KEY-SIGNATURE."
+ (unless (eq (car key-signature) 'epg-key-signature)
+ (signal 'wrong-type-argument (list 'epg-key-signature-p key-signature)))
+ (aref (cdr key-signature) 0))
+
+(defun epg-key-signature-pubkey-algorithm (key-signature)
+ "Return the public key algorithm of KEY-SIGNATURE."
+ (unless (eq (car key-signature) 'epg-key-signature)
+ (signal 'wrong-type-argument (list 'epg-key-signature-p key-signature)))
+ (aref (cdr key-signature) 1))
+
+(defun epg-key-signature-key-id (key-signature)
+ "Return the key-id of KEY-SIGNATURE."
+ (unless (eq (car key-signature) 'epg-key-signature)
+ (signal 'wrong-type-argument (list 'epg-key-signature-p key-signature)))
+ (aref (cdr key-signature) 2))
+
+(defun epg-key-signature-creation-time (key-signature)
+ "Return the creation time of KEY-SIGNATURE."
+ (unless (eq (car key-signature) 'epg-key-signature)
+ (signal 'wrong-type-argument (list 'epg-key-signature-p key-signature)))
+ (aref (cdr key-signature) 3))
+
+(defun epg-key-signature-expiration-time (key-signature)
+ "Return the expiration time of KEY-SIGNATURE."
+ (unless (eq (car key-signature) 'epg-key-signature)
+ (signal 'wrong-type-argument (list 'epg-key-signature-p key-signature)))
+ (aref (cdr key-signature) 4))
+
+(defun epg-key-signature-user-id (key-signature)
+ "Return the user-id of KEY-SIGNATURE."
+ (unless (eq (car key-signature) 'epg-key-signature)
+ (signal 'wrong-type-argument (list 'epg-key-signature-p key-signature)))
+ (aref (cdr key-signature) 5))
+
+(defun epg-key-signature-class (key-signature)
+ "Return the class of KEY-SIGNATURE."
+ (unless (eq (car key-signature) 'epg-key-signature)
+ (signal 'wrong-type-argument (list 'epg-key-signature-p key-signature)))
+ (aref (cdr key-signature) 6))
+
+(defun epg-key-signature-exportable-p (key-signature)
+ "Return t if KEY-SIGNATURE is exportable."
+ (unless (eq (car key-signature) 'epg-key-signature)
+ (signal 'wrong-type-argument (list 'epg-key-signature-p key-signature)))
+ (aref (cdr key-signature) 7))
+
(defun epg-context-result-for (context name)
"Return the result of CONTEXT associated with NAME."
(cdr (assq name (epg-context-result context))))
"Convert VERIFY-RESULT to a human readable string."
(mapconcat #'epg-signature-to-string verify-result "\n"))
-(defun epg-start (context args)
+(defun epg-new-signature-to-string (new-signature)
+ "Convert NEW-SIGNATURE to a human readable string."
+ (concat
+ (cond ((eq (epg-new-signature-type new-signature) 'detached)
+ "Detached signature ")
+ ((eq (epg-new-signature-type new-signature) 'clear)
+ "Clear text signature ")
+ (t
+ "Signature "))
+ (cdr (assq (epg-new-signature-pubkey-algorithm new-signature)
+ epg-pubkey-algorithm-alist))
+ "/"
+ (cdr (assq (epg-new-signature-digest-algorithm new-signature)
+ epg-digest-algorithm-alist))
+ " "
+ (format "%02X " (epg-new-signature-class new-signature))
+ (epg-new-signature-fingerprint new-signature)))
+
+(defun epg--start (context args)
"Start `epg-gpg-program' in a subprocess with given ARGS."
- (if (eq (process-status (epg-context-process context)) 'run)
+ (if (and (epg-context-process context)
+ (eq (process-status (epg-context-process context)) 'run))
(error "%s is already running in this context"
(if (eq (epg-context-protocol context) 'CMS)
epg-gpgsm-program
epg-gpg-program)
args)))
(set-default-file-modes orig-mode))
- (set-process-filter process #'epg-process-filter)
+ (set-process-filter process #'epg--process-filter)
(epg-context-set-process context process)))
-(defun epg-process-filter (process input)
+(defun epg--process-filter (process input)
(if epg-debug
(save-excursion
(unless epg-debug-buffer
(if (looking-at "\\[GNUPG:] \\([A-Z_]+\\) ?\\(.*\\)")
(let* ((status (match-string 1))
(string (match-string 2))
- (symbol (intern-soft (concat "epg-status-" status))))
+ (symbol (intern-soft (concat "epg--status-" status))))
(if (member status epg-pending-status-list)
(setq epg-pending-status-list nil))
(if (and symbol
(fboundp symbol))
- (funcall symbol process string)))))
+ (funcall symbol epg-context string)))))
(forward-line))
(setq epg-read-point (point)))))
(setq epg-pending-status-list status-list)
(while (and (eq (process-status (epg-context-process context)) 'run)
epg-pending-status-list)
- (accept-process-output (epg-context-process context) 0 1))))
+ (accept-process-output (epg-context-process context) 1))))
(defun epg-wait-for-completion (context)
"Wait until the `epg-gpg-program' process completes."
(while (eq (process-status (epg-context-process context)) 'run)
- (accept-process-output (epg-context-process context) 0 1)))
+ (accept-process-output (epg-context-process context) 1)))
(defun epg-reset (context)
"Reset the CONTEXT."
(file-exists-p (epg-context-output-file context)))
(delete-file (epg-context-output-file context))))
-(defun epg-status-USERID_HINT (process string)
+(defun epg--status-USERID_HINT (context string)
(if (string-match "\\`\\([^ ]+\\) \\(.*\\)" string)
(let* ((key-id (match-string 1 string))
(user-id (match-string 2 string))
(setq epg-user-id-alist (cons (cons key-id user-id)
epg-user-id-alist))))))
-(defun epg-status-NEED_PASSPHRASE (process string)
+(defun epg--status-NEED_PASSPHRASE (context string)
(if (string-match "\\`\\([^ ]+\\)" string)
(setq epg-key-id (match-string 1 string))))
-(defun epg-status-NEED_PASSPHRASE_SYM (process string)
+(defun epg--status-NEED_PASSPHRASE_SYM (context string)
(setq epg-key-id 'SYM))
-(defun epg-status-NEED_PASSPHRASE_PIN (process string)
+(defun epg--status-NEED_PASSPHRASE_PIN (context string)
(setq epg-key-id 'PIN))
-(defun epg-status-GET_HIDDEN (process string)
+(defun epg--status-GET_HIDDEN (context string)
(if (and epg-key-id
(string-match "\\`passphrase\\." string))
(let (inhibit-quit
(progn
(setq passphrase
(funcall
- (if (consp (epg-context-passphrase-callback
- epg-context))
- (car (epg-context-passphrase-callback
- epg-context))
- (epg-context-passphrase-callback epg-context))
- epg-context
+ (if (consp (epg-context-passphrase-callback context))
+ (car (epg-context-passphrase-callback context))
+ (epg-context-passphrase-callback context))
+ context
epg-key-id
- (if (consp (epg-context-passphrase-callback
- epg-context))
- (cdr (epg-context-passphrase-callback
- epg-context)))))
+ (if (consp (epg-context-passphrase-callback context))
+ (cdr (epg-context-passphrase-callback context)))))
(when passphrase
(setq passphrase-with-new-line (concat passphrase "\n"))
(fillarray passphrase 0)
(setq passphrase nil)
- (process-send-string process passphrase-with-new-line)))
+ (process-send-string (epg-context-process context)
+ passphrase-with-new-line)))
(quit
(epg-context-set-result-for
- epg-context 'error
+ context 'error
(cons '(quit)
- (epg-context-result-for epg-context 'error)))
- (delete-process process)))
+ (epg-context-result-for context 'error)))
+ (delete-process (epg-context-process context))))
(if passphrase
(fillarray passphrase 0))
(if passphrase-with-new-line
(fillarray passphrase-with-new-line 0))))))
-(defun epg-status-GET_BOOL (process string)
+(defun epg--status-GET_BOOL (context string)
(let ((entry (assoc string epg-prompt-alist))
inhibit-quit)
(condition-case nil
(if (y-or-n-p (if entry (cdr entry) (concat string "? ")))
- (process-send-string process "y\n")
- (process-send-string process "n\n"))
+ (process-send-string (epg-context-process context) "y\n")
+ (process-send-string (epg-context-process context) "n\n"))
(quit
(epg-context-set-result-for
- epg-context 'error
+ context 'error
(cons '(quit)
- (epg-context-result-for epg-context 'error)))
- (delete-process process)))))
+ (epg-context-result-for context 'error)))
+ (delete-process (epg-context-process context))))))
-(defun epg-status-GET_LINE (process string)
+(defun epg--status-GET_LINE (context string)
(let ((entry (assoc string epg-prompt-alist))
inhibit-quit)
(condition-case nil
- (process-send-string
- process
- (concat (read-string (if entry (cdr entry) (concat string ": ")))
- "\n"))
+ (process-send-string (epg-context-process context)
+ (concat (read-string
+ (if entry
+ (cdr entry)
+ (concat string ": ")))
+ "\n"))
(quit
(epg-context-set-result-for
- epg-context 'error
+ context 'error
(cons '(quit)
- (epg-context-result-for epg-context 'error)))
- (delete-process process)))))
+ (epg-context-result-for context 'error)))
+ (delete-process (epg-context-process context))))))
-(defun epg-status-*SIG (status string)
+(defun epg--status-*SIG (context status string)
(if (string-match "\\`\\([^ ]+\\) \\(.*\\)" string)
(let* ((key-id (match-string 1 string))
(user-id (match-string 2 string))
(entry (assoc key-id epg-user-id-alist)))
(epg-context-set-result-for
- epg-context
+ context
'verify
(cons (epg-make-signature status key-id)
- (epg-context-result-for epg-context 'verify)))
- (if (eq (epg-context-protocol epg-context) 'CMS)
+ (epg-context-result-for context 'verify)))
+ (if (eq (epg-context-protocol context) 'CMS)
(condition-case nil
(setq user-id (epg-dn-from-string user-id))
(error)))
(setq epg-user-id-alist
(cons (cons key-id user-id) epg-user-id-alist))))
(epg-context-set-result-for
- epg-context
+ context
'verify
(cons (epg-make-signature status)
- (epg-context-result-for epg-context 'verify)))))
+ (epg-context-result-for context 'verify)))))
-(defun epg-status-GOODSIG (process string)
- (epg-status-*SIG 'good string))
+(defun epg--status-GOODSIG (context string)
+ (epg--status-*SIG context 'good string))
-(defun epg-status-EXPSIG (process string)
- (epg-status-*SIG 'expired string))
+(defun epg--status-EXPSIG (context string)
+ (epg--status-*SIG context 'expired string))
-(defun epg-status-EXPKEYSIG (process string)
- (epg-status-*SIG 'expired-key string))
+(defun epg--status-EXPKEYSIG (context string)
+ (epg--status-*SIG context 'expired-key string))
-(defun epg-status-REVKEYSIG (process string)
- (epg-status-*SIG 'revoked-key string))
+(defun epg--status-REVKEYSIG (context string)
+ (epg--status-*SIG context 'revoked-key string))
-(defun epg-status-BADSIG (process string)
- (epg-status-*SIG 'bad string))
+(defun epg--status-BADSIG (context string)
+ (epg--status-*SIG context 'bad string))
-(defun epg-status-NO_PUBKEY (process string)
- (epg-context-set-result-for
- epg-context
- 'verify
- (cons (epg-make-signature 'no-pubkey string)
- (epg-context-result-for epg-context 'verify))))
-
-(defun epg-status-ERRSIG (process string)
- (let ((signatures (car (epg-context-result-for epg-context 'verify))))
- (unless signatures
- (setq signatures (list (epg-make-signature 'error)))
- (epg-context-set-result-for epg-context 'verify signatures))
- (when (and (not (eq (epg-signature-status (car signatures)) 'good))
- (string-match "\\`\\([^ ]+\\) \\([0-9]+\\) \\([0-9]+\\) \
-\\([0-9A-Fa-f][0-9A-Fa-f]\\) \\([^ ]+\\) \\([0-9]+\\)"
- string))
- (epg-signature-set-key-id
- (car signatures)
- (match-string 1 string))
- (epg-signature-set-pubkey-algorithm
- (car signatures)
- (string-to-number (match-string 2 string)))
- (epg-signature-set-digest-algorithm
- (car signatures)
- (string-to-number (match-string 3 string)))
-; (epg-signature-set-class
-; (car signatures)
-; (string-to-number (match-string 4 string) 16))
- (epg-signature-set-creation-time
- (car signatures)
- (match-string 5 string)))))
+(defun epg--status-NO_PUBKEY (context string)
+ (let ((signature (car (epg-context-result-for context 'verify))))
+ (if (and signature
+ (eq (epg-signature-status signature) 'error)
+ (equal (epg-signature-key-id signature) string))
+ (epg-signature-set-status signature 'no-pubkey))))
+
+(defun epg--time-from-seconds (seconds)
+ (let ((number-seconds (string-to-number (concat seconds ".0"))))
+ (cons (floor (/ number-seconds 65536))
+ (floor (mod number-seconds 65536)))))
-(defun epg-status-VALIDSIG (process string)
- (let ((signature (car (epg-context-result-for epg-context 'verify))))
+(defun epg--status-ERRSIG (context string)
+ (if (string-match "\\`\\([^ ]+\\) \\([0-9]+\\) \\([0-9]+\\) \
+\\([0-9A-Fa-f][0-9A-Fa-f]\\) \\([^ ]+\\) \\([0-9]+\\)"
+ string)
+ (let ((signature (epg-make-signature 'error)))
+ (epg-context-set-result-for context 'verify (list signature))
+ (epg-signature-set-key-id
+ signature
+ (match-string 1 string))
+ (epg-signature-set-pubkey-algorithm
+ signature
+ (string-to-number (match-string 2 string)))
+ (epg-signature-set-digest-algorithm
+ signature
+ (string-to-number (match-string 3 string)))
+ (epg-signature-set-class
+ signature
+ (string-to-number (match-string 4 string) 16))
+ (epg-signature-set-creation-time
+ signature
+ (epg--time-from-seconds (match-string 5 string))))))
+
+(defun epg--status-VALIDSIG (context string)
+ (let ((signature (car (epg-context-result-for context 'verify))))
(when (and signature
(eq (epg-signature-status signature) 'good)
(string-match "\\`\\([^ ]+\\) [^ ]+ \\([^ ]+\\) \\([^ ]+\\) \
(match-string 1 string))
(epg-signature-set-creation-time
signature
- (match-string 2 string))
+ (epg--time-from-seconds (match-string 2 string)))
(epg-signature-set-expiration-time
signature
- (match-string 3 string))
-; (epg-signature-set-version
-; signature
-; (string-to-number (match-string 4 string)))
+ (epg--time-from-seconds (match-string 3 string)))
+ (epg-signature-set-version
+ signature
+ (string-to-number (match-string 4 string)))
(epg-signature-set-pubkey-algorithm
signature
(string-to-number (match-string 5 string)))
(epg-signature-set-digest-algorithm
signature
(string-to-number (match-string 6 string)))
-; (epg-signature-set-class
-; signature
-; (string-to-number (match-string 7 string) 16))
- )))
+ (epg-signature-set-class
+ signature
+ (string-to-number (match-string 7 string) 16)))))
-(defun epg-status-TRUST_UNDEFINED (process string)
- (let ((signature (car (epg-context-result-for epg-context 'verify))))
+(defun epg--status-TRUST_UNDEFINED (context string)
+ (let ((signature (car (epg-context-result-for context 'verify))))
(if (and signature
(eq (epg-signature-status signature) 'good))
(epg-signature-set-validity signature 'undefined))))
-(defun epg-status-TRUST_NEVER (process string)
- (let ((signature (car (epg-context-result-for epg-context 'verify))))
+(defun epg--status-TRUST_NEVER (context string)
+ (let ((signature (car (epg-context-result-for context 'verify))))
(if (and signature
(eq (epg-signature-status signature) 'good))
(epg-signature-set-validity signature 'never))))
-(defun epg-status-TRUST_MARGINAL (process string)
- (let ((signature (car (epg-context-result-for epg-context 'verify))))
+(defun epg--status-TRUST_MARGINAL (context string)
+ (let ((signature (car (epg-context-result-for context 'verify))))
(if (and signature
(eq (epg-signature-status signature) 'marginal))
(epg-signature-set-validity signature 'marginal))))
-(defun epg-status-TRUST_FULLY (process string)
- (let ((signature (car (epg-context-result-for epg-context 'verify))))
+(defun epg--status-TRUST_FULLY (context string)
+ (let ((signature (car (epg-context-result-for context 'verify))))
(if (and signature
(eq (epg-signature-status signature) 'good))
(epg-signature-set-validity signature 'full))))
-(defun epg-status-TRUST_ULTIMATE (process string)
- (let ((signature (car (epg-context-result-for epg-context 'verify))))
+(defun epg--status-TRUST_ULTIMATE (context string)
+ (let ((signature (car (epg-context-result-for context 'verify))))
(if (and signature
(eq (epg-signature-status signature) 'good))
(epg-signature-set-validity signature 'ultimate))))
-(defun epg-status-PROGRESS (process string)
+(defun epg--status-PROGRESS (context string)
(if (string-match "\\`\\([^ ]+\\) \\([^ ]\\) \\([0-9]+\\) \\([0-9]+\\)"
string)
- (funcall (if (consp (epg-context-progress-callback epg-context))
- (car (epg-context-progress-callback epg-context))
- (epg-context-progress-callback epg-context))
- epg-context
+ (funcall (if (consp (epg-context-progress-callback context))
+ (car (epg-context-progress-callback context))
+ (epg-context-progress-callback context))
+ context
(match-string 1 string)
(match-string 2 string)
(string-to-number (match-string 3 string))
(string-to-number (match-string 4 string))
- (if (consp (epg-context-progress-callback epg-context))
- (cdr (epg-context-progress-callback epg-context))))))
+ (if (consp (epg-context-progress-callback context))
+ (cdr (epg-context-progress-callback context))))))
-(defun epg-status-DECRYPTION_FAILED (process string)
+(defun epg--status-DECRYPTION_FAILED (context string)
(epg-context-set-result-for
- epg-context 'error
+ context 'error
(cons '(decryption-failed)
- (epg-context-result-for epg-context 'error))))
+ (epg-context-result-for context 'error))))
-(defun epg-status-NODATA (process string)
+(defun epg--status-NODATA (context string)
(epg-context-set-result-for
- epg-context 'error
- (cons (cons 'no-data (string-to-number string))
- (epg-context-result-for epg-context 'error))))
+ context 'error
+ (cons (list 'no-data (cons 'reason (string-to-number string)))
+ (epg-context-result-for context 'error))))
-(defun epg-status-UNEXPECTED (process string)
+(defun epg--status-UNEXPECTED (context string)
(epg-context-set-result-for
- epg-context 'error
- (cons (cons 'unexpected (string-to-number string))
- (epg-context-result-for epg-context 'error))))
+ context 'error
+ (cons (list 'unexpected (cons 'reason (string-to-number string)))
+ (epg-context-result-for context 'error))))
-(defun epg-status-KEYEXPIRED (process string)
+(defun epg--status-KEYEXPIRED (context string)
(epg-context-set-result-for
- epg-context 'error
- (cons (cons 'key-expired string)
- (epg-context-result-for epg-context 'error))))
+ context 'error
+ (cons (list 'key-expired (cons 'expiration-time
+ (epg--time-from-seconds string)))
+ (epg-context-result-for context 'error))))
-(defun epg-status-KEYREVOKED (process string)
+(defun epg--status-KEYREVOKED (context string)
(epg-context-set-result-for
- epg-context 'error
+ context 'error
(cons '(key-revoked)
- (epg-context-result-for epg-context 'error))))
+ (epg-context-result-for context 'error))))
-(defun epg-status-BADARMOR (process string)
+(defun epg--status-BADARMOR (context string)
(epg-context-set-result-for
- epg-context 'error
+ context 'error
(cons '(bad-armor)
- (epg-context-result-for epg-context 'error))))
+ (epg-context-result-for context 'error))))
-(defun epg-status-INV_RECP (process string)
+(defun epg--status-INV_RECP (context string)
(if (string-match "\\`\\([0-9]+\\) \\(.*\\)" string)
(epg-context-set-result-for
- epg-context 'error
+ context 'error
(cons (list 'invalid-recipient
- (string-to-number (match-string 1 string))
- (match-string 2 string))
- (epg-context-result-for epg-context 'error)))))
+ (cons 'reason
+ (string-to-number (match-string 1 string)))
+ (cons 'requested-recipient
+ (match-string 2 string)))
+ (epg-context-result-for context 'error)))))
-(defun epg-status-NO_RECP (process string)
+(defun epg--status-NO_RECP (context string)
(epg-context-set-result-for
- epg-context 'error
+ context 'error
(cons '(no-recipients)
- (epg-context-result-for epg-context 'error))))
+ (epg-context-result-for context 'error))))
-(defun epg-status-DELETE_PROBLEM (process string)
+(defun epg--status-DELETE_PROBLEM (context string)
(if (string-match "\\`\\([0-9]+\\)" string)
(epg-context-set-result-for
- epg-context 'error
- (cons (cons 'delete-problem (string-to-number (match-string 1 string)))
- (epg-context-result-for epg-context 'error)))))
+ context 'error
+ (cons (list 'delete-problem
+ (cons 'reason (string-to-number (match-string 1 string))))
+ (epg-context-result-for context 'error)))))
-(defun epg-status-SIG_CREATED (process string)
+(defun epg--status-SIG_CREATED (context string)
(if (string-match "\\`\\([DCS]\\) \\([0-9]+\\) \\([0-9]+\\) \
\\([0-9A-Fa-F][0-9A-Fa-F]\\) \\(.*\\) " string)
(epg-context-set-result-for
- epg-context 'sign
- (cons (list (cons 'type (string-to-char (match-string 1 string)))
- (cons 'pubkey-algorithm
- (string-to-number (match-string 2 string)))
- (cons 'digest-algorithm
- (string-to-number (match-string 3 string)))
- (cons 'class (string-to-number (match-string 4 string) 16))
- (cons 'creation-time (match-string 5 string))
- (cons 'fingerprint (substring string (match-end 0))))
- (epg-context-result-for epg-context 'sign)))))
-
-(defun epg-status-KEY_CREATED (process string)
+ context 'sign
+ (cons (epg-make-new-signature
+ (cdr (assq (aref (match-string 1 string) 0)
+ epg-new-signature-type-alist))
+ (string-to-number (match-string 2 string))
+ (string-to-number (match-string 3 string))
+ (string-to-number (match-string 4 string) 16)
+ (epg--time-from-seconds (match-string 5 string))
+ (substring string (match-end 0)))
+ (epg-context-result-for context 'sign)))))
+
+(defun epg--status-KEY_CREATED (context string)
(if (string-match "\\`\\([BPS]\\) \\([^ ]+\\)" string)
(epg-context-set-result-for
- epg-context 'generate-key
+ context 'generate-key
(cons (list (cons 'type (string-to-char (match-string 1 string)))
(cons 'fingerprint (match-string 2 string)))
- (epg-context-result-for epg-context 'generate-key)))))
+ (epg-context-result-for context 'generate-key)))))
-(defun epg-status-KEY_NOT_CREATED (process string)
+(defun epg--status-KEY_NOT_CREATED (context string)
(epg-context-set-result-for
- epg-context 'error
+ context 'error
(cons '(key-not-created)
- (epg-context-result-for epg-context 'error))))
+ (epg-context-result-for context 'error))))
+
+(defun epg--status-IMPORTED (context string)
+ (if (string-match "\\`\\([^ ]+\\) \\(.*\\)" string)
+ (let* ((key-id (match-string 1 string))
+ (user-id (match-string 2 string))
+ (entry (assoc key-id epg-user-id-alist)))
+ (if entry
+ (setcdr entry user-id)
+ (setq epg-user-id-alist (cons (cons key-id user-id)
+ epg-user-id-alist)))
+ (epg-context-set-result-for
+ context 'import
+ (cons (list (cons 'key-id key-id)
+ (cons 'user-id user-id))
+ (epg-context-result-for context 'import))))))
+
+(defun epg--status-IMPORT_OK (context string)
+ (let ((result (epg-context-result-for context 'import)))
+ (if (and result
+ (string-match "\\`\\([0-9]+\\)\\( \\(.+\\)\\)?" string))
+ (setcar result
+ (append (list (cons 'reason
+ (string-to-number
+ (match-string 1 string))))
+ (if (match-beginning 2)
+ (list (cons 'fingerprint
+ (match-string 3 string))))
+ (car result))))))
+
+(defun epg--status-IMPORT_PROBLEM (context string)
+ (if (string-match "\\`\\([0-9]+\\)\\( \\(.+\\)\\)?" string)
+ (epg-context-set-result-for
+ context 'error
+ (cons (cons 'import-problem
+ (append (list (cons 'reason
+ (string-to-number
+ (match-string 1 string))))
+ (if (match-beginning 2)
+ (list (cons 'fingerprint
+ (match-string 3 string))))))
+ (epg-context-result-for context 'error)))))
(defun epg-passphrase-callback-function (context key-id handback)
- (read-passwd
- (if (eq key-id 'SYM)
- "Passphrase for symmetric encryption: "
+ (if (eq key-id 'SYM)
+ (read-passwd "Passphrase for symmetric encryption: "
+ (eq (epg-context-operation context) 'encrypt))
+ (read-passwd
(if (eq key-id 'PIN)
- "Passphrase for PIN: "
+ "Passphrase for PIN: "
(let ((entry (assoc key-id epg-user-id-alist)))
(if entry
(format "Passphrase for %s %s: " key-id (cdr entry))
config))))
config))
-(defun epg-list-keys-1 (context name mode)
+(defun epg--list-keys-1 (context name mode)
(let ((args (append (list "--with-colons" "--no-greeting" "--batch"
"--with-fingerprint"
"--with-fingerprint"
- (if (or (eq mode t) (eq mode 'secret))
+ (if (memq mode '(t secret))
"--list-secret-keys"
- (if mode
- "--list-sigs"
- "--list-keys")))
+ (if (memq mode '(nil public))
+ "--list-keys"
+ "--list-sigs")))
(unless (eq (epg-context-protocol context) 'CMS)
'("--fixed-list-mode"))
(if name (list name))))
(setq field (1+ field))))
(nreverse keys))))
-(defun epg-make-sub-key-1 (line)
+(defun epg--make-sub-key-1 (line)
(epg-make-sub-key
(if (aref line 1)
(cdr (assq (string-to-char (aref line 1)) epg-key-validity-alist)))
(string-to-number (aref line 3))
(string-to-number (aref line 2))
(aref line 4)
- (aref line 5)
- (aref line 6)))
-
-(defun epg-list-keys-postprocess-one-key (key)
- (let (key-id user-id-string entry)
- (epg-key-set-sub-key-list
- key
- (nreverse (epg-key-sub-key-list key)))
- (epg-key-set-user-id-list
- key
- (nreverse (epg-key-user-id-list key)))
- (setq key-id
- (epg-sub-key-id (car (epg-key-sub-key-list key)))
- user-id-string
- (epg-user-id-string (car (epg-key-user-id-list key)))
- entry (assoc key-id epg-user-id-alist))
- (if entry
- (setcdr entry user-id-string)
- (setq epg-user-id-alist (cons (cons key-id user-id-string)
- epg-user-id-alist)))))
+ (epg--time-from-seconds (aref line 5))
+ (epg--time-from-seconds (aref line 6))))
+;;;###autoload
(defun epg-list-keys (context &optional name mode)
"Return a list of epg-key objects matched with NAME.
-If MODE is nil, only public keyring should be searched.
+If MODE is nil or 'public, only public keyring should be searched.
If MODE is t or 'secret, only secret keyring should be searched.
Otherwise, only public keyring should be searched and the key
signatures should be included."
- (let ((lines (epg-list-keys-1 context name mode))
- keys cert)
+ (let ((lines (epg--list-keys-1 context name mode))
+ keys cert pointer pointer-1)
(while lines
(cond
((member (aref (car lines) 0) '("pub" "sec" "crt" "crs"))
- (if (car keys)
- (epg-list-keys-postprocess-one-key (car keys)))
(setq cert (member (aref (car lines) 0) '("crt" "crs"))
keys (cons (epg-make-key
(if (aref (car lines) 8)
keys))
(epg-key-set-sub-key-list
(car keys)
- (cons (epg-make-sub-key-1 (car lines))
+ (cons (epg--make-sub-key-1 (car lines))
(epg-key-sub-key-list (car keys)))))
((member (aref (car lines) 0) '("sub" "ssb"))
(epg-key-set-sub-key-list
(car keys)
- (cons (epg-make-sub-key-1 (car lines))
+ (cons (epg--make-sub-key-1 (car lines))
(epg-key-sub-key-list (car keys)))))
((equal (aref (car lines) 0) "uid")
(epg-key-set-user-id-list
(epg-key-user-id-list (car keys)))))
((equal (aref (car lines) 0) "fpr")
(epg-sub-key-set-fingerprint (car (epg-key-sub-key-list (car keys)))
- (aref (car lines) 9))))
+ (aref (car lines) 9)))
+ ((equal (aref (car lines) 0) "sig")
+ (epg-user-id-set-signature-list
+ (car (epg-key-user-id-list (car keys)))
+ (cons
+ (epg-make-key-signature
+ (if (aref (car lines) 1)
+ (cdr (assq (string-to-char (aref (car lines) 1))
+ epg-key-validity-alist)))
+ (string-to-number (aref (car lines) 3))
+ (aref (car lines) 4)
+ (epg--time-from-seconds (aref (car lines) 5))
+ (epg--time-from-seconds (aref (car lines) 6))
+ (aref (car lines) 9)
+ (string-to-number (aref (car lines) 10) 16)
+ (eq (aref (aref (car lines) 10) 2) ?x))
+ (epg-user-id-signature-list
+ (car (epg-key-user-id-list (car keys))))))))
(setq lines (cdr lines)))
- (if (car keys)
- (epg-list-keys-postprocess-one-key (car keys)))
- (nreverse keys)))
+ (setq keys (nreverse keys)
+ pointer keys)
+ (while pointer
+ (epg-key-set-sub-key-list
+ (car pointer)
+ (nreverse (epg-key-sub-key-list (car pointer))))
+ (setq pointer-1 (epg-key-set-user-id-list
+ (car pointer)
+ (nreverse (epg-key-user-id-list (car pointer)))))
+ (while pointer-1
+ (epg-user-id-set-signature-list
+ (car pointer-1)
+ (nreverse (epg-user-id-signature-list (car pointer-1))))
+ (setq pointer-1 (cdr pointer-1)))
+ (setq pointer (cdr pointer)))
+ keys))
(if (fboundp 'make-temp-file)
- (defalias 'epg-make-temp-file 'make-temp-file)
+ (defalias 'epg--make-temp-file 'make-temp-file)
(defvar temporary-file-directory)
;; stolen from poe.el.
- (defun epg-make-temp-file (prefix)
+ (defun epg--make-temp-file (prefix)
"Create a temporary file.
The returned file name (created by appending some random characters at the end
of PREFIX, and expanding against `temporary-file-directory' if necessary),
`epg-decrypt-file' or `epg-decrypt-string' instead."
(unless (epg-data-file cipher)
(error "Not a file"))
+ (epg-context-set-operation context 'decrypt)
(epg-context-set-result context nil)
- (epg-start context (list "--decrypt" (epg-data-file cipher)))
+ (epg--start context (list "--decrypt" (epg-data-file cipher)))
;; `gpgsm' does not read passphrase from stdin, so waiting is not needed.
(unless (eq (epg-context-protocol context) 'CMS)
(epg-wait-for-status context '("BEGIN_DECRYPTION"))))
(if plain
(epg-context-set-output-file context plain)
(epg-context-set-output-file context
- (epg-make-temp-file "epg-output")))
+ (epg--make-temp-file "epg-output")))
(epg-start-decrypt context (epg-make-data-from-file cipher))
(epg-wait-for-completion context)
(if (epg-context-result-for context 'error)
;;;###autoload
(defun epg-decrypt-string (context cipher)
"Decrypt a string CIPHER and return the plain text."
- (let ((input-file (epg-make-temp-file "epg-input"))
+ (let ((input-file (epg--make-temp-file "epg-input"))
(coding-system-for-write 'binary))
(unwind-protect
(progn
(write-region cipher nil input-file nil 'quiet)
(epg-context-set-output-file context
- (epg-make-temp-file "epg-output"))
+ (epg--make-temp-file "epg-output"))
(epg-start-decrypt context (epg-make-data-from-file input-file))
(epg-wait-for-completion context)
(if (epg-context-result-for context 'error)
`epg-reset' to clear a temporaly output file.
If you are unsure, use synchronous version of this function
`epg-verify-file' or `epg-verify-string' instead."
+ (epg-context-set-operation context 'verify)
(epg-context-set-result context nil)
(if signed-text
;; Detached signature.
(if (epg-data-file signed-text)
- (epg-start context (list "--verify" (epg-data-file signature)
+ (epg--start context (list "--verify" (epg-data-file signature)
(epg-data-file signed-text)))
- (epg-start context (list "--verify" (epg-data-file signature) "-"))
+ (epg--start context (list "--verify" (epg-data-file signature) "-"))
(if (eq (process-status (epg-context-process context)) 'run)
(process-send-string (epg-context-process context)
(epg-data-string signed-text)))
(process-send-eof (epg-context-process context))))
;; Normal (or cleartext) signature.
(if (epg-data-file signature)
- (epg-start context (list "--verify" (epg-data-file signature)))
- (epg-start context (list "--verify"))
+ (epg--start context (list "--verify" (epg-data-file signature)))
+ (epg--start context (list "--verify"))
(if (eq (process-status (epg-context-process context)) 'run)
(process-send-string (epg-context-process context)
(epg-data-string signature)))
(if plain
(epg-context-set-output-file context plain)
(epg-context-set-output-file context
- (epg-make-temp-file "epg-output")))
+ (epg--make-temp-file "epg-output")))
(if signed-text
(epg-start-verify context
(epg-make-data-from-file signature)
(unwind-protect
(progn
(epg-context-set-output-file context
- (epg-make-temp-file "epg-output"))
+ (epg--make-temp-file "epg-output"))
(if signed-text
(progn
- (setq input-file (epg-make-temp-file "epg-signature"))
+ (setq input-file (epg--make-temp-file "epg-signature"))
(write-region signature nil input-file nil 'quiet)
(epg-start-verify context
(epg-make-data-from-file input-file)
"Initiate a sign operation on PLAIN.
PLAIN is a data object.
-If optional 3rd argument MODE is 'clearsign, it makes a clear text signature.
-If MODE is t or 'detached, it makes a detached signature.
-Otherwise, it makes a normal signature.
+If optional 3rd argument MODE is t or 'detached, it makes a detached signature.
+If it is nil or 'normal, it makes a normal signature.
+Otherwise, it makes a clear text signature.
If you use this function, you will need to wait for the completion of
`epg-gpg-program' by using `epg-wait-for-completion' and call
`epg-reset' to clear a temporaly output file.
If you are unsure, use synchronous version of this function
`epg-sign-file' or `epg-sign-string' instead."
+ (epg-context-set-operation context 'sign)
(epg-context-set-result context nil)
- (epg-start context
- (append (list (if (eq mode 'clearsign)
- "--clearsign"
- (if (or (eq mode t) (eq mode 'detached))
- "--detach-sign"
- "--sign")))
+ (epg--start context
+ (append (list (if (memq mode '(t detached))
+ "--detach-sign"
+ (if (memq mode '(nil normal))
+ "--sign"
+ "--clearsign")))
(apply #'nconc
(mapcar
(lambda (signer)
(process-send-string (epg-context-process context)
(epg-data-string plain)))
(if (eq (process-status (epg-context-process context)) 'run)
- (process-send-eof (epg-context-process context))))
+ (process-send-eof (epg-context-process context)))))
;;;###autoload
(defun epg-sign-file (context plain signature &optional mode)
"Sign a file PLAIN and store the result to a file SIGNATURE.
If SIGNATURE is nil, it returns the result as a string.
-If optional 3rd argument MODE is 'clearsign, it makes a clear text signature.
-If MODE is t or 'detached, it makes a detached signature.
-Otherwise, it makes a normal signature."
+If optional 3rd argument MODE is t or 'detached, it makes a detached signature.
+If it is nil or 'normal, it makes a normal signature.
+Otherwise, it makes a clear text signature."
(unwind-protect
(progn
(if signature
(epg-context-set-output-file context signature)
(epg-context-set-output-file context
- (epg-make-temp-file "epg-output")))
+ (epg--make-temp-file "epg-output")))
(epg-start-sign context (epg-make-data-from-file plain) mode)
(epg-wait-for-completion context)
- (if (epg-context-result-for context 'sign)
- (if (epg-context-result-for context 'error)
- (message "Sign warning: %S"
- (epg-context-result-for context 'error)))
+ (unless (epg-context-result-for context 'sign)
(if (epg-context-result-for context 'error)
(error "Sign failed: %S"
(epg-context-result-for context 'error))
;;;###autoload
(defun epg-sign-string (context plain &optional mode)
"Sign a string PLAIN and return the output as string.
-If optional 3rd argument MODE is 'clearsign, it makes a clear text signature.
-If MODE is t or 'detached, it makes a detached signature.
-Otherwise, it makes a normal signature."
+If optional 3rd argument MODE is t or 'detached, it makes a detached signature.
+If it is nil or 'normal, it makes a normal signature.
+Otherwise, it makes a clear text signature."
(unwind-protect
(progn
(epg-context-set-output-file context
- (epg-make-temp-file "epg-output"))
+ (epg--make-temp-file "epg-output"))
(epg-start-sign context (epg-make-data-from-string plain) mode)
(epg-wait-for-completion context)
(unless (epg-context-result-for context 'sign)
`epg-reset' to clear a temporaly output file.
If you are unsure, use synchronous version of this function
`epg-encrypt-file' or `epg-encrypt-string' instead."
+ (epg-context-set-operation context 'encrypt)
(epg-context-set-result context nil)
- (epg-start context
+ (epg--start context
(append (if always-trust '("--always-trust"))
(if recipients '("--encrypt") '("--symmetric"))
(if sign
(if cipher
(epg-context-set-output-file context cipher)
(epg-context-set-output-file context
- (epg-make-temp-file "epg-output")))
+ (epg--make-temp-file "epg-output")))
(epg-start-encrypt context (epg-make-data-from-file plain)
recipients sign always-trust)
(epg-wait-for-completion context)
(unwind-protect
(progn
(epg-context-set-output-file context
- (epg-make-temp-file "epg-output"))
+ (epg--make-temp-file "epg-output"))
(epg-start-encrypt context (epg-make-data-from-string plain)
recipients sign always-trust)
(epg-wait-for-completion context)
`epg-reset' to clear a temporaly output file.
If you are unsure, use synchronous version of this function
`epg-export-keys-to-file' or `epg-export-keys-to-string' instead."
+ (epg-context-set-operation context 'export-keys)
(epg-context-set-result context nil)
- (epg-start context (cons "--export"
+ (epg--start context (cons "--export"
(mapcar
(lambda (key)
(epg-sub-key-id
(if keys
(epg-context-set-output-file context file)
(epg-context-set-output-file context
- (epg-make-temp-file "epg-output")))
+ (epg--make-temp-file "epg-output")))
(epg-start-export-keys context keys)
(epg-wait-for-completion context)
(if (epg-context-result-for context 'error)
`epg-reset' to clear a temporaly output file.
If you are unsure, use synchronous version of this function
`epg-import-keys-from-file' or `epg-import-keys-from-string' instead."
+ (epg-context-set-operation context 'import-keys)
(epg-context-set-result context nil)
- (epg-context-set-output-file context (epg-make-temp-file "epg-output"))
- (epg-start context (list "--import" (epg-data-file keys)))
+ (epg--start context (if (epg-data-file keys)
+ (list "--import" (epg-data-file keys))
+ (list "--import")))
(when (epg-data-string keys)
(if (eq (process-status (epg-context-process context)) 'run)
(process-send-string (epg-context-process context)
(if (eq (process-status (epg-context-process context)) 'run)
(process-send-eof (epg-context-process context)))))
-(defun epg-import-keys-1 (context keys)
+(defun epg--import-keys-1 (context keys)
(unwind-protect
(progn
(epg-start-import-keys context keys)
(epg-wait-for-completion context)
(if (epg-context-result-for context 'error)
(error "Import keys failed: %S"
- (epg-context-result-for context 'error)))
- (epg-read-output context))
+ (epg-context-result-for context 'error))))
(epg-reset context)))
;;;###autoload
(defun epg-import-keys-from-file (context keys)
"Add keys from a file KEYS."
- (epg-import-keys-1 context (epg-make-data-from-file keys)))
+ (epg--import-keys-1 context (epg-make-data-from-file keys)))
;;;###autoload
(defun epg-import-keys-from-string (context keys)
"Add keys from a string KEYS."
- (epg-import-keys-1 context (epg-make-data-from-string keys)))
+ (epg--import-keys-1 context (epg-make-data-from-string keys)))
+
+;;;###autoload
+(defun epg-start-receive-keys (context key-id-list)
+ "Initiate a receive key operation.
+KEY-ID-LIST is a list of key IDs.
+
+If you use this function, you will need to wait for the completion of
+`epg-gpg-program' by using `epg-wait-for-completion' and call
+`epg-reset' to clear a temporaly output file.
+If you are unsure, use synchronous version of this function
+`epg-generate-key-from-file' or `epg-generate-key-from-string' instead."
+ (epg-context-set-operation context 'receive-keys)
+ (epg-context-set-result context nil)
+ (epg--start context (cons "--recv-keys" key-id-list)))
+
+;;;###autoload
+(defun epg-receive-keys (context keys)
+ "Add keys from server.
+KEYS is a list of key IDs"
+ (unwind-protect
+ (progn
+ (epg-start-receive-keys context keys)
+ (epg-wait-for-completion context)
+ (if (epg-context-result-for context 'error)
+ (error "Receive keys failed: %S"
+ (epg-context-result-for context 'error))))
+ (epg-reset context)))
+
+;;;###autoload
+(defalias 'epg-import-keys-from-server 'epg-receive-keys)
;;;###autoload
(defun epg-start-delete-keys (context keys &optional allow-secret)
`epg-reset' to clear a temporaly output file.
If you are unsure, use synchronous version of this function
`epg-delete-keys' instead."
+ (epg-context-set-operation context 'delete-keys)
(epg-context-set-result context nil)
- (epg-start context (cons (if allow-secret
+ (epg--start context (cons (if allow-secret
"--delete-secret-key"
"--delete-key")
(mapcar
`epg-reset' to clear a temporaly output file.
If you are unsure, use synchronous version of this function
`epg-sign-keys' instead."
+ (epg-context-set-operation context 'sign-keys)
(epg-context-set-result context nil)
- (epg-start context (cons (if local
+ (epg--start context (cons (if local
"--lsign-key"
"--sign-key")
(mapcar
`epg-reset' to clear a temporaly output file.
If you are unsure, use synchronous version of this function
`epg-generate-key-from-file' or `epg-generate-key-from-string' instead."
+ (epg-context-set-operation context 'generate-key)
(epg-context-set-result context nil)
(if (epg-data-file parameters)
- (epg-start context (list "--batch" "--genkey"
+ (epg--start context (list "--batch" "--genkey"
(epg-data-file parameters)))
- (epg-start context '("--batch" "--genkey"))
+ (epg--start context '("--batch" "--genkey"))
(if (eq (process-status (epg-context-process context)) 'run)
(process-send-string (epg-context-process context)
(epg-data-string parameters)))
;;;###autoload
(defun epg-generate-key-from-string (context parameters)
"Generate a new key pair.
-PARAMETERS is a file which tells how to create the key."
+PARAMETERS is a string which tells how to create the key."
(unwind-protect
(progn
(epg-start-generate-key context (epg-make-data-from-string parameters))
(epg-context-result-for context 'error))))
(epg-reset context)))
-(defun epg-decode-hexstring (string)
+(defun epg--decode-hexstring (string)
(let ((index 0))
(while (eq index (string-match "[0-9A-Fa-f][0-9A-Fa-f]" string index))
(setq string (replace-match "\\x\\&" t nil string)
index (+ index 4)))
(car (read-from-string (concat "\"" string "\"")))))
-(defun epg-decode-quotedstring (string)
+(defun epg--decode-quotedstring (string)
(let ((index 0))
(while (string-match "\\\\\\(\\([,=+<>#;\\\"]\\)\\|\
\\([0-9A-Fa-f][0-9A-Fa-f]\\)\\|\\(.\\)\\)"
"\\([^,=+<>#;\\\"]\\|\\\\.\\)+"
string index))
(setq index (match-end 0)
- value (epg-decode-quotedstring (match-string 0 string)))
+ value (epg--decode-quotedstring (match-string 0 string)))
(if (eq index (string-match "#\\([0-9A-Fa-f]+\\)" string index))
(setq index (match-end 0)
- value (epg-decode-hexstring (match-string 1 string)))
+ value (epg--decode-hexstring (match-string 1 string)))
(if (eq index (string-match "\"\\([^\\\"]\\|\\\\.\\)*\""
string index))
(setq index (match-end 0)
- value (epg-decode-quotedstring (match-string 0 string))))))
+ value (epg--decode-quotedstring
+ (match-string 0 string))))))
(if group
(if (stringp (car (car alist)))
(setcar alist (list (cons type value) (car alist)))
projects / elisp / epg.git / blobdiff