Mercurial > emacs

comparison lisp/pgg-pgp5.el @ 83530:46b1096093f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from emacs@sv.gnu.org. Patches applied: * emacs@sv.gnu.org/emacs--devo--0--patch-294 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-295 Merge from gnus--rel--5.10 * emacs@sv.gnu.org/emacs--devo--0--patch-296 Update from CVS: admin/FOR-RELEASE: Update refcard section. * emacs@sv.gnu.org/emacs--devo--0--patch-297 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-298 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-299 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-300 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-301 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-302 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-303 Update from CVS * emacs@sv.gnu.org/emacs--devo--0--patch-304 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-103 Update from CVS * emacs@sv.gnu.org/gnus--rel--5.10--patch-104 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-570
author Karoly Lorentey <lorentey@elte.hu>
date Mon, 12 Jun 2006 07:27:12 +0000
parents 70b055c73c8c
children e3694f1cb928
comparison
equal deleted inserted replaced
83529:0d9e16eab053 83530:46b1096093f5
145 145
146 (defun pgg-pgp5-encrypt-region (start end recipients &optional sign passphrase) 146 (defun pgg-pgp5-encrypt-region (start end recipients &optional sign passphrase)
147 "Encrypt the current region between START and END." 147 "Encrypt the current region between START and END."
148 (let* ((pgg-pgp5-user-id (or pgg-pgp5-user-id pgg-default-user-id)) 148 (let* ((pgg-pgp5-user-id (or pgg-pgp5-user-id pgg-default-user-id))
149 (passphrase (or passphrase 149 (passphrase (or passphrase
150 (when sign 150 (when sign
151 (pgg-read-passphrase 151 (pgg-read-passphrase
152 (format "PGP passphrase for %s: " 152 (format "PGP passphrase for %s: "
153 pgg-pgp5-user-id) 153 pgg-pgp5-user-id)
154 pgg-pgp5-user-id)))) 154 pgg-pgp5-user-id))))
155 (args 155 (args
156 (append 156 (append
157 `("+NoBatchInvalidKeys=off" "-fat" "+batchmode=1" 157 `("+NoBatchInvalidKeys=off" "-fat" "+batchmode=1"
158 ,@(if recipients 158 ,@(if recipients
159 (apply #'append 159 (apply #'append
160 (mapcar (lambda (rcpt) 160 (mapcar (lambda (rcpt)
161 (list "-r" 161 (list "-r"
162 (concat "\"" rcpt "\""))) 162 (concat "\"" rcpt "\"")))
163 (append recipients 163 (append recipients
164 (if pgg-encrypt-for-me 164 (if pgg-encrypt-for-me
165 (list pgg-pgp5-user-id))))))) 165 (list pgg-pgp5-user-id)))))))
166 (if sign '("-s" "-u" pgg-pgp5-user-id))))) 166 (if sign '("-s" "-u" pgg-pgp5-user-id)))))
167 (pgg-pgp5-process-region start end nil pgg-pgp5-pgpe-program args) 167 (pgg-pgp5-process-region start end nil pgg-pgp5-pgpe-program args)
168 (pgg-process-when-success nil))) 168 (pgg-process-when-success nil)))
169 169
170 (defun pgg-pgp5-decrypt-region (start end &optional passphrase) 170 (defun pgg-pgp5-decrypt-region (start end &optional passphrase)
171 "Decrypt the current region between START and END." 171 "Decrypt the current region between START and END."
172 (let* ((pgg-pgp5-user-id (or pgg-pgp5-user-id pgg-default-user-id)) 172 (let* ((pgg-pgp5-user-id (or pgg-pgp5-user-id pgg-default-user-id))
173 (passphrase 173 (passphrase
174 (or passphrase 174 (or passphrase
175 (pgg-read-passphrase 175 (pgg-read-passphrase
176 (format "PGP passphrase for %s: " pgg-pgp5-user-id) 176 (format "PGP passphrase for %s: " pgg-pgp5-user-id)
177 (pgg-pgp5-lookup-key pgg-pgp5-user-id 'encrypt)))) 177 (pgg-pgp5-lookup-key pgg-pgp5-user-id 'encrypt))))
178 (args 178 (args
179 '("+verbose=1" "+batchmode=1" "+language=us" "-f"))) 179 '("+verbose=1" "+batchmode=1" "+language=us" "-f")))
180 (pgg-pgp5-process-region start end passphrase pgg-pgp5-pgpv-program args) 180 (pgg-pgp5-process-region start end passphrase pgg-pgp5-pgpv-program args)
181 (pgg-process-when-success nil))) 181 (pgg-process-when-success nil)))
182 182
183 (defun pgg-pgp5-sign-region (start end &optional clearsign passphrase) 183 (defun pgg-pgp5-sign-region (start end &optional clearsign passphrase)
184 "Make detached signature from text between START and END." 184 "Make detached signature from text between START and END."
185 (let* ((pgg-pgp5-user-id (or pgg-pgp5-user-id pgg-default-user-id)) 185 (let* ((pgg-pgp5-user-id (or pgg-pgp5-user-id pgg-default-user-id))
186 (passphrase 186 (passphrase
187 (or passphrase 187 (or passphrase
188 (pgg-read-passphrase 188 (pgg-read-passphrase
189 (format "PGP passphrase for %s: " pgg-pgp5-user-id) 189 (format "PGP passphrase for %s: " pgg-pgp5-user-id)
190 (pgg-pgp5-lookup-key pgg-pgp5-user-id 'sign)))) 190 (pgg-pgp5-lookup-key pgg-pgp5-user-id 'sign))))
191 (args 191 (args
192 (list (if clearsign "-fat" "-fbat") 192 (list (if clearsign "-fat" "-fbat")
193 "+verbose=1" "+language=us" "+batchmode=1" 193 "+verbose=1" "+language=us" "+batchmode=1"
194 "-u" pgg-pgp5-user-id))) 194 "-u" pgg-pgp5-user-id)))
195 (pgg-pgp5-process-region start end passphrase pgg-pgp5-pgps-program args) 195 (pgg-pgp5-process-region start end passphrase pgg-pgp5-pgps-program args)