add new component "howler": small script to generate and publish a gpg

[monkeysphere.git] / gpg2ssh.c

diff --git a/gpg2ssh.c b/gpg2ssh.c
index f696f659cc903d8938f9cdb21efd14b5118a389c..a1e94df7998a55a56c88a97e9342abfe14153def 100644 (file)
--- a/gpg2ssh.c
+++ b/gpg2ssh.c
@@ -48,6 +48,7 @@ int main(int argc, char* argv[]) {
   char* const args[] = {"/usr/bin/base64", "--wrap=0", NULL};
   const char* algoname;
   int mpicount;
+  int pipestatus;
 
   init_gnutls();
   
@@ -145,7 +146,7 @@ int main(int argc, char* argv[]) {
   } 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;
     }
@@ -258,23 +259,27 @@ int main(int argc, char* argv[]) {
 
   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);