char* const args[] = {"/usr/bin/base64", "--wrap=0", NULL};
const char* algoname;
int mpicount;
+ int pipestatus;
init_gnutls();
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) {
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;
} else {
err("primary key is only good for: 0x%08x. Trying subkeys...\n", usage);
- if (ret = gnutls_openpgp_crt_get_auth_subkey(openpgp_crt, keyid), ret) {
+ if (ret = gnutls_openpgp_crt_get_auth_subkey(openpgp_crt, keyid, 0), ret) {
err("failed to find a subkey capable of authentication (error: %d)\n", ret);
return ret;
}
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);
snprintf(output_data, sizeof(output_data), "%s %s ", userid, algoname);
- write(1, output_data, strlen(output_data));
-
pipefd = create_writing_pipe(&child_pid, args[0], args);
if (pipefd < 0) {
err("failed to create a writing pipe (returned %d)\n", pipefd);
return pipefd;
}
+ write(1, output_data, strlen(output_data));
+
if (0 != write_data_fd_with_length(pipefd, all, mpicount)) {
err("was not able to write out RSA key data\n");
return 1;
}
close(pipefd);
- if (child_pid != waitpid(child_pid, NULL, 0)) {
+ if (child_pid != waitpid(child_pid, &pipestatus, 0)) {
err("could not wait for child process to return for some reason.\n");
return 1;
}
+ if (pipestatus != 0) {
+ err("base64 pipe died with return code %d\n", pipestatus);
+ return pipestatus;
+ }
write(1, "\n", 1);