From 79dc73d8375653dce4f82f9de2296a9e2dd15ecd Mon Sep 17 00:00:00 2001 From: "git@daemon.de" Date: Mon, 11 Nov 2013 08:24:05 +0100 Subject: [PATCH] fixed use of derived key in signatures --- src/keyprint.c | 2 +- src/signature.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/keyprint.c b/src/keyprint.c index aacd66c..be84c10 100644 --- a/src/keyprint.c +++ b/src/keyprint.c @@ -207,7 +207,7 @@ void pcp_dumpkey(pcp_key_t *k) { printf("\n"); printf("encrypted: "); - for ( i = 0;i < 48;++i) printf("%02x",(unsigned int) k->encrypted[i]); + for ( i = 0;i < 80;++i) printf("%02x",(unsigned int) k->encrypted[i]); printf("\n"); printf(" owner: %s\n", k->owner); diff --git a/src/signature.c b/src/signature.c index e13dc97..bec0073 100644 --- a/src/signature.c +++ b/src/signature.c @@ -34,9 +34,7 @@ int pcpsign(char *infile, char *outfile, char *recipient, char *passwd) { goto errs1; } - if(recipient != NULL) { - secret = pcp_derive_pcpkey(secret, recipient); - } + if(infile == NULL) in = stdin; @@ -73,6 +71,10 @@ int pcpsign(char *infile, char *outfile, char *recipient, char *passwd) { goto errs3; } + if(recipient != NULL) { + secret = pcp_derive_pcpkey(secret, recipient); + } + unsigned char *input = NULL; size_t inputBufSize = 0; unsigned char byte[1];