WolfSSL
/
wolfssl
mirror of https://github.com/wolfSSL/wolfssl.git
1
0
Fork 0
Code Issues Releases Wiki Activity

make compression more standard, no size prefix, default zlib comp, check verify before overwrite w/ decomp... still needs FIN and ALERT processing

pull/1/head
toddouska 2012-07-23 13:47:30 -07:00
parent 6d3c7d8c59
commit aa164e5266
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/internal.c
View File

@ -239,7 +239,8 @@ static INLINE void ato32(const byte* c, word32* u32)
ssl->c_stream.zfree = (free_func)myFree; ssl->c_stream.zfree = (free_func)myFree;
ssl->c_stream.opaque = (voidpf)ssl->heap; ssl->c_stream.opaque = (voidpf)ssl->heap;
if (deflateInit(&ssl->c_stream, 8) != Z_OK) return ZLIB_INIT_ERROR; if (deflateInit(&ssl->c_stream, Z_DEFAULT_COMPRESSION) != Z_OK)
return ZLIB_INIT_ERROR;
ssl->didStreamInit = 1; ssl->didStreamInit = 1;
@ -268,11 +269,6 @@ static INLINE void ato32(const byte* c, word32* u32)
int err; int err;
int currTotal = ssl->c_stream.total_out; int currTotal = ssl->c_stream.total_out;
/* put size in front of compression */
c16toa((word16)inSz, out);
out += 2;
outSz -= 2;
ssl->c_stream.next_in = in; ssl->c_stream.next_in = in;
ssl->c_stream.avail_in = inSz; ssl->c_stream.avail_in = inSz;
ssl->c_stream.next_out = out; ssl->c_stream.next_out = out;
@ -281,7 +277,7 @@ static INLINE void ato32(const byte* c, word32* u32)
err = deflate(&ssl->c_stream, Z_SYNC_FLUSH); err = deflate(&ssl->c_stream, Z_SYNC_FLUSH);
if (err != Z_OK && err != Z_STREAM_END) return ZLIB_COMPRESS_ERROR; if (err != Z_OK && err != Z_STREAM_END) return ZLIB_COMPRESS_ERROR;
return ssl->c_stream.total_out - currTotal + sizeof(word16); return ssl->c_stream.total_out - currTotal;
} }
@ -290,12 +286,6 @@ static INLINE void ato32(const byte* c, word32* u32)
{ {
int err; int err;
int currTotal = ssl->d_stream.total_out; int currTotal = ssl->d_stream.total_out;
word16 len;
/* find size in front of compression */
ato16(in, &len);
in += 2;
inSz -= 2;
ssl->d_stream.next_in = in; ssl->d_stream.next_in = in;
ssl->d_stream.avail_in = inSz; ssl->d_stream.avail_in = inSz;
@ -2244,11 +2234,6 @@ int DoApplicationData(CYASSL* ssl, byte* input, word32* inOutIdx)
if (padByte) if (padByte)
idx++; idx++;
#ifdef HAVE_LIBZ
if (ssl->options.usingCompression)
XMEMMOVE(rawData, decomp, dataSz);
#endif
/* verify */ /* verify */
if (dataSz) { if (dataSz) {
if (XMEMCMP(mac, verify, digestSz)) { if (XMEMCMP(mac, verify, digestSz)) {
@ -2259,6 +2244,12 @@ int DoApplicationData(CYASSL* ssl, byte* input, word32* inOutIdx)
else else
GetSEQIncrement(ssl, 1); /* even though no data, increment verify */ GetSEQIncrement(ssl, 1); /* even though no data, increment verify */
#ifdef HAVE_LIBZ
/* decompress could be bigger, overwrite after verify */
if (ssl->options.usingCompression)
XMEMMOVE(rawData, decomp, dataSz);
#endif
*inOutIdx = idx; *inOutIdx = idx;
return 0; return 0;
} }