From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Wed, 4 Feb 2009 02:36:07 +0000 (-0500)
Subject: stupid perl flailing in pem2openpgp.
X-Git-Tag: monkeysphere_0.23~132
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=17b89ec0f5ff0fce733f60b6973e8fc372d7c037;p=monkeysphere.git

stupid perl flailing in pem2openpgp.
---

diff --git a/src/keytrans/pem2openpgp b/src/keytrans/pem2openpgp
index 0910d07..61ce00f 100755
--- a/src/keytrans/pem2openpgp
+++ b/src/keytrans/pem2openpgp
@@ -352,14 +352,17 @@ 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})
+if (! defined $ENV{PEM2OPENPGP_USAGE_FLAGS}) {
   $flags = $usage_flags->{authenticate};
-else {
+} else {
   my @ff = split(",", $ENV{PEM2OPENPGP_USAGE_FLAGS});
   foreach $f (@ff) {
     if (! defined $usage_flags->{$f})