From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Fri, 5 Sep 2008 04:09:05 +0000 (-0400)
Subject: more porting tweaks: do not rely on the -w arg to base64, so we can use fourmilab... 
X-Git-Tag: monkeysphere_0.15-1~16^2~7
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=9556a2f1659aa6432cc74469a25d401319d74e79;p=monkeysphere.git

more porting tweaks: do not rely on the -w arg to base64, so we can use fourmilab instead of GNU
---

diff --git a/src/keytrans/openpgp2ssh.c b/src/keytrans/openpgp2ssh.c
index 427adc8..f16eac5 100644
--- a/src/keytrans/openpgp2ssh.c
+++ b/src/keytrans/openpgp2ssh.c
@@ -208,7 +208,7 @@ int emit_public_openssh_from_pgp(const gnutls_openpgp_crt_t* pgp_crt, const unsi
   /* variables for the output conversion: */
   int pipestatus;
   int pipefd, child_pid;
-  char* const b64args[] = {"base64", "--wrap=0", NULL};
+  char* const b64args[] = {"sh", "-c", "base64 | tr -c -d '[A-Za-z0-9=+/]'", NULL};
 
   init_datum(&m);
   init_datum(&e);