use the environment to determine usage flags (default to certify)

[monkeysphere.git] / src / keytrans / pem2openpgp

diff --git a/src/keytrans/pem2openpgp b/src/keytrans/pem2openpgp
index 0910d07f8b27009d31c315e1a781a82f9813eefd..315a2b5dc5a95638f5a031679f00f8c77b3c2d0c 100755 (executable)
--- a/src/keytrans/pem2openpgp
+++ b/src/keytrans/pem2openpgp
@@ -352,18 +352,22 @@ my $hash_algo = pack('C', $digests->{sha1});
 # could an environment variable (if set) override the current time, to
 # be able to create a standard key?  If we read the key from a file
 # instead of stdin, should we use the creation time on the file?
-my $timestamp = $ENV{PEM2OPENPGP_TIMESTAMP};
-if (! defined $timestamp)
+my $timestamp = 0;
+if (defined $ENV{PEM2OPENPGP_TIMESTAMP}) {
+  $timestamp = ($ENV{PEM2OPENPGP_TIMESTAMP} + 0);
+} else {
   $timestamp = time();
+}
 
 my $flags = 0;
-if (! defined $ENV{PEM2OPENPGP_USAGE_FLAGS})
-  $flags = $usage_flags->{authenticate};
-else {
+if (! defined $ENV{PEM2OPENPGP_USAGE_FLAGS}) {
+  $flags = $usage_flags->{certify};
+} else {
   my @ff = split(",", $ENV{PEM2OPENPGP_USAGE_FLAGS});
-  foreach $f (@ff) {
-    if (! defined $usage_flags->{$f})
+  foreach my $f (@ff) {
+    if (! defined $usage_flags->{$f}) {
       die "No such flag $f";
+    }
     $flags |= $usage_flags->{$f};
   }
 }
@@ -374,7 +378,7 @@ my $creation_time_packet = pack('CCN', 5, $subpacket_types->{sig_creation_time},
 # FIXME: HARDCODED: what if someone wants to select a different set of
 # usage flags?  For now, we do only authentication because that's what
 # monkeysphere needs.
-my $usage_packet = pack('CCC', 2, $subpacket_types->{usage_flags}, $usage_flags->{authenticate});
+my $usage_packet = pack('CCC', 2, $subpacket_types->{usage_flags}, $flags);
 
 
 # FIXME: HARDCODED: how should we determine how far off to set the