X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=caff%2Fcaff;h=fe5fd9778d9e0dee3d99cc3485b07edf8486665b;hb=b772729b7ac3614b0ee00fd801051afad3737813;hp=78f729017202d8784b2d5e1fad70bd9682265807;hpb=8f1e7567d62681751931472492f74e8f48d37f3c;p=pgp-tools.git

diff --git a/caff/caff b/caff/caff
index 78f7290..fe5fd97 100755
--- a/caff/caff
+++ b/caff/caff
@@ -491,6 +491,7 @@ if ($ARGV[0] eq '-u') {
 	usage() unless scalar @ARGV >= 3;
 	shift @ARGV;
 	$USER = shift @ARGV;
+	$USER =~ s/^0x//i;
 	unless ($USER =~ /^[A-Za-z0-9]{8,8}([A-Za-z0-9]{8})?$/) {
 		print STDERR "-u $USER is not a keyid.\n";
 		usage();
@@ -498,6 +499,7 @@ if ($ARGV[0] eq '-u') {
 	$USER = uc($USER);
 };
 for my $keyid (@ARGV) {
+	$keyid =~ s/^0x//i;
 	unless ($keyid =~ /^[A-Za-z0-9]{8}([A-Za-z0-9]{8})?$/) {
 		print STDERR "$keyid is not a keyid.\n";
 		usage();
@@ -525,7 +527,6 @@ for my $keyid (@ARGV) {
 		warn ("No data from gpg for list-key\n");
 		next;
 	};
-	print $stdout;
 	foreach my $keyid (@{$CONFIG{'keyid'}}) {
 		unless ($stdout =~ /^pub:(?:[^:]*:){3,3}$keyid:/m) {
 			info("Importing $keyid");