From db47cbd95a267ae019a37f2079adf9e72e8fe1b3 Mon Sep 17 00:00:00 2001
From: TLINDEN <git@daemon.de>
Date: Thu, 13 Feb 2014 20:21:32 +0100
Subject: [PATCH] fixed pbp encryption fix, no more size field in reclist

---
 libpcp/crypto.c | 36 +++++++++++++++---------------------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/libpcp/crypto.c b/libpcp/crypto.c
index 044094c..1cbd7a7 100644
--- a/libpcp/crypto.c
+++ b/libpcp/crypto.c
@@ -171,7 +171,7 @@ size_t pcp_decrypt_file(FILE *in, FILE* out, pcp_key_t *s, unsigned char *symkey
   byte head[1];
   size_t cur_bufsize, rec_size;
   
-  unsigned char rec_buf[PCP_ASYM_RECIPIENT_RSIZE];
+  unsigned char rec_buf[PCP_ASYM_RECIPIENT_SIZE];
 
 #ifdef PCP_ASYM_ADD_SENDER_PUB
   unsigned char *senderpub;
@@ -224,27 +224,23 @@ size_t pcp_decrypt_file(FILE *in, FILE* out, pcp_key_t *s, unsigned char *symkey
   lenrec = be32toh(lenrec);
   
   if(verify) {
-    reccipher = ucmalloc(lenrec * PCP_ASYM_RECIPIENT_RSIZE);
+    reccipher = ucmalloc(lenrec * PCP_ASYM_RECIPIENT_SIZE);
   }
 
 
 
   /*  step 4, fetch recipient list and try to decrypt it for us */
-  unsigned char *recip = ucmalloc(PCP_ASYM_RECIPIENT_SIZE);
   for(nrec=0; nrec<lenrec; nrec++) {
-    cur_bufsize = fread(&rec_buf, 1, PCP_ASYM_RECIPIENT_RSIZE, in);
-    if(cur_bufsize != PCP_ASYM_RECIPIENT_RSIZE && !feof(in) && !ferror(in)) {
+    cur_bufsize = fread(&rec_buf, 1, PCP_ASYM_RECIPIENT_SIZE, in);
+    if(cur_bufsize != PCP_ASYM_RECIPIENT_SIZE && !feof(in) && !ferror(in)) {
       fatal("Error: input file corrupted, incomplete or no recipients\n");
       goto errdef1;
     }
     recmatch = 0;
 
-    memcpy(recip, rec_buf, crypto_secretbox_NONCEBYTES);
-    memcpy(&recip[crypto_secretbox_NONCEBYTES], &rec_buf[crypto_secretbox_NONCEBYTES + 1], PCP_ASYM_RECIPIENT_SIZE - crypto_secretbox_NONCEBYTES);
-
     pcphash_iteratepub(cur) {
       unsigned char *recipient;
-      recipient = pcp_box_decrypt(s, cur, recip, PCP_ASYM_RECIPIENT_SIZE, &rec_size);
+      recipient = pcp_box_decrypt(s, cur, rec_buf, PCP_ASYM_RECIPIENT_SIZE, &rec_size);
       if(recipient != NULL && rec_size == crypto_secretbox_KEYBYTES) {
 	/*  found a match */
 	recmatch = 1;
@@ -256,10 +252,12 @@ size_t pcp_decrypt_file(FILE *in, FILE* out, pcp_key_t *s, unsigned char *symkey
       }
     }
     if(verify) {
-      memcpy(&reccipher[nrec * PCP_ASYM_RECIPIENT_RSIZE], rec_buf, PCP_ASYM_RECIPIENT_RSIZE);
+      size_t R = nrec * (PCP_ASYM_RECIPIENT_SIZE);
+      memcpy(&reccipher[R], rec_buf, PCP_ASYM_RECIPIENT_SIZE);
     }
   }
   
+
   if(recmatch == 0) {
     fatal("Sorry, there's no matching public key in your vault for decryption\n");
     goto errdef1;
@@ -268,7 +266,7 @@ size_t pcp_decrypt_file(FILE *in, FILE* out, pcp_key_t *s, unsigned char *symkey
   
   /*  step 5, actually decrypt the file, finally */
   if(verify) {
-    pcp_rec_t *rec = pcp_rec_new(reccipher, nrec * (PCP_ASYM_RECIPIENT_SIZE + 1), NULL, cur);
+    pcp_rec_t *rec = pcp_rec_new(reccipher, nrec * PCP_ASYM_RECIPIENT_SIZE, NULL, cur);
     return pcp_decrypt_file_sym(in, out, symkey, rec);
     pcp_rec_free(rec);
   }
@@ -304,7 +302,7 @@ size_t pcp_encrypt_file(FILE *in, FILE* out, pcp_key_t *s, pcp_pubkey_t *p, int
 
   /*  B, encrypt it asymetrically for each recipient */
   recipient_count = HASH_COUNT(p);
-  rec_size = PCP_ASYM_RECIPIENT_SIZE + 1;
+  rec_size = PCP_ASYM_RECIPIENT_SIZE;
   rs[0] = PCP_ASYM_RECIPIENT_SIZE - crypto_secretbox_NONCEBYTES;
   recipients_cipher = ucmalloc(rec_size * recipient_count);
   nrec = 0;
@@ -312,20 +310,15 @@ size_t pcp_encrypt_file(FILE *in, FILE* out, pcp_key_t *s, pcp_pubkey_t *p, int
   HASH_ITER(hh, p, cur, t) {
     unsigned char *rec_cipher;
     rec_cipher = pcp_box_encrypt(s, cur, symkey, crypto_secretbox_KEYBYTES, &es);
-    if(es != rec_size - 1) {
-      fatal("invalid rec_size, expected %dl, got %dl\n", rec_size - 1, es);
+    if(es != rec_size) {
+      fatal("invalid rec_size, expected %dl, got %dl\n", rec_size, es);
       if(rec_cipher != NULL)
 	free(rec_cipher);
       goto errec1;
     }
 
-    /* so we need to put out the reclist in pbp form which has
-       a byte between the nonce and the cipher, for whatever reason */
-    memcpy(&recipients_cipher[nrec * rec_size], rec_cipher, crypto_secretbox_NONCEBYTES);
-    memcpy(&recipients_cipher[(nrec * rec_size) + crypto_secretbox_NONCEBYTES], rs, 1);
-    memcpy(&recipients_cipher[(nrec * rec_size) + crypto_secretbox_NONCEBYTES + 1],
-	   &rec_cipher[crypto_secretbox_NONCEBYTES], rec_size - 1 - crypto_secretbox_NONCEBYTES);
-    
+    /* put it into the recipient list, already includes the nonce */
+    memcpy(&recipients_cipher[nrec * rec_size], rec_cipher, rec_size);    
     nrec++;
     free(rec_cipher);
   }
@@ -601,6 +594,7 @@ size_t pcp_decrypt_file_sym(FILE *in, FILE* out, unsigned char *symkey, pcp_rec_
   if(recverify != NULL) {
     /* decrypt the signature */
     memcpy(buf_nonce, signature_cr, crypto_secretbox_NONCEBYTES);
+
     es = pcp_sodium_verify_mac(&signature, &signature_cr[crypto_secretbox_NONCEBYTES],
 			       siglen_cr - crypto_secretbox_NONCEBYTES, buf_nonce, symkey);
     if(es == 0) {