From e34d1a28ba4e7baa9f75aea76467c700f53af5a0 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Sat, 3 Aug 2013 16:43:53 -0400
Subject: [PATCH] =?utf8?q?zcrypt.pl:=20No=20need=20to=20replace=20BarnOwl?=
 =?utf8?q?=E2=80=99s=20builtin=20zcrypt=20anymore?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 barnowl/zcrypt.pl | 37 +++++--------------------------------
 1 file changed, 5 insertions(+), 32 deletions(-)

diff --git a/barnowl/zcrypt.pl b/barnowl/zcrypt.pl
index 8ce18ff..e60b0de 100644
--- a/barnowl/zcrypt.pl
+++ b/barnowl/zcrypt.pl
@@ -1,18 +1,10 @@
-# BarnOwls older than late September 2008 will segfault on short zcrypt messages.
-# Besides, the code is sketchy and doesn't belong in core. This perl module
-# will add :zcrypt and :decrypt commands that use barnowl's zcrypt binary via
-# Perl, so a bug in zcrypt can't possibly affect BarnOwl proper. The :zcrypt
-# command replaces the built-in one.
+# This perl module adds a :decrypt command that uses barnowl's zcrypt
+# binary via Perl to decrypt zcrypt'd zephyrs after they have been
+# received.
 #
 # To use this code, type
 #   :perl do '/mit/snippets/barnowl/zcrypt.pl'
 #
-# This first line will disable BarnOwl's own zcrypt code, so messages are
-# encrypted onscreen. Use :decrypt to display them. (Security bugs were later
-# found in the decryption code, although these probably affect locker zcrypt
-# too.)
-
-BarnOwl::command("unset zcrypt");
 
 use IPC::Open2;
 BarnOwl::new_command(decrypt => sub {
@@ -25,7 +17,7 @@ BarnOwl::new_command(decrypt => sub {
    my ($zo, $zi);
    my $pid = open2($zo, $zi, 'athrun', 'barnowl', 'zcrypt', '-D', @args) or die "Couldn't launch zcrypt\n";
    my $decrypted;
-   print $zi @{$msg->fields}[1] . "\n";
+   print $zi $msg->fields->[1] . "\n";
    close $zi;
    while (<$zo>) {
       chomp;
@@ -43,23 +35,4 @@ decrypted output. If args are specified, they are passed to zcrypt and the\n
 class and instance are ignored.\n\n
 SEE ALSO: zcrypt(1)"});
 
-BarnOwl::new_command(zcrypt => sub {
-   my $cmd = shift;
-   my @args = @_;
-   #my $argstring = BarnOwl::quote(@args);  # requires BarnOwl 1.4
-   my $argstring = join ' ', map { BarnOwl::quote($_) } @args;
-   BarnOwl::start_edit_win("athrun barnowl zcrypt $argstring", sub {
-      my $msg = shift;
-      my ($zo, $zi);
-      my $pid = open2($zo, $zi, 'athrun', 'barnowl', 'zcrypt', @args);
-      print $zi "$msg\n";
-      close $zi;
-      local $/;
-      BarnOwl::message(<$zo>);
-      waitpid $pid, 0;
-      });
-   },
-   {summary => "Run athrun barnowl zcrypt",
-    usage => "zcrypt -c [class] -i [instance]",
-    description => "Calls athrun barnowl zcrypt on a message you type in.\n\n
-SEE ALSO: zcrypt(1)"});
+1;
-- 
2.45.0