Merge commit 'mlcastle/master'

[monkeysphere.git] / src / keytrans / openpgp2ssh.c

diff --git a/src/keytrans/openpgp2ssh.c b/src/keytrans/openpgp2ssh.c
index ce4d13d65326026a6f0ed206a4d1622389bbe08a..92bdc1955c81e0cada4eb80a5177017f5b226575 100644 (file)
--- a/src/keytrans/openpgp2ssh.c
+++ b/src/keytrans/openpgp2ssh.c
@@ -45,9 +45,6 @@ int convert_private_pgp_to_x509(gnutls_x509_privkey_t* output, const gnutls_open
   int subkeycount;
   int found = 0;
 
-/* FIXME: actually respect keyid argument.  At the moment, we just
-   emit the primary key.  */
-
   init_datum(&m);
   init_datum(&e);
   init_datum(&d);
@@ -58,7 +55,6 @@ int convert_private_pgp_to_x509(gnutls_x509_privkey_t* output, const gnutls_open
   init_datum(&y);
   init_datum(&x);
 
-
   subkeycount = gnutls_openpgp_privkey_get_subkey_count(*pgp_privkey);
   if (subkeycount < 0) {
     err(0,"Could not determine subkey count (got value %d)\n", subkeycount);
@@ -431,14 +427,11 @@ int main(int argc, char* argv[]) {
       
     } else {
       /* we have no idea what kind of key this is at all anyway! */
-      err(0,"Input does contain any form of OpenPGP key I recognize.\n");
+      err(0,"Input does not contain any form of OpenPGP key I recognize.\n");
       return 1;
     }
   }
 
-
-
-
   gnutls_global_deinit();
   return 0;
 }