projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add comment to bug about notification of modifications to known_hosts
[monkeysphere.git]
/
src
/
keytrans
/
openpgp2ssh.c
diff --git
a/src/keytrans/openpgp2ssh.c
b/src/keytrans/openpgp2ssh.c
index 5cc6cfa087e967e8e8afe49af2839073570fade6..f16eac5c3ea85236942b33b8021b2b599dac5107 100644
(file)
--- 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;
/* variables for the output conversion: */
int pipestatus;
int pipefd, child_pid;
- char* const b64args[] = {"
/usr/bin/base64", "--wrap=0
", NULL};
+ char* const b64args[] = {"
sh", "-c", "base64 | tr -c -d '[A-Za-z0-9=+/]'
", NULL};
init_datum(&m);
init_datum(&e);
init_datum(&m);
init_datum(&e);
@@
-491,6
+491,8
@@
int main(int argc, char* argv[]) {
err(0,"Translating public key\n");
ret = emit_public_openssh_from_pgp(&pgp_crt, fingerprint, fpr_size);
err(0,"Translating public key\n");
ret = emit_public_openssh_from_pgp(&pgp_crt, fingerprint, fpr_size);
+ if (ret != 0)
+ return ret;
} else {
/* we have no idea what kind of key this is at all anyway! */
} else {
/* we have no idea what kind of key this is at all anyway! */