From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Wed, 7 Jan 2009 19:59:40 +0000 (-0500)
Subject: pem2openpgp now accepts a choice of User ID on stdin.
X-Git-Tag: monkeysphere_0.23~164^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ad8c2c433a163b9b29281b80fb1390bfcd9756bd;p=monkeysphere.git

pem2openpgp now accepts a choice of User ID on stdin.
---

diff --git a/src/keytrans/pem2openpgp b/src/keytrans/pem2openpgp
index f6e2d4f..3fdc469 100755
--- a/src/keytrans/pem2openpgp
+++ b/src/keytrans/pem2openpgp
@@ -23,6 +23,10 @@ use MIME::Base64;
 ## make sure all length() and substr() calls use bytes only:
 use bytes;
 
+my $uid = shift;
+
+# FIXME: fail if there is no given user ID.
+
 # make an old-style packet out of the given packet type and body.
 # old-style  (see RFC 4880 section 4.2)
 sub make_packet {
@@ -112,10 +116,6 @@ if (! $rsa->check_key()) {
   die "key does not check";
 }
 
-my $uid = 'fake key (do not use) <test@example.org>';
-
-
-
 my $version = pack('C', 4);
 # strong assertion of identity:
 my $sigtype = pack('C', 0x13);