2013-11-04 17:43:22 +01:00
|
|
|
/*
|
|
|
|
|
This file is part of Pretty Curved Privacy (pcp1).
|
|
|
|
|
|
|
|
|
|
Copyright (C) 2013 T.Linden.
|
|
|
|
|
|
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
|
|
|
it under the terms of the GNU General Public License as published by
|
|
|
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
|
|
|
(at your option) any later version.
|
|
|
|
|
|
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
|
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
GNU General Public License for more details.
|
|
|
|
|
|
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
|
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
|
|
|
|
|
|
You can contact me by mail: <tlinden AT cpan DOT org>.
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
2013-10-28 22:50:05 +01:00
|
|
|
#include "crypto.h"
|
|
|
|
|
|
|
|
|
|
size_t pcp_sodium_box(unsigned char **cipher,
|
|
|
|
|
unsigned char *cleartext,
|
|
|
|
|
size_t clearsize,
|
|
|
|
|
unsigned char *nonce,
|
|
|
|
|
unsigned char *secret,
|
2013-11-29 20:01:42 +01:00
|
|
|
unsigned char *pub) {
|
2013-10-28 22:50:05 +01:00
|
|
|
|
|
|
|
|
unsigned char *pad_clear;
|
|
|
|
|
unsigned char *pad_cipher;
|
|
|
|
|
|
2013-11-19 17:17:30 +01:00
|
|
|
size_t ciphersize = (clearsize + crypto_box_ZEROBYTES) - crypto_box_BOXZEROBYTES;
|
2013-10-28 22:50:05 +01:00
|
|
|
|
|
|
|
|
pad_cipher = ucmalloc(crypto_box_ZEROBYTES + clearsize);
|
|
|
|
|
pcp_pad_prepend(&pad_clear, cleartext, crypto_box_ZEROBYTES, clearsize);
|
|
|
|
|
|
|
|
|
|
// crypto_box(c,m,mlen,n,pk,sk);
|
|
|
|
|
crypto_box(pad_cipher, pad_clear,
|
2013-11-29 20:01:42 +01:00
|
|
|
clearsize + crypto_box_ZEROBYTES, nonce, pub, secret);
|
2013-10-28 22:50:05 +01:00
|
|
|
|
|
|
|
|
pcp_pad_remove(cipher, pad_cipher, crypto_secretbox_BOXZEROBYTES, ciphersize);
|
|
|
|
|
|
|
|
|
|
free(pad_clear);
|
|
|
|
|
free(pad_cipher);
|
|
|
|
|
|
|
|
|
|
return ciphersize;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
int pcp_sodium_verify_box(unsigned char **cleartext, unsigned char* message,
|
|
|
|
|
size_t messagesize, unsigned char *nonce,
|
2013-11-29 20:01:42 +01:00
|
|
|
unsigned char *secret, unsigned char *pub) {
|
2013-10-28 22:50:05 +01:00
|
|
|
// verify/decrypt the box
|
|
|
|
|
unsigned char *pad_cipher;
|
|
|
|
|
unsigned char *pad_clear;
|
|
|
|
|
int success = -1;
|
|
|
|
|
|
|
|
|
|
pcp_pad_prepend(&pad_cipher, message, crypto_box_BOXZEROBYTES, messagesize);
|
|
|
|
|
pad_clear = (unsigned char *)ucmalloc((crypto_box_ZEROBYTES+ messagesize));
|
|
|
|
|
|
|
|
|
|
// crypto_box_open(m,c,clen,n,pk,sk);
|
|
|
|
|
if (crypto_box_open(pad_clear, pad_cipher,
|
|
|
|
|
messagesize + crypto_box_BOXZEROBYTES,
|
2013-11-29 20:01:42 +01:00
|
|
|
nonce, pub, secret) == 0) {
|
2013-10-28 22:50:05 +01:00
|
|
|
success = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
pcp_pad_remove(cleartext, pad_clear, crypto_box_ZEROBYTES, messagesize);
|
|
|
|
|
|
|
|
|
|
free(pad_clear);
|
|
|
|
|
free(pad_cipher);
|
|
|
|
|
|
|
|
|
|
return success;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2013-11-29 20:01:42 +01:00
|
|
|
unsigned char *pcp_box_encrypt(pcp_key_t *secret, pcp_pubkey_t *pub,
|
2013-10-28 22:50:05 +01:00
|
|
|
unsigned char *message, size_t messagesize,
|
|
|
|
|
size_t *csize) {
|
|
|
|
|
|
2013-11-24 19:59:55 +01:00
|
|
|
unsigned char *nonce = pcp_gennonce();
|
2013-11-19 21:02:59 +01:00
|
|
|
|
2013-10-28 22:50:05 +01:00
|
|
|
unsigned char *cipher;
|
|
|
|
|
|
|
|
|
|
size_t es = pcp_sodium_box(&cipher, message, messagesize, nonce,
|
2013-11-29 20:01:42 +01:00
|
|
|
secret->secret, pub->pub);
|
2013-10-28 22:50:05 +01:00
|
|
|
|
|
|
|
|
if(es <= messagesize) {
|
|
|
|
|
fatal("failed to encrypt message!\n");
|
|
|
|
|
goto errbec;
|
|
|
|
|
}
|
|
|
|
|
|
2013-11-19 21:02:59 +01:00
|
|
|
// scip
|
2013-11-29 20:01:42 +01:00
|
|
|
//fprintf(stderr, "public: "); pcpprint_bin(stderr, pub->pub, 32); fprintf(stderr, "\n");
|
2013-11-19 21:02:59 +01:00
|
|
|
//fprintf(stderr, "secret: "); pcpprint_bin(stderr, secret->secret, 32); fprintf(stderr, "\n");
|
|
|
|
|
//fprintf(stderr, "cipher: "); pcpprint_bin(stderr, cipher, es); fprintf(stderr, "\n");
|
|
|
|
|
//fprintf(stderr, " nonce: "); pcpprint_bin(stderr, nonce, crypto_secretbox_NONCEBYTES); fprintf(stderr, "\n");
|
|
|
|
|
|
2013-10-28 22:50:05 +01:00
|
|
|
// put nonce and cipher together
|
|
|
|
|
unsigned char *combined = ucmalloc(es + crypto_secretbox_NONCEBYTES);
|
|
|
|
|
memcpy(combined, nonce, crypto_secretbox_NONCEBYTES);
|
|
|
|
|
memcpy(&combined[crypto_secretbox_NONCEBYTES], cipher, es);
|
|
|
|
|
|
|
|
|
|
free(cipher);
|
|
|
|
|
free(nonce);
|
|
|
|
|
|
|
|
|
|
*csize = es + crypto_secretbox_NONCEBYTES;
|
|
|
|
|
|
|
|
|
|
return combined;
|
|
|
|
|
|
|
|
|
|
errbec:
|
|
|
|
|
if(cipher != NULL)
|
|
|
|
|
free(cipher);
|
|
|
|
|
free(nonce);
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2013-11-29 20:01:42 +01:00
|
|
|
unsigned char *pcp_box_decrypt(pcp_key_t *secret, pcp_pubkey_t *pub,
|
2013-10-28 22:50:05 +01:00
|
|
|
unsigned char *cipher, size_t ciphersize,
|
|
|
|
|
size_t *dsize) {
|
|
|
|
|
|
|
|
|
|
unsigned char *message = NULL;
|
|
|
|
|
|
|
|
|
|
unsigned char *nonce = ucmalloc(crypto_secretbox_NONCEBYTES);
|
|
|
|
|
unsigned char *cipheronly = ucmalloc(ciphersize - crypto_secretbox_NONCEBYTES);
|
|
|
|
|
|
|
|
|
|
memcpy(nonce, cipher, crypto_secretbox_NONCEBYTES);
|
|
|
|
|
memcpy(cipheronly, &cipher[crypto_secretbox_NONCEBYTES],
|
|
|
|
|
ciphersize - crypto_secretbox_NONCEBYTES);
|
|
|
|
|
|
|
|
|
|
if(pcp_sodium_verify_box(&message, cipheronly,
|
|
|
|
|
ciphersize - crypto_secretbox_NONCEBYTES,
|
2013-11-29 20:01:42 +01:00
|
|
|
nonce, secret->secret, pub->pub) != 0){
|
2013-10-28 22:50:05 +01:00
|
|
|
fatal("failed to decrypt message!\n");
|
|
|
|
|
goto errbed;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
free(nonce);
|
|
|
|
|
free(cipheronly);
|
|
|
|
|
|
|
|
|
|
// resulting size:
|
|
|
|
|
// ciphersize - crypto_secretbox_ZEROBYTES
|
|
|
|
|
*dsize = ciphersize - crypto_secretbox_ZEROBYTES;
|
|
|
|
|
return message;
|
|
|
|
|
|
|
|
|
|
errbed:
|
|
|
|
|
free(nonce);
|
|
|
|
|
free(cipheronly);
|
|
|
|
|
if(message != NULL)
|
|
|
|
|
free(message);
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
2014-01-20 10:16:05 +01:00
|
|
|
|
|
|
|
|
size_t pcp_decrypt_file(FILE *in, FILE* out, pcp_key_t *s) {
|
|
|
|
|
pcp_pubkey_t *p;
|
|
|
|
|
size_t clen;
|
|
|
|
|
size_t dlen = 0;
|
|
|
|
|
|
|
|
|
|
char *encoded = pcp_readz85file(in);
|
|
|
|
|
if(encoded == NULL)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
unsigned char *combined = pcp_z85_decode((char *)encoded, &clen);
|
|
|
|
|
clen = clen - crypto_secretbox_KEYBYTES;
|
|
|
|
|
|
|
|
|
|
if(combined == NULL)
|
|
|
|
|
goto errdf1;
|
|
|
|
|
|
|
|
|
|
// extract the sender's public key from the cipher
|
|
|
|
|
p = ucmalloc(sizeof(pcp_pubkey_t));
|
|
|
|
|
memcpy(p->pub, combined, crypto_secretbox_KEYBYTES);
|
|
|
|
|
|
|
|
|
|
unsigned char *encrypted = ucmalloc(clen);
|
|
|
|
|
memcpy(encrypted, &combined[crypto_secretbox_KEYBYTES], clen);
|
|
|
|
|
|
|
|
|
|
unsigned char *decrypted = pcp_box_decrypt(s, p,
|
|
|
|
|
encrypted,
|
|
|
|
|
clen, &dlen);
|
|
|
|
|
|
|
|
|
|
if(decrypted == NULL) {
|
|
|
|
|
// maybe self encryption?
|
|
|
|
|
pcp_pubkey_t *mypub = pcpkey_pub_from_secret(s);
|
|
|
|
|
decrypted = pcp_box_decrypt(s, mypub,
|
|
|
|
|
encrypted,
|
|
|
|
|
clen, &dlen);
|
|
|
|
|
free(mypub);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(decrypted != NULL) {
|
|
|
|
|
fatals_reset();
|
|
|
|
|
fwrite(decrypted, dlen, 1, out);
|
|
|
|
|
fclose(out);
|
|
|
|
|
|
|
|
|
|
if(ferror(out) != 0) {
|
|
|
|
|
fatal("Failed to write decrypted output!\n");
|
|
|
|
|
dlen = 0;
|
|
|
|
|
goto errdf2;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
errdf2:
|
|
|
|
|
free(decrypted);
|
|
|
|
|
free(combined);
|
|
|
|
|
free(p);
|
|
|
|
|
|
|
|
|
|
errdf1:
|
|
|
|
|
free(encoded);
|
|
|
|
|
|
|
|
|
|
return dlen;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
size_t pcp_encrypt_file(FILE *in, FILE* out, pcp_key_t *s, pcp_pubkey_t *p, int self) {
|
2014-01-21 16:11:04 +01:00
|
|
|
unsigned char byte[1];
|
|
|
|
|
unsigned char *symkey;
|
|
|
|
|
int recipient_count;
|
|
|
|
|
unsigned char *recipients_cipher;
|
|
|
|
|
pcp_pubkey_t *cur, *t;
|
|
|
|
|
size_t es;
|
|
|
|
|
int nrec;
|
|
|
|
|
uint32_t lenrec;
|
|
|
|
|
size_t blocksize = 32 * 1024;
|
|
|
|
|
size_t cur_bufsize, rec_size, out_size;
|
|
|
|
|
unsigned char in_buf[blocksize];
|
|
|
|
|
unsigned char *buf_nonce;
|
|
|
|
|
unsigned char *buf_cipher;
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
Correct format should be:
|
|
|
|
|
6[1]|temp_keypair.pubkey|len(recipients)[4]|(recipients...)|(secretboxes...)
|
|
|
|
|
where recipients is a concatenated list of
|
|
|
|
|
random_nonce|box(temp_keypair.privkey, recipient crypto pk, random_nonce, packet key)
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
// preparation
|
|
|
|
|
// A, generate sym key
|
|
|
|
|
symkey = urmalloc(crypto_secretbox_KEYBYTES);
|
|
|
|
|
|
|
|
|
|
// B, encrypt it asymetrically for each recipient
|
|
|
|
|
recipient_count = HASH_COUNT(p);
|
|
|
|
|
rec_size = ((crypto_secretbox_KEYBYTES + crypto_box_ZEROBYTES) - crypto_box_BOXZEROBYTES) + crypto_secretbox_NONCEBYTES;
|
|
|
|
|
recipients_cipher = ucmalloc(rec_size * recipient_count);
|
|
|
|
|
nrec = 0;
|
|
|
|
|
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) {
|
|
|
|
|
fatal("invalid rec_size, expected %dl, got %dl\n", rec_size, es);
|
|
|
|
|
if(rec_cipher != NULL)
|
|
|
|
|
free(rec_cipher);
|
|
|
|
|
goto errec1;
|
|
|
|
|
}
|
|
|
|
|
memcpy(&recipients_cipher[nrec * rec_size], rec_cipher, rec_size); // already includes the nonce
|
|
|
|
|
nrec++;
|
|
|
|
|
free(rec_cipher);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// step 1, file header
|
|
|
|
|
uint8_t head = 5; // FIXME: use #define
|
|
|
|
|
fwrite(&head, 1, 1, out);
|
|
|
|
|
fprintf(stderr, "D: header - 1\n");
|
|
|
|
|
if(ferror(out) != 0) {
|
|
|
|
|
fatal("Failed to write encrypted output!\n");
|
|
|
|
|
goto errec1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// step 2, sender's pubkey
|
|
|
|
|
fwrite(s->pub, crypto_box_PUBLICKEYBYTES, 1, out);
|
|
|
|
|
fprintf(stderr, "D: sender pub - %d\n", crypto_box_PUBLICKEYBYTES);
|
|
|
|
|
if(ferror(out) != 0)
|
|
|
|
|
goto errec1;
|
|
|
|
|
|
|
|
|
|
// step 3, len recipients, big endian
|
|
|
|
|
lenrec = recipient_count;
|
|
|
|
|
lenrec = htobe32(lenrec);
|
|
|
|
|
fwrite(&lenrec, 4, 1, out);
|
|
|
|
|
fprintf(stderr, "D: %d recipients - 4\n", recipient_count);
|
|
|
|
|
if(ferror(out) != 0)
|
|
|
|
|
goto errec1;
|
|
|
|
|
|
|
|
|
|
// step 4, recipient list
|
|
|
|
|
fwrite(recipients_cipher, rec_size * recipient_count, 1, out);
|
|
|
|
|
fprintf(stderr, "D: recipients - %d * %d\n", rec_size, recipient_count);
|
|
|
|
|
if(ferror(out) != 0)
|
|
|
|
|
goto errec1;
|
|
|
|
|
|
|
|
|
|
out_size = 5 + (rec_size * recipient_count) + crypto_box_PUBLICKEYBYTES;
|
|
|
|
|
|
|
|
|
|
// step 5, actual encrypted data
|
|
|
|
|
cur_bufsize = 0;
|
|
|
|
|
|
|
|
|
|
while(!feof(in)) {
|
|
|
|
|
cur_bufsize = fread(&in_buf, 1, blocksize, in);
|
|
|
|
|
if(cur_bufsize <= 0)
|
|
|
|
|
break;
|
|
|
|
|
buf_nonce = pcp_gennonce();
|
|
|
|
|
es = pcp_sodium_mac(&buf_cipher, in_buf, cur_bufsize, buf_nonce, symkey);
|
|
|
|
|
fwrite(buf_nonce, crypto_secretbox_NONCEBYTES, 1, out);
|
|
|
|
|
fprintf(stderr, "D: 32k buf nonce - %d\n", crypto_secretbox_NONCEBYTES);
|
|
|
|
|
fwrite(buf_cipher, es, 1, out);
|
|
|
|
|
fprintf(stderr, "D: 32k buf cipher - %d\n", es);
|
|
|
|
|
free(buf_nonce);
|
|
|
|
|
free(buf_cipher);
|
|
|
|
|
out_size += crypto_secretbox_NONCEBYTES + es;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if(ferror(out) != 0) {
|
|
|
|
|
fatal("Failed to write encrypted output!\n");
|
|
|
|
|
goto errec2;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fclose(in);
|
|
|
|
|
fclose(out); // FIXME: check for stdin/stdout
|
|
|
|
|
|
|
|
|
|
return out_size;
|
|
|
|
|
|
|
|
|
|
errec2:
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
errec1:
|
|
|
|
|
memset(symkey, 0, crypto_secretbox_KEYBYTES);
|
|
|
|
|
free(symkey);
|
|
|
|
|
free(recipients_cipher);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
fclose(in);
|
|
|
|
|
fclose(out);
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
size_t OLD_pcp_encrypt_file(FILE *in, FILE* out, pcp_key_t *s, pcp_pubkey_t *p, int self) {
|
2014-01-20 10:16:05 +01:00
|
|
|
unsigned char *input = NULL;
|
|
|
|
|
size_t inputBufSize = 0;
|
|
|
|
|
unsigned char byte[1];
|
|
|
|
|
size_t ciphersize;
|
|
|
|
|
size_t clen = 0;
|
|
|
|
|
size_t zlen = 0;
|
|
|
|
|
unsigned char *cipher;
|
|
|
|
|
unsigned char *combined;
|
|
|
|
|
|
|
|
|
|
while(!feof(in)) {
|
|
|
|
|
if(!fread(&byte, 1, 1, in))
|
|
|
|
|
break;
|
|
|
|
|
unsigned char *tmp = realloc(input, inputBufSize + 1);
|
|
|
|
|
input = tmp;
|
|
|
|
|
memmove(&input[inputBufSize], byte, 1);
|
|
|
|
|
inputBufSize ++;
|
|
|
|
|
}
|
|
|
|
|
fclose(in);
|
|
|
|
|
|
|
|
|
|
if(inputBufSize == 0) {
|
|
|
|
|
fatal("Input file is empty!\n");
|
|
|
|
|
goto erref1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
cipher = pcp_box_encrypt(s, p, input, inputBufSize, &ciphersize);
|
|
|
|
|
if(cipher == NULL)
|
|
|
|
|
goto erref2;
|
|
|
|
|
|
|
|
|
|
clen = ciphersize + crypto_secretbox_KEYBYTES;
|
|
|
|
|
combined = ucmalloc(clen);
|
|
|
|
|
|
|
|
|
|
if(self == 1) {
|
|
|
|
|
unsigned char *fakepub = urmalloc(crypto_secretbox_KEYBYTES);
|
|
|
|
|
memcpy(combined, fakepub, crypto_secretbox_KEYBYTES);
|
|
|
|
|
free(fakepub);
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
memcpy(combined, s->pub, crypto_secretbox_KEYBYTES);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
memcpy(&combined[crypto_secretbox_KEYBYTES], cipher, ciphersize);
|
|
|
|
|
|
|
|
|
|
// combined consists of:
|
|
|
|
|
// our-public-key|nonce|cipher
|
|
|
|
|
char *encoded = pcp_z85_encode(combined, clen, &zlen);
|
|
|
|
|
|
|
|
|
|
if(encoded == NULL)
|
|
|
|
|
goto erref3;
|
|
|
|
|
|
|
|
|
|
fprintf(out, "%s\n%s\n%s\n", PCP_ENFILE_HEADER, encoded, PCP_ENFILE_FOOTER);
|
|
|
|
|
if(ferror(out) != 0) {
|
|
|
|
|
fatal("Failed to write encrypted output!\n");
|
|
|
|
|
inputBufSize = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
fclose(out);
|
|
|
|
|
free(encoded);
|
|
|
|
|
free(combined);
|
|
|
|
|
free(cipher);
|
|
|
|
|
|
|
|
|
|
return inputBufSize;
|
|
|
|
|
|
|
|
|
|
erref3:
|
|
|
|
|
free(combined);
|
|
|
|
|
free(cipher);
|
|
|
|
|
|
|
|
|
|
erref2:
|
|
|
|
|
free(input);
|
|
|
|
|
|
|
|
|
|
erref1:
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|