From aecf4cab7466b778ee3f1b07ae9f77312f5bdc55 Mon Sep 17 00:00:00 2001 From: TLINDEN Date: Sat, 9 Nov 2013 14:45:14 +0100 Subject: [PATCH] output fix --- src/keyprint.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/keyprint.c b/src/keyprint.c index ff42681..bf22177 100644 --- a/src/keyprint.c +++ b/src/keyprint.c @@ -323,10 +323,17 @@ void pcpexport_yaml(char *outfile) { fprintf(out, " type: %s\n", (s->type == PCP_KEY_TYPE_MAINSECRET) ? "primary" : " secret"); fprintf(out, " public: "); pcpprint_bin(out, s->public, 32); fprintf(out, "\n"); - fprintf(out, " secret: "); pcpprint_bin(out, s->secret, 32); fprintf(out, "\n"); + if(s->secret[0] == 0) { + fprintf(out, " encrypted: yes\n"); + fprintf(out, " nonce: "); pcpprint_bin(out, s->nonce, 24); fprintf(out, "\n"); + fprintf(out, " secret: "); pcpprint_bin(out, s->encrypted, 48); fprintf(out, "\n"); + } + else { + fprintf(out, " encrypted: no\n"); + fprintf(out, " secret: "); pcpprint_bin(out, s->secret, 32); fprintf(out, "\n"); + } fprintf(out, " edpub: "); pcpprint_bin(out, s->edpub, 32); fprintf(out, "\n"); - fprintf(out, " nonce: "); pcpprint_bin(out, s->nonce, 24); fprintf(out, "\n"); - fprintf(out, " encrypted: "); pcpprint_bin(out, s->encrypted, 48); fprintf(out, "\n"); + fprintf(out, "\n"); }