projects
/
pgp-tools.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Sort keys by creation date.
[pgp-tools.git]
/
keylookup
/
keylookup
diff --git
a/keylookup/keylookup
b/keylookup/keylookup
index 1a60f24241ec0ecf9841bdf4d76125e851f96a64..4c3ccefbfe4318647162758510c36e3ed2d486e0 100755
(executable)
--- a/
keylookup/keylookup
+++ b/
keylookup/keylookup
@@
-31,7
+31,7
@@
use IO::Socket;
use IPC::Open3;
use Getopt::Long;
use IPC::Open3;
use Getopt::Long;
-my $version = '
2.1
($Id$)';
+my $version = '
3.0
($Id$)';
# Where to find GnuPG's options file.
# Full path to the dialog and whiptail executeable.
# Where to find GnuPG's options file.
# Full path to the dialog and whiptail executeable.
@@
-105,13
+105,10
@@
sub getHits($) {
my ($type, undef) = split /:/;
if ($type eq 'pub') {
my ($type, $keyid, $algo, $bits, $created, undef, $revoked) = split /:/;
my ($type, undef) = split /:/;
if ($type eq 'pub') {
my ($type, $keyid, $algo, $bits, $created, undef, $revoked) = split /:/;
- my (undef,undef,undef,$mday,$mon,$year,undef,undef,undef) = localtime ($created);
$currentKey = { 'bits' => $bits,
'type' => (defined $ALGOS{$algo} ? $ALGOS{$algo} : '#'.$algo),
'keyid' => $keyid,
$currentKey = { 'bits' => $bits,
'type' => (defined $ALGOS{$algo} ? $ALGOS{$algo} : '#'.$algo),
'keyid' => $keyid,
- 'year' => $year+1900,
- 'month' => $mon+1,
- 'day' => $mday,
+ 'created' => $created,
'revoked' => $revoked,
'uid' => []
};
'revoked' => $revoked,
'uid' => []
};
@@
-169,13
+166,15
@@
sub prepareForDialog {
my $keys = shift;
my @keyargs = ();
my $keys = shift;
my @keyargs = ();
- for my $keyid (keys %$keys) {
+ for my $keyid (
sort {- ($keys->{$a}->{'created'} <=> $keys->{$b}->{'created'})}
keys %$keys) {
for (@{ $keys->{$keyid}->{'uid'} }) {
push @keyargs,
$keys->{$keyid}->{'keyid'},
length() <= $MAX_UID_FIELD_LEN ? $_ : substr($_, 0, $MAX_UID_FIELD_LEN-2) . '..',
'off';
};
for (@{ $keys->{$keyid}->{'uid'} }) {
push @keyargs,
$keys->{$keyid}->{'keyid'},
length() <= $MAX_UID_FIELD_LEN ? $_ : substr($_, 0, $MAX_UID_FIELD_LEN-2) . '..',
'off';
};
+ my (undef,undef,undef,$mday,$mon,$year,undef,undef,undef) = localtime ($keys->{$keyid}->{'created'});
+ push @keyargs, $keys->{$keyid}->{'keyid'}, sprintf( "[created: %s-%s-%s]", $year+1900, $mon+1, $mday ), 'off';
push @keyargs, '-'x8, '-'x40, 'off';
};
pop @keyargs;
push @keyargs, '-'x8, '-'x40, 'off';
};
pop @keyargs;
@@
-189,14
+188,13
@@
sub prepareForTXT {
my $keys = shift;
my @lines = ();
my $keys = shift;
my @lines = ();
- for my $keyid (keys %$keys) {
+ for my $keyid (sort {- ($keys->{$a}->{'created'} <=> $keys->{$b}->{'created'})} keys %$keys) {
+ my (undef,undef,undef,$mday,$mon,$year,undef,undef,undef) = localtime ($keys->{$keyid}->{'created'});
push @lines, sprintf( "%s%s/%s %s-%s-%s\n",
$keys->{$keyid}->{'bits'},
$keys->{$keyid}->{'type'},
$keys->{$keyid}->{'keyid'},
push @lines, sprintf( "%s%s/%s %s-%s-%s\n",
$keys->{$keyid}->{'bits'},
$keys->{$keyid}->{'type'},
$keys->{$keyid}->{'keyid'},
- $keys->{$keyid}->{'year'},
- $keys->{$keyid}->{'month'},
- $keys->{$keyid}->{'day'} );
+ $year+1900, $mon+1, $mday );
push @lines, map { ' 'x26 . $_ . "\n" } @{ $keys->{$keyid}->{'uid'} };
push @lines, "\n";
};
push @lines, map { ' 'x26 . $_ . "\n" } @{ $keys->{$keyid}->{'uid'} };
push @lines, "\n";
};