From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bastien Guerry Subject: [Accepted] org-crypt: cache encrypted text Date: Tue, 8 Feb 2011 16:55:51 +0100 (CET) Message-ID: <20110208155551.B5E7621388@myhost.localdomain> References: <1297102717-5071-1-git-send-email-julien@danjou.info> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from [140.186.70.92] (port=40127 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pmpuv-0005FS-Hr for emacs-orgmode@gnu.org; Tue, 08 Feb 2011 10:55:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pmput-0001RC-TE for emacs-orgmode@gnu.org; Tue, 08 Feb 2011 10:55:49 -0500 Received: from mail-ww0-f49.google.com ([74.125.82.49]:64604) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pmput-0001Qu-Eu for emacs-orgmode@gnu.org; Tue, 08 Feb 2011 10:55:47 -0500 Received: by wwb17 with SMTP id 17so6028260wwb.30 for ; Tue, 08 Feb 2011 07:55:46 -0800 (PST) List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org Patch 586 (http://patchwork.newartisans.com/patch/586/) is now "Accepted". Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C1297102717-5071-1-git-send-email-julien%40danjou.info%3E Here is the original message containing the patch: > Content-Type: text/plain; charset="utf-8" > MIME-Version: 1.0 > Content-Transfer-Encoding: 7bit > Subject: [Orgmode] org-crypt: cache encrypted text > Date: Mon, 07 Feb 2011 23:18:37 -0000 > From: Julien Danjou > X-Patchwork-Id: 586 > Message-Id: <1297102717-5071-1-git-send-email-julien@danjou.info> > To: emacs-orgmode@gnu.org > Cc: Julien Danjou > > * lisp/org-crypt.el (org-encrypt-string): New function. > (org-encrypt-entry): Use org-encrypt-string to encrypt, so we use cached > crypted values. > (org-decrypt-entry): Store crypted text in decrypted text. > > Signed-off-by: Julien Danjou > > --- > lisp/org-crypt.el | 26 ++++++++++++++++++++------ > 1 files changed, 20 insertions(+), 6 deletions(-) > > diff --git a/lisp/org-crypt.el b/lisp/org-crypt.el > index 7c28d70..291c540 100644 > --- a/lisp/org-crypt.el > +++ b/lisp/org-crypt.el > @@ -103,6 +103,15 @@ This setting can also be overridden in the CRYPTKEY property." > (and (boundp 'epa-file-encrypt-to) epa-file-encrypt-to) > (message "No crypt key set, using symmetric encryption.")))) > > +(defun org-encrypt-string (str crypt-key) > + "Return STR encrypted with CRYPT-KEY." > + ;; Text and key have to be identical, otherwise we re-crypt. > + (if (and (string= crypt-key (get-text-property 0 'org-crypt-key str)) > + (string= (sha1 str) (get-text-property 0 'org-crypt-checksum str))) > + (get-text-property 0 'org-crypt-text str) > + (let ((epg-context (epg-make-context nil t t))) > + (epg-encrypt-string epg-context str (epg-list-keys epg-context crypt-key))))) > + > (defun org-encrypt-entry () > "Encrypt the content of the current headline." > (interactive) > @@ -122,10 +131,7 @@ This setting can also be overridden in the CRYPTKEY property." > (org-back-over-empty-lines) > (setq end (point) > encrypted-text > - (epg-encrypt-string > - epg-context > - (buffer-substring-no-properties beg end) > - (epg-list-keys epg-context crypt-key))) > + (org-encrypt-string (buffer-substring beg end) crypt-key)) > (delete-region beg end) > (insert encrypted-text) > (when folded > @@ -152,16 +158,24 @@ This setting can also be overridden in the CRYPTKEY property." > (forward-line) > (point))) > (epg-context (epg-make-context nil t t)) > + (encrypted-text (buffer-substring-no-properties (point) end)) > (decrypted-text > (decode-coding-string > (epg-decrypt-string > epg-context > - (buffer-substring-no-properties (point) end)) > + encrypted-text) > 'utf-8))) > ;; Delete region starting just before point, because the > ;; outline property starts at the \n of the heading. > (delete-region (1- (point)) end) > - (insert "\n" decrypted-text) > + ;; Store a checksum of the decrypted and the encrypted > + ;; text value. This allow to reuse the same encrypted text > + ;; if the text does not change, and therefore avoid a > + ;; re-encryption process. > + (insert "\n" (propertize decrypted-text > + 'org-crypt-checksum (sha1 decrypted-text) > + 'org-crypt-key (org-crypt-key-for-heading) > + 'org-crypt-text encrypted-text)) > (when heading-was-invisible-p > (goto-char heading-point) > (org-flag-subtree t)) >