projects
/
monkeysphere.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2f91cf1
)
test for presence of User ID in pem2openpgp.
author
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Sun, 1 Mar 2009 01:36:46 +0000
(20:36 -0500)
committer
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Sun, 1 Mar 2009 01:36:46 +0000
(20:36 -0500)
src/keytrans/pem2openpgp
patch
|
blob
|
history
diff --git
a/src/keytrans/pem2openpgp
b/src/keytrans/pem2openpgp
index 37b372a5e1ad5afba65cf76a2867737d587f60e3..73becfe464277b61acfbbcfa96777ce0901c361b 100755
(executable)
--- a/
src/keytrans/pem2openpgp
+++ b/
src/keytrans/pem2openpgp
@@
-724,6
+724,14
@@
for (basename($0)) {
if (/^pem2openpgp$/) {
my $rsa;
my $stdin;
if (/^pem2openpgp$/) {
my $rsa;
my $stdin;
+
+ my $uid = shift;
+ defined($uid) or die "You must specify a user ID string.\n";
+
+ # FIXME: fail if there is no given user ID; or should we default to
+ # hostname_long() from Sys::Hostname::Long ?
+
+
if (defined $ENV{PEM2OPENPGP_NEWKEY}) {
$rsa = Crypt::OpenSSL::RSA->generate_key($ENV{PEM2OPENPGP_NEWKEY});
} else {
if (defined $ENV{PEM2OPENPGP_NEWKEY}) {
$rsa = Crypt::OpenSSL::RSA->generate_key($ENV{PEM2OPENPGP_NEWKEY});
} else {
@@
-735,11
+743,6
@@
for (basename($0)) {
$rsa = Crypt::OpenSSL::RSA->new_private_key($stdin);
}
$rsa = Crypt::OpenSSL::RSA->new_private_key($stdin);
}
- my $uid = shift;
-
- # FIXME: fail if there is no given user ID; or should we default to
- # hostname_long() from Sys::Hostname::Long ?
-
print pem2openpgp($rsa,
$uid,
{ timestamp => $ENV{PEM2OPENPGP_TIMESTAMP},
print pem2openpgp($rsa,
$uid,
{ timestamp => $ENV{PEM2OPENPGP_TIMESTAMP},