X-Git-Url: http://git.sthu.org/?a=blobdiff_plain;f=gpgsigs%2Fgpgsigs;h=c49ef00bfda9b4548eb14356e7fbffb77f823347;hb=3175d1a064086673de558bd83968929a3d20604d;hp=38db0ec686b37ec134d90fe2c989d1594336d58c;hpb=3e6648e9d2988775d405042b74e884bee29fd019;p=pgp-tools.git

diff --git a/gpgsigs/gpgsigs b/gpgsigs/gpgsigs
index 38db0ec..c49ef00 100755
--- a/gpgsigs/gpgsigs
+++ b/gpgsigs/gpgsigs
@@ -59,9 +59,10 @@ EOF
 
 
 my ($fromcharset, $charset, $recv_keys);
+Getopt::Long::config('bundling');
 GetOptions(
-	f => \$fromcharset,
-	t => \$charset,
+	'-f=s' => \$fromcharset,
+	'-t=s' => \$charset,
 	r => \$recv_keys,
 	help => sub { usage(*STDOUT, 0); },
 	version => sub { version(*STDOUT); exit 0;},
@@ -142,8 +143,8 @@ map { s/^0x//i; } @mykeys;
 if (!@mykeys || scalar @ARGV) {
 	usage(*STDERR, 1);
 }
-if (!grep { /^([0-9A-F]{16,16}|[0-9A-F]{8,8})$/ } @mykeys) {
-	print STDERR "Invalid keyid given\n";
+foreach my $falsekey (grep { $_ !~ /^([0-9A-F]{16,16}|[0-9A-F]{8,8})$/ } @mykeys) {
+	print STDERR "Invalid keyid $falsekey given\n";
 	usage(*STDERR, 1);
 }
 
@@ -182,9 +183,32 @@ while (<SIGS>) {
 		$uid = myrecode($1);
 		next;
 	}
-	if ( m/^sig:(?:.*?:){3,3}([0-9A-F]{8})([0-9A-F]{8}):(?:.*?:){3,3}(.*):.*?:/ ) {
-		$sigs->{$key}->{$uid}->{$1.$2} = $3;
-		$sigs->{$key}->{$uid}->{$2} = $3;
+	if ( m/^sig:(?:.*?:){3,3}([0-9A-F]{8})([0-9A-F]{8}):(?:.*?:){5,5}(.*?):/ ) {
+		my $class = $3;
+		if ($class eq '10x') {
+			$class = 'S';
+		} elsif ($class eq '11x') {
+			$class = '1';
+		} elsif ($class eq '12x') {
+			$class = '2';
+		} elsif ($class eq '13x') {
+			$class = '3';
+		} else {
+			$class = 's';
+		};
+		# Handle the case where one UID was signed multiple times
+		# with different signature classes.
+		my $before = $sigs->{$key}->{$uid}->{$1.$2};
+		if (defined $before) {
+			if ($before eq 'S' || $before eq 's') {
+				$sigs->{$key}->{$uid}->{$1.$2} = $class;
+			} elsif ($before < $class) {
+				$sigs->{$key}->{$uid}->{$1.$2} = $class;
+			};
+		} else {
+			$sigs->{$key}->{$uid}->{$1.$2} .= $class;
+		};
+		$sigs->{$key}->{$uid}->{$2} = $sigs->{$key}->{$uid}->{$1.$2}
 		next;
 	}
 	if ( m/^uat:/ ) {
@@ -229,7 +253,7 @@ sub print_tag
 	}
 	my $r = '(';
 	foreach my $mykey (@mykeys) {
-		$r .= defined $sigs->{$key}->{$uid}->{$mykey} ? "S" : " ";
+		$r .= defined $sigs->{$key}->{$uid}->{$mykey} ? $sigs->{$key}->{$uid}->{$mykey} : ' ';
 	}
 	$r .= ')';
 	return $r;