[Bps-public-commit] GnuPG-Interface branch, master, updated. 0.42-12-g8d4cb81
Jesse Vincent
jesse at bestpractical.com
Sat May 8 17:10:52 EDT 2010
The branch, master has been updated
via 8d4cb81eef38638a12136eaf55df0a0966a9688e (commit)
via 2c1b8a98974f583f7ce449416884926d88a34c9f (commit)
via 4a92f53cc5e58da47cf19f1abed16efc50acc78d (commit)
via 828604d0e5d0e408ac3c872a945ce6145559f114 (commit)
via d32052f5968b88a13ab8a0585566dca800c01d69 (commit)
via f5571e11eaf27b81a47aa6bf21c528a22ff64ece (commit)
via c735764d6bde07d18183a34de74a4ad557e19a25 (commit)
via 5d55b2fc99188ed7aceef7a80a4e47204e948f4d (commit)
from 4e0d3e0102d408fcee574763a570765d0d7615ac (commit)
Summary of changes:
MANIFEST | 1 -
MANIFEST.SKIP | 2 +
lib/GnuPG/Interface.pm | 80 ++++++++++++++++++++++++++++------------
lib/GnuPG/Key.pm | 28 +++++++++++++-
lib/GnuPG/Options.pm | 2 +-
lib/GnuPG/Signature.pm | 18 ++++++++-
t/GnuPG/ComparableKey.pm | 8 ++--
t/GnuPG/ComparableSignature.pm | 2 +-
t/get_public_keys.t | 7 +++
t/get_secret_keys.t | 4 ++
10 files changed, 119 insertions(+), 33 deletions(-)
- Log -----------------------------------------------------------------
commit 5d55b2fc99188ed7aceef7a80a4e47204e948f4d
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Sun May 2 02:29:43 2010 -0400
Add usage_flags to keys
diff --git a/lib/GnuPG/Interface.pm b/lib/GnuPG/Interface.pm
index 5be27df..82f28f4 100644
--- a/lib/GnuPG/Interface.pm
+++ b/lib/GnuPG/Interface.pm
@@ -417,7 +417,9 @@ sub get_keys {
my (
$user_id_validity, $key_length, $algo_num, $hex_key_id,
$creation_date_string, $expiration_date_string,
- $local_id, $owner_trust, $user_id_string
+ $local_id, $owner_trust, $user_id_string,
+ $sigclass, #unused
+ $usage_flags,
) = @fields[ 1 .. $#fields ];
@@ -439,6 +441,7 @@ sub get_keys {
owner_trust => $owner_trust,
creation_date_string => $creation_date_string,
expiration_date_string => $expiration_date_string,
+ usage_flags => $usage_flags,
);
$current_signed_item = GnuPG::UserId->new(
@@ -491,8 +494,10 @@ sub get_keys {
my (
$validity, $key_length, $algo_num, $hex_id,
$creation_date_string, $expiration_date_string,
- $local_id
- ) = @fields[ 1 .. 7 ];
+ $local_id,
+ $dummy0, $dummy1, $dummy2, #unused
+ $usage_flags,
+ ) = @fields[ 1 .. 11 ];
$creation_date_string = $self->_downrez_gpg2_date($creation_date_string);
$expiration_date_string = $self->_downrez_gpg2_date($expiration_date_string);
@@ -505,6 +510,7 @@ sub get_keys {
creation_date_string => $creation_date_string,
expiration_date_string => $expiration_date_string,
local_id => $local_id,
+ usage_flags => $usage_flags,
);
$current_key->push_subkeys($current_signed_item);
diff --git a/lib/GnuPG/Key.pm b/lib/GnuPG/Key.pm
index a9ff90d..54f116d 100644
--- a/lib/GnuPG/Key.pm
+++ b/lib/GnuPG/Key.pm
@@ -25,6 +25,7 @@ has [
creation_date_string
expiration_date_string
fingerprint
+ usage_flags
)
] => (
isa => 'Any',
@@ -92,6 +93,20 @@ Number of bits in the key.
They algorithm number that the Key is used for.
+=item usage flags
+
+The Key Usage flags associated with this key, represented as a string
+of lower-case letters. Possible values include: (a) authenticate, (c)
+certify, (e) encrypt, and (s) sign.
+
+A key may have any combination of them in any order. In addition to
+these letters, the primary key has uppercase versions of the letters
+to denote the _usable_ capabilities of the entire key, and a potential
+letter 'D' to indicate a disabled key.
+
+See "key capabilities" DETAILS from the GnuPG sources for more
+details.
+
=item hex_data
The data of the key.
diff --git a/t/GnuPG/ComparableKey.pm b/t/GnuPG/ComparableKey.pm
index 0e3b5e1..89fc321 100644
--- a/t/GnuPG/ComparableKey.pm
+++ b/t/GnuPG/ComparableKey.pm
@@ -29,7 +29,7 @@ sub compare
# expiration dates in 1.0.5
my @comparison_fields
= qw( length algo_num hex_id
- creation_date_string
+ creation_date_string usage_flags
);
foreach my $field ( @comparison_fields )
diff --git a/t/get_public_keys.t b/t/get_public_keys.t
index 230c731..847d69f 100644
--- a/t/get_public_keys.t
+++ b/t/get_public_keys.t
@@ -32,6 +32,7 @@ TEST
creation_date_string => '2000-02-06',
expiration_date_string => '2002-02-05',
owner_trust => 'f',
+ usage_flags => 'scaESCA',
);
$handmade_key->fingerprint
@@ -65,6 +66,7 @@ TEST
hex_id => 'ADB99D9C2E854A6B',
creation_date_string => '2000-02-06',
expiration_date_string => '2002-02-05',
+ usage_flags => 'e',
);
$subkey->fingerprint
diff --git a/t/get_secret_keys.t b/t/get_secret_keys.t
index a80c759..1084a62 100644
--- a/t/get_secret_keys.t
+++ b/t/get_secret_keys.t
@@ -31,6 +31,7 @@ TEST
creation_date_string => '2000-02-06',
expiration_date_string => '2002-02-05',
owner_trust => 'f',
+ usage_flags => 'scaESCA',
);
$handmade_key->fingerprint
@@ -46,6 +47,7 @@ TEST
hex_id => 'ADB99D9C2E854A6B',
creation_date_string => '2000-02-06',
expiration_date_string => '2002-02-05',
+ usage_flags => 'e',
);
$subkey->fingerprint
commit c735764d6bde07d18183a34de74a4ad557e19a25
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Sun May 2 02:30:12 2010 -0400
unescape strings to handle User IDs with colons in them
diff --git a/lib/GnuPG/Interface.pm b/lib/GnuPG/Interface.pm
index 82f28f4..82d8760 100644
--- a/lib/GnuPG/Interface.pm
+++ b/lib/GnuPG/Interface.pm
@@ -335,6 +335,11 @@ sub my_fileno {
}
+sub unescape_string {
+ my($str) = splice(@_);
+ $str =~ s/\\x(..)/chr(hex($1))/eg;
+ return $str;
+}
###################################################################
@@ -446,7 +451,7 @@ sub get_keys {
$current_signed_item = GnuPG::UserId->new(
validity => $user_id_validity,
- as_string => $user_id_string,
+ as_string => unescape_string($user_id_string),
);
$current_key->push_user_ids($current_signed_item);
@@ -467,7 +472,7 @@ sub get_keys {
algo_num => $algo_num,
hex_id => $hex_key_id,
date_string => $signature_date_string,
- user_id_string => $user_id_string,
+ user_id_string => unescape_string($user_id_string),
);
if ( $current_signed_item->isa('GnuPG::UserId') ) {
@@ -485,7 +490,7 @@ sub get_keys {
$current_signed_item = GnuPG::UserId->new(
validity => $validity,
- as_string => $user_id_string,
+ as_string => unescape_string($user_id_string),
);
$current_key->push_user_ids($current_signed_item);
commit f5571e11eaf27b81a47aa6bf21c528a22ff64ece
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Sun May 2 02:30:42 2010 -0400
always use --fixed-list-mode for consistency and better granularity of data
diff --git a/lib/GnuPG/Interface.pm b/lib/GnuPG/Interface.pm
index 82d8760..ac8b39f 100644
--- a/lib/GnuPG/Interface.pm
+++ b/lib/GnuPG/Interface.pm
@@ -378,6 +378,7 @@ sub get_keys {
$self->options($new_options);
$self->options->push_extra_args(
'--with-colons',
+ '--fixed-list-mode',
'--with-fingerprint',
'--with-fingerprint',
);
@@ -449,12 +450,6 @@ sub get_keys {
usage_flags => $usage_flags,
);
- $current_signed_item = GnuPG::UserId->new(
- validity => $user_id_validity,
- as_string => unescape_string($user_id_string),
- );
-
- $current_key->push_user_ids($current_signed_item);
}
elsif ( $record_type eq 'fpr' ) {
my $hex = $fields[9];
commit d32052f5968b88a13ab8a0585566dca800c01d69
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Sun May 2 02:31:58 2010 -0400
take advantage of --fixed-list-mode and report timestamps at 1Hz precision instead of daily precision
diff --git a/lib/GnuPG/Interface.pm b/lib/GnuPG/Interface.pm
index ac8b39f..a8bac99 100644
--- a/lib/GnuPG/Interface.pm
+++ b/lib/GnuPG/Interface.pm
@@ -422,17 +422,17 @@ sub get_keys {
my (
$user_id_validity, $key_length, $algo_num, $hex_key_id,
- $creation_date_string, $expiration_date_string,
+ $creation_date, $expiration_date,
$local_id, $owner_trust, $user_id_string,
$sigclass, #unused
$usage_flags,
) = @fields[ 1 .. $#fields ];
- # GnuPg 2.x uses epoch time for creation and expiration date strings.
+ # --fixed-list-mode uses epoch time for creation and expiration date strings.
# For backward compatibility, we convert them back using GMT;
- $creation_date_string = $self->_downrez_gpg2_date($creation_date_string);
- $expiration_date_string = $self->_downrez_gpg2_date($expiration_date_string);
+ my $creation_date_string = $self->_downrez_date($creation_date);
+ my $expiration_date_string = $self->_downrez_date($expiration_date);
$current_key = $current_fingerprinted_key
= $record_type eq 'pub'
@@ -445,6 +445,8 @@ sub get_keys {
hex_id => $hex_key_id,
local_id => $local_id,
owner_trust => $owner_trust,
+ creation_date => $creation_date,
+ expiration_date => $expiration_date,
creation_date_string => $creation_date_string,
expiration_date_string => $expiration_date_string,
usage_flags => $usage_flags,
@@ -459,13 +461,14 @@ sub get_keys {
elsif ( $record_type eq 'sig' ) {
my (
$algo_num, $hex_key_id,
- $signature_date_string, $user_id_string
+ $signature_date, $user_id_string
) = @fields[ 3 .. 5, 9 ];
- $signature_date_string = $self->_downrez_gpg2_date($signature_date_string);
+ my $signature_date_string = $self->_downrez_date($signature_date);
my $signature = GnuPG::Signature->new(
algo_num => $algo_num,
hex_id => $hex_key_id,
+ date => $signature_date,
date_string => $signature_date_string,
user_id_string => unescape_string($user_id_string),
);
@@ -493,20 +496,22 @@ sub get_keys {
elsif ( $record_type eq 'sub' or $record_type eq 'ssb' ) {
my (
$validity, $key_length, $algo_num, $hex_id,
- $creation_date_string, $expiration_date_string,
+ $creation_date, $expiration_date,
$local_id,
$dummy0, $dummy1, $dummy2, #unused
$usage_flags,
) = @fields[ 1 .. 11 ];
- $creation_date_string = $self->_downrez_gpg2_date($creation_date_string);
- $expiration_date_string = $self->_downrez_gpg2_date($expiration_date_string);
+ my $creation_date_string = $self->_downrez_date($creation_date);
+ my $expiration_date_string = $self->_downrez_date($expiration_date);
$current_signed_item = $current_fingerprinted_key
= GnuPG::SubKey->new(
validity => $validity,
length => $key_length,
algo_num => $algo_num,
hex_id => $hex_id,
+ creation_date => $creation_date,
+ expiration_date => $expiration_date,
creation_date_string => $creation_date_string,
expiration_date_string => $expiration_date_string,
local_id => $local_id,
@@ -530,7 +535,7 @@ sub get_keys {
return @returned_keys;
}
-sub _downrez_gpg2_date {
+sub _downrez_date {
my $self = shift;
my $date = shift;
if ($date =~ /^\d+$/) {
diff --git a/lib/GnuPG/Key.pm b/lib/GnuPG/Key.pm
index 54f116d..d3fc5e1 100644
--- a/lib/GnuPG/Key.pm
+++ b/lib/GnuPG/Key.pm
@@ -22,6 +22,8 @@ has [
algo_num
hex_id
hex_data
+ creation_date
+ expiration_date
creation_date_string
expiration_date_string
fingerprint
@@ -122,6 +124,13 @@ the short hex id, which is 8 hex characters.
Formatted date of the key's creation and expiration.
+=item creation_date
+
+=item expiration_date
+
+Date of the key's creation and expiration, stored as the number of
+seconds since midnight 1970-01-01 UTC.
+
=item fingerprint
A GnuPG::Fingerprint object.
diff --git a/lib/GnuPG/Signature.pm b/lib/GnuPG/Signature.pm
index f492aec..fb1dd95 100644
--- a/lib/GnuPG/Signature.pm
+++ b/lib/GnuPG/Signature.pm
@@ -16,7 +16,7 @@
package GnuPG::Signature;
use Any::Moose;
-has [qw( algo_num hex_id user_id_string date_string )] => (
+has [qw( algo_num hex_id user_id_string date date_string )] => (
isa => 'Any',
is => 'rw',
);
@@ -74,6 +74,11 @@ This may not be defined if the signing key is not on the local keyring.
The formatted date the signature was performed on.
+=item date
+
+The date the signature was performed, represented as the number of
+seconds since midnight 1970-01-01 UTC.
+
=back
=head1 SEE ALSO
diff --git a/t/GnuPG/ComparableKey.pm b/t/GnuPG/ComparableKey.pm
index 89fc321..db28d1a 100644
--- a/t/GnuPG/ComparableKey.pm
+++ b/t/GnuPG/ComparableKey.pm
@@ -24,11 +24,11 @@ sub compare
{
my ( $self, $other, $deep ) = @_;
- # expiration_date_string was taken out of the following
- # list because there is a bug in the listing of
+ # expiration_date_string and expiration_date was taken out of the
+ # following list because there is a bug in the listing of
# expiration dates in 1.0.5
my @comparison_fields
- = qw( length algo_num hex_id
+ = qw( length algo_num hex_id creation_date
creation_date_string usage_flags
);
diff --git a/t/GnuPG/ComparableSignature.pm b/t/GnuPG/ComparableSignature.pm
index d8e82f4..0b3b21e 100644
--- a/t/GnuPG/ComparableSignature.pm
+++ b/t/GnuPG/ComparableSignature.pm
@@ -23,7 +23,7 @@ sub compare
{
my ( $self, $other ) = @_;
- my @compared_fields = qw( algo_num hex_id date_string );
+ my @compared_fields = qw( algo_num hex_id date date_string );
foreach my $field ( @compared_fields )
{
diff --git a/t/get_public_keys.t b/t/get_public_keys.t
index 847d69f..6ccb360 100644
--- a/t/get_public_keys.t
+++ b/t/get_public_keys.t
@@ -29,6 +29,7 @@ TEST
( length => 1024,
algo_num => 17,
hex_id => '53AE596EF950DA9C',
+ creation_date => 949813093,
creation_date_string => '2000-02-06',
expiration_date_string => '2002-02-05',
owner_trust => 'f',
@@ -44,18 +45,21 @@ TEST
my $initial_self_signature = GnuPG::Signature->new
( algo_num => 17,
hex_id => '53AE596EF950DA9C',
+ date => 949813093,
date_string => '2000-02-06',
);
my $uid2_signature = GnuPG::Signature->new
( algo_num => 17,
hex_id => '53AE596EF950DA9C',
+ date => 953179891,
date_string => '2000-03-16',
);
my $ftobin_signature = GnuPG::Signature->new
( algo_num => 17,
hex_id => '56FFD10A260C4FA3',
+ date => 953180097,
date_string => '2000-03-16',
);
@@ -64,6 +68,7 @@ TEST
length => 768,
algo_num => 16,
hex_id => 'ADB99D9C2E854A6B',
+ creation_date => 949813119,
creation_date_string => '2000-02-06',
expiration_date_string => '2002-02-05',
usage_flags => 'e',
diff --git a/t/get_secret_keys.t b/t/get_secret_keys.t
index 1084a62..63c0400 100644
--- a/t/get_secret_keys.t
+++ b/t/get_secret_keys.t
@@ -28,6 +28,7 @@ TEST
( length => 1024,
algo_num => 17,
hex_id => '53AE596EF950DA9C',
+ creation_date => 949813093,
creation_date_string => '2000-02-06',
expiration_date_string => '2002-02-05',
owner_trust => 'f',
@@ -45,6 +46,7 @@ TEST
length => 768,
algo_num => 16,
hex_id => 'ADB99D9C2E854A6B',
+ creation_date => 949813119,
creation_date_string => '2000-02-06',
expiration_date_string => '2002-02-05',
usage_flags => 'e',
commit 828604d0e5d0e408ac3c872a945ce6145559f114
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Sun May 2 02:32:40 2010 -0400
expose signature expiration times
diff --git a/lib/GnuPG/Interface.pm b/lib/GnuPG/Interface.pm
index a8bac99..5d25c61 100644
--- a/lib/GnuPG/Interface.pm
+++ b/lib/GnuPG/Interface.pm
@@ -428,11 +428,15 @@ sub get_keys {
$usage_flags,
) = @fields[ 1 .. $#fields ];
-
- # --fixed-list-mode uses epoch time for creation and expiration date strings.
- # For backward compatibility, we convert them back using GMT;
- my $creation_date_string = $self->_downrez_date($creation_date);
- my $expiration_date_string = $self->_downrez_date($expiration_date);
+ # --fixed-list-mode uses epoch time for creation and expiration date strings.
+ # For backward compatibility, we convert them back using GMT;
+ my $expiration_date_string;
+ if ($expiration_date eq '') {
+ $expiration_date = undef;
+ } else {
+ $expiration_date_string = $self->_downrez_date($expiration_date);
+ }
+ my $creation_date_string = $self->_downrez_date($creation_date);
$current_key = $current_fingerprinted_key
= $record_type eq 'pub'
@@ -461,15 +465,26 @@ sub get_keys {
elsif ( $record_type eq 'sig' ) {
my (
$algo_num, $hex_key_id,
- $signature_date, $user_id_string
- ) = @fields[ 3 .. 5, 9 ];
+ $signature_date,
+ $expiration_date,
+ $user_id_string
+ ) = @fields[ 3 .. 6, 9 ];
+
+ my $expiration_date_string;
+ if ($expiration_date eq '') {
+ $expiration_date = undef;
+ } else {
+ $expiration_date_string = $self->_downrez_date($expiration_date);
+ }
+ my $signature_date_string = $self->_downrez_date($signature_date);
- my $signature_date_string = $self->_downrez_date($signature_date);
my $signature = GnuPG::Signature->new(
algo_num => $algo_num,
hex_id => $hex_key_id,
date => $signature_date,
date_string => $signature_date_string,
+ expiration_date => $expiration_date,
+ expiration_date_string => $expiration_date_string,
user_id_string => unescape_string($user_id_string),
);
@@ -502,8 +517,14 @@ sub get_keys {
$usage_flags,
) = @fields[ 1 .. 11 ];
- my $creation_date_string = $self->_downrez_date($creation_date);
- my $expiration_date_string = $self->_downrez_date($expiration_date);
+ my $expiration_date_string;
+ if ($expiration_date eq '') {
+ $expiration_date = undef;
+ } else {
+ $expiration_date_string = $self->_downrez_date($expiration_date);
+ }
+ my $creation_date_string = $self->_downrez_date($creation_date);
+
$current_signed_item = $current_fingerprinted_key
= GnuPG::SubKey->new(
validity => $validity,
diff --git a/lib/GnuPG/Key.pm b/lib/GnuPG/Key.pm
index d3fc5e1..bd27611 100644
--- a/lib/GnuPG/Key.pm
+++ b/lib/GnuPG/Key.pm
@@ -122,14 +122,16 @@ the short hex id, which is 8 hex characters.
=item expiration_date_string
-Formatted date of the key's creation and expiration.
+Formatted date of the key's creation and expiration. If the key has
+no expiration, expiration_date_string will return undef.
=item creation_date
=item expiration_date
Date of the key's creation and expiration, stored as the number of
-seconds since midnight 1970-01-01 UTC.
+seconds since midnight 1970-01-01 UTC. If the key has no expiration,
+expiration_date will return undef.
=item fingerprint
diff --git a/lib/GnuPG/Signature.pm b/lib/GnuPG/Signature.pm
index fb1dd95..f0e200d 100644
--- a/lib/GnuPG/Signature.pm
+++ b/lib/GnuPG/Signature.pm
@@ -16,7 +16,7 @@
package GnuPG::Signature;
use Any::Moose;
-has [qw( algo_num hex_id user_id_string date date_string )] => (
+has [qw( algo_num hex_id user_id_string date date_string expiration_date expiration_date_string )] => (
isa => 'Any',
is => 'rw',
);
@@ -79,6 +79,17 @@ The formatted date the signature was performed on.
The date the signature was performed, represented as the number of
seconds since midnight 1970-01-01 UTC.
+=item expiration_date_string
+
+The formatted date the signature will expire (signatures without
+expiration return undef).
+
+=item expiration_date
+
+The date the signature will expire, represented as the number of
+seconds since midnight 1970-01-01 UTC (signatures without expiration
+return undef)
+
=back
=head1 SEE ALSO
commit 4a92f53cc5e58da47cf19f1abed16efc50acc78d
Author: Tim Retout <tim at retout.co.uk>
Date: Tue May 4 00:50:37 2010 -0400
Fix copy method of GnuPG::Options.
The result of not checking for definedness here is to never copy the
meta_immutable value successfully (as that is true by default). This led
to a FTBFS (failure to build from source) when running non-interactively.
See also: http://bugs.debian.org/549743
diff --git a/lib/GnuPG/Options.pm b/lib/GnuPG/Options.pm
index 731ac19..bbfd67a 100644
--- a/lib/GnuPG/Options.pm
+++ b/lib/GnuPG/Options.pm
@@ -97,7 +97,7 @@ sub copy {
foreach my $field ( BOOLEANS, SCALARS, LISTS ) {
my $value = $self->$field();
- next unless $value;
+ next unless defined $value;
$new->$field($value);
}
commit 2c1b8a98974f583f7ce449416884926d88a34c9f
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Tue May 4 01:18:12 2010 -0400
do not bother shipping test/random_seed
diff --git a/MANIFEST b/MANIFEST
index e461ac1..da702f9 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -75,7 +75,6 @@ test/public-keys/2.0.test
test/public-keys/2.1.test
test/public-keys/2.out
test/pubring.gpg
-test/random_seed
test/secret-keys/1.0.test
test/secret-keys/1.out
test/secret-keys/2.0.test
commit 8d4cb81eef38638a12136eaf55df0a0966a9688e
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date: Tue May 4 16:32:59 2010 -0400
ignore bits of test that should not be shipped
diff --git a/MANIFEST.SKIP b/MANIFEST.SKIP
index ae36ac8..c4c77e7 100644
--- a/MANIFEST.SKIP
+++ b/MANIFEST.SKIP
@@ -10,3 +10,5 @@ pm_to_blib
.git/
.gitignore$
.shipit$
+test/random_seed$
+test/trustdb.gpg$
-----------------------------------------------------------------------
More information about the Bps-public-commit
mailing list