summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kahn Gillmor <dkg@fifthhorseman.net>2008-04-09 03:46:45 -0400
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2008-04-09 03:46:45 -0400
commitcdc4ff140d28587c682eaf3d231d4aa47eba1fc8 (patch)
tree2d8d3c2fcb0a14dbd10f2929301a2937abe2f83f
parent64f93667c18e1c443bff63fc46fc45823b63461b (diff)
added FIXMEs documenting next steps for gpg2ssh.
-rw-r--r--gpg2ssh.c17
1 files changed, 15 insertions, 2 deletions
diff --git a/gpg2ssh.c b/gpg2ssh.c
index a109943..f696f65 100644
--- a/gpg2ssh.c
+++ b/gpg2ssh.c
@@ -80,6 +80,9 @@ int main(int argc, char* argv[]) {
GNUTLS_OPENPGP_FMT_BASE64; if MONKEYSPHERE_RAW is set, use RAW,
otherwise, use BASE64: */
+ /* FIXME: we should be auto-detecting the input format, and
+ translating it as needed. */
+
if (getenv("MONKEYSPHERE_RAW")) {
err("assuming RAW formatted certificate\n");
if (ret = gnutls_openpgp_crt_import(openpgp_crt, &data, GNUTLS_OPENPGP_FMT_RAW), ret) {
@@ -99,6 +102,15 @@ int main(int argc, char* argv[]) {
return 1;
}
+ /* FIXME: We're currently looking at the primary key or maybe the
+ first authentication-capable subkey.
+
+ Instead, we should be iterating through the primary key and all
+ subkeys: for each one with the authentication usage flag set of a
+ algorithm we can handle, we should output matching UserIDs and
+ the SSH version of the key. */
+
+
if (ret = gnutls_openpgp_crt_get_key_usage(openpgp_crt, &usage), ret) {
err("failed to get the usage flags for the primary key (error: %d)\n", ret);
return ret;
@@ -194,8 +206,9 @@ int main(int argc, char* argv[]) {
uidsz--;
/* FIXME: we're just choosing the first UserID from the certificate:
- instead, we should be choosing the one that's adequately signed,
- and matches the monkeysphere specification. */
+ instead, we should be selecting every User ID that is adequately
+ signed and matches the spec, and aggregating them with commas for
+ known_hosts output */
if (ret = gnutls_openpgp_crt_get_name(openpgp_crt, 0, userid, &uidsz), ret) {
err("Failed to fetch the first UserID (error: %d)\n", ret);