X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fshare%2Fkeytrans;h=ae4fb0993980afb1de16558a227775486ab89b5e;hb=bb1da608577e67662ecf7042badf2c4ba3c522c1;hp=56ddde2ad4cecccbb0f8904d5e8bf9c24be3d47b;hpb=aaa7dc2d06d8a9bdda5d0d818990fdbbaf2d0017;p=monkeysphere.git

diff --git a/src/share/keytrans b/src/share/keytrans
index 56ddde2..ae4fb09 100755
--- a/src/share/keytrans
+++ b/src/share/keytrans
@@ -797,7 +797,9 @@ sub openpgp2rsa {
     $fpr = uc($fpr);
   }
 
-  my $data = { 'fpr' => $fpr};
+  my $data = { target => { fpr => $fpr,
+			 },
+	       };
   my $subs = { $packet_types->{pubkey} => \&findkey,
 	       $packet_types->{pub_subkey} => \&findkey,
 	       $packet_types->{seckey} => \&findkey,
@@ -1084,7 +1086,7 @@ for (basename($0)) {
 	open($instream,'-');
 	binmode($instream, ":bytes");
 
-	my $revcert = revokeuserid($instream, $fpr, $uid, $ENV{KEYTRANS_REVUID_TIMESTAMP});
+	my $revcert = revokeuserid($instream, $fpr, $uid, $ENV{PEM2OPENPGP_TIMESTAMP});
 
 	print $revcert;
       } elsif (/^adduserid$/) {
@@ -1101,7 +1103,7 @@ for (basename($0)) {
 
 	print $newuid;
       } else {
-	die "Unrecognized subcomand.  keytrans subcommands are not a stable interface!\n";
+	die "Unrecognized subcommand.  keytrans subcommands are not a stable interface!\n";
       }
     }
   }