scip/pcp
1
0
Fork 0
mirror of https://codeberg.org/scip/pcp.git synced 2025-12-17 20:00:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed encrypted file header output (fwrite &uint8t isn't the same as fwrite uchar)

Browse Source
This commit is contained in:
TLINDEN
2014-02-02 16:05:38 +01:00
parent 1b1cdecf3f
commit 90fbf2ccd7
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libpcp/crypto.c
View File

@@ -167,7 +167,7 @@ size_t pcp_decrypt_file(FILE *in, FILE* out, pcp_key_t *s, unsigned char *symkey
pcp_pubkey_t *sender = NULL; pcp_pubkey_t *sender = NULL;
int nrec, recmatch; int nrec, recmatch;
uint32_t lenrec; uint32_t lenrec;
uint8_t head; byte head[1];
size_t cur_bufsize, rec_size; size_t cur_bufsize, rec_size;
unsigned char rec_buf[PCP_ASYM_RECIPIENT_SIZE]; unsigned char rec_buf[PCP_ASYM_RECIPIENT_SIZE];
@@ -184,9 +184,9 @@ size_t pcp_decrypt_file(FILE *in, FILE* out, pcp_key_t *s, unsigned char *symkey
} }
else { else {
// step 1, check header // step 1, check header
cur_bufsize = fread(&head, 1, 1, in); cur_bufsize = fread(head, 1, 1, in);
if(cur_bufsize != 1 && !feof(in) && !ferror(in)) { if(cur_bufsize != 1 && !feof(in) && !ferror(in)) {
if(head == PCP_SYM_CIPHER) { if(head[0] == PCP_SYM_CIPHER) {
if(symkey != NULL) if(symkey != NULL)
self = 1; self = 1;
else { else {
@@ -194,7 +194,7 @@ size_t pcp_decrypt_file(FILE *in, FILE* out, pcp_key_t *s, unsigned char *symkey
goto errdef1; goto errdef1;
} }
} }
else if(head == PCP_ASYM_CIPHER) { else if(head[0] == PCP_ASYM_CIPHER) {
self = 0; self = 0;
} }
} }
@@ -269,6 +269,7 @@ size_t pcp_encrypt_file(FILE *in, FILE* out, pcp_key_t *s, pcp_pubkey_t *p, int
int nrec; int nrec;
uint32_t lenrec; uint32_t lenrec;
size_t rec_size, out_size; size_t rec_size, out_size;
byte head[1];
/* /*
6[1]|temp_keypair.pubkey|len(recipients)[4]|(recipients...)|(secretboxes...) 6[1]|temp_keypair.pubkey|len(recipients)[4]|(recipients...)|(secretboxes...)
@@ -300,8 +301,8 @@ size_t pcp_encrypt_file(FILE *in, FILE* out, pcp_key_t *s, pcp_pubkey_t *p, int
} }
// step 1, file header // step 1, file header
uint8_t head = PCP_ASYM_CIPHER; head[0] = PCP_ASYM_CIPHER;
fwrite(&head, 1, 1, out); fwrite(head, 1, 1, out);
//fprintf(stderr, "D: header - 1\n"); //fprintf(stderr, "D: header - 1\n");
if(ferror(out) != 0) { if(ferror(out) != 0) {
fatal("Failed to write encrypted output!\n"); fatal("Failed to write encrypted output!\n");
@@ -374,6 +375,7 @@ size_t pcp_encrypt_file_sym(FILE *in, FILE* out, unsigned char *symkey, int have
size_t es; size_t es;
crypto_generichash_state *st = NULL; crypto_generichash_state *st = NULL;
unsigned char *hash = NULL; unsigned char *hash = NULL;
byte head[1];
if(signkey != NULL) { if(signkey != NULL) {
st = ucmalloc(sizeof(crypto_generichash_state)); st = ucmalloc(sizeof(crypto_generichash_state));
@@ -382,8 +384,8 @@ size_t pcp_encrypt_file_sym(FILE *in, FILE* out, unsigned char *symkey, int have
} }
if(havehead == 0) { if(havehead == 0) {
uint8_t head = PCP_SYM_CIPHER; head[0] = PCP_SYM_CIPHER;
fwrite(&head, 1, 1, out); size_t hs = fwrite(head, 1, 1, out);
if(ferror(out) != 0) { if(ferror(out) != 0) {
fatal("Failed to write encrypted output!\n"); fatal("Failed to write encrypted output!\n");
return 0; return 0;