mirror of
https://codeberg.org/scip/pcp.git
synced 2025-12-17 12:00:56 +01:00
e033df7156
now we padd with zeroes as usual but append 4 bytes to the raw input, the last one indicates the pad count. It's always present, even if no padding occurred (the pad blob will then read 0000). This fixes the issue of earlier versions where trailing zeroes in the original input (between block boundaries) have been removed. Since we now add the pad counter, we know how many zeroes to remove. If the original chunk already ended with zeroes they will left untouched. Re-created all test keys/data to match the change. Also, the pcp_z85_encode() function now haves another flag doblock. If set to 1, the function does the 72 chars per line block creation itself, otherwise it just returns the z85 string without any newlines added. Required by pcpstream class.
145 lines
2.9 KiB
C
145 lines
2.9 KiB
C
/*
|
|
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>.
|
|
*/
|
|
|
|
|
|
#include "z85util.h"
|
|
|
|
int pcpz85_encode(char *infile, char *outfile) {
|
|
FILE *in;
|
|
FILE *out;
|
|
|
|
if(infile == NULL)
|
|
in = stdin;
|
|
else {
|
|
if((in = fopen(infile, "rb")) == NULL) {
|
|
fatal(ptx, "Could not open input file %s\n", infile);
|
|
goto errz1;
|
|
}
|
|
}
|
|
|
|
if(outfile == NULL)
|
|
out = stdout;
|
|
else {
|
|
if((out = fopen(outfile, "wb+")) == NULL) {
|
|
fatal(ptx, "Could not open output file %s\n", outfile);
|
|
goto errz1;
|
|
}
|
|
}
|
|
|
|
byte *input = NULL;
|
|
size_t inputBufSize = 0;
|
|
byte onebyte[1];
|
|
|
|
while(!feof(in)) {
|
|
if(!fread(&onebyte, 1, 1, in))
|
|
break;
|
|
byte *tmp = realloc(input, inputBufSize + 1);
|
|
input = tmp;
|
|
memmove(&input[inputBufSize], onebyte, 1);
|
|
inputBufSize ++;
|
|
}
|
|
fclose(in);
|
|
|
|
if(inputBufSize == 0) {
|
|
fatal(ptx, "Input file is empty!\n");
|
|
goto errz2;
|
|
}
|
|
|
|
size_t zlen;
|
|
char *encoded = pcp_z85_encode(input, inputBufSize, &zlen, 1);
|
|
|
|
if(encoded != NULL) {
|
|
fprintf(out, "%s\n%s\n%s\n", PCP_ZFILE_HEADER, encoded, PCP_ZFILE_FOOTER);
|
|
if(ferror(out) != 0) {
|
|
fatal(ptx, "Failed to write z85 output!\n");
|
|
}
|
|
free(encoded);
|
|
goto errz2;
|
|
}
|
|
|
|
return 0;
|
|
|
|
errz2:
|
|
free(input);
|
|
|
|
errz1:
|
|
return 1;
|
|
}
|
|
|
|
|
|
|
|
|
|
int pcpz85_decode(char *infile, char *outfile) {
|
|
FILE *in;
|
|
FILE *out;
|
|
|
|
if(infile == NULL)
|
|
in = stdin;
|
|
else {
|
|
if((in = fopen(infile, "rb")) == NULL) {
|
|
fatal(ptx, "Could not open input file %s\n", infile);
|
|
goto errdz1;
|
|
}
|
|
}
|
|
|
|
if(outfile == NULL)
|
|
out = stdout;
|
|
else {
|
|
if((out = fopen(outfile, "wb+")) == NULL) {
|
|
fatal(ptx, "Could not open output file %s\n", outfile);
|
|
goto errdz1;
|
|
}
|
|
}
|
|
|
|
char *encoded = pcp_readz85file(ptx, in);
|
|
|
|
if(encoded == NULL)
|
|
goto errdz1;
|
|
|
|
size_t clen;
|
|
byte *decoded = pcp_z85_decode(ptx, encoded, &clen);
|
|
|
|
|
|
|
|
if(decoded == NULL)
|
|
goto errdz2;
|
|
|
|
fwrite(decoded, clen, 1, out);
|
|
fclose(out);
|
|
if(ferror(out) != 0) {
|
|
fatal(ptx, "Failed to write decoded output!\n");
|
|
goto errdz3;
|
|
}
|
|
|
|
free(encoded);
|
|
free(decoded);
|
|
return 0;
|
|
|
|
errdz3:
|
|
free(decoded);
|
|
|
|
errdz2:
|
|
free(encoded);
|
|
|
|
errdz1:
|
|
return 1;
|
|
}
|