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

changed padding, dont use a pad counter anymore, just add zeroes and remove them afterwards

Browse Source
This commit is contained in:
TLINDEN
2014-02-08 20:36:05 +01:00
parent b9841bfb06
commit da8f40b596
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
libpcp/z85.c
View File

@@ -1,7 +1,7 @@
/* /*
This file is part of Pretty Curved Privacy (pcp1). This file is part of Pretty Curved Privacy (pcp1).
Copyright (C) 2013 T.Linden. Copyright (C) 2013-2014 T.v.Dein.
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
You can contact me by mail: <tlinden AT cpan DOT org>. You can contact me by mail: <tom AT vondein DOT org>.
*/ */
@@ -26,14 +26,13 @@ unsigned char *pcp_padfour(unsigned char *src, size_t srclen, size_t *dstlen) {
size_t outlen, zerolen; size_t outlen, zerolen;
unsigned char *dst; unsigned char *dst;
outlen = srclen + 1; /* 1 for the pad flag */ outlen = srclen;
while (outlen % 4 != 0) outlen++; while (outlen % 4 != 0) outlen++;
zerolen = outlen - (srclen + 1); zerolen = outlen - srclen;
dst = (unsigned char*)ucmalloc(outlen); dst = (unsigned char*)ucmalloc(outlen);
dst[0] = zerolen; /* add the number of zeros we add */ memcpy(dst, src, srclen); /* add the original */
memcpy(&dst[1], src, srclen); /* add the original */ memset(&dst[srclen], 0, zerolen); /* pad with zeroes */
memset(&dst[srclen+1], 0, zerolen); /* pad with zeroes */
*dstlen = outlen; *dstlen = outlen;
@@ -43,18 +42,19 @@ unsigned char *pcp_padfour(unsigned char *src, size_t srclen, size_t *dstlen) {
unsigned char *pcp_unpadfour(unsigned char *src, size_t srclen, size_t *dstlen) { unsigned char *pcp_unpadfour(unsigned char *src, size_t srclen, size_t *dstlen) {
size_t outlen; size_t outlen;
size_t numzeroes; size_t numzeroes;
unsigned char *dst; size_t i;
numzeroes = src[0]; /* first byte tells us how many zeroes we've got */ outlen = srclen;
outlen = srclen - 1 - numzeroes;
dst = malloc(outlen);
memcpy(dst, &src[1], outlen); for(i=srclen; i>0; --i) {
if(src[i] != '\0') {
outlen = i + 1;
break;
}
}
*dstlen = outlen; *dstlen = outlen;
return src;
return dst;
} }
unsigned char *pcp_z85_decode(char *z85block, size_t *dstlen) { unsigned char *pcp_z85_decode(char *z85block, size_t *dstlen) {
@@ -84,7 +84,6 @@ unsigned char *pcp_z85_decode(char *z85block, size_t *dstlen) {
} }
free(z85); free(z85);
free(bin);
*dstlen = outlen; *dstlen = outlen;
return raw; return raw;