X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=src%2Fshare%2Fkeytrans;h=326bfb1e6cd0cf590bcfb3c19718038b81746e3e;hb=e6c612d023a2e4d21bd80632e241f4b016b0685a;hp=3638eae5fce8d8c5e024208405dc4d974ec5ea68;hpb=e52ac3afa0f25f2dfd3e7dde6e1c7c311636f5f0;p=monkeysphere.git diff --git a/src/share/keytrans b/src/share/keytrans index 3638eae..326bfb1 100755 --- a/src/share/keytrans +++ b/src/share/keytrans @@ -627,6 +627,7 @@ sub openpgp2ssh { die "This is not an OpenPGP packet\n"; } if (0x40 & $packettag) { + # this is a new-format packet. $tag = (0x3f & $packettag); my $nextlen = 0; read($instr, $nextlen, 1); @@ -645,6 +646,7 @@ sub openpgp2ssh { # packet length is undefined. } } else { + # this is an old-format packet. my $lentype; $lentype = 0x03 & $packettag; $tag = ( 0x3c & $packettag ) >> 2; @@ -776,7 +778,6 @@ for (basename($0)) { # 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 {