feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

add DTLS support for alignment

Browse Source
This commit is contained in:
toddouska
2013-03-27 16:58:27 -07:00
parent 3db8935093
commit f396de1191
2 changed files with 43 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cyassl/ctaocrypt/settings.h
View File

@ -472,23 +472,23 @@
/* stream ciphers except arc4 need 32bit alignment, intel ok without */ /* stream ciphers except arc4 need 32bit alignment, intel ok without */
#ifndef XSTREAM_ALIGNMENT
#if defined(__x86_64__) || defined(__ia64__) || defined(__i386__) #if defined(__x86_64__) || defined(__ia64__) || defined(__i386__)
#define NO_XSTREAM_ALIGNMENT #define NO_XSTREAM_ALIGNMENT
#else #else
#define XSTREAM_ALIGNMENT #define XSTREAM_ALIGNMENT
#endif #endif
#endif
/* if using hardware crypto and have alignment requirements, specify the /* if using hardware crypto and have alignment requirements, specify the
requirement here. The record header of SSL/TLS will prvent easy alignment. requirement here. The record header of SSL/TLS will prvent easy alignment.
This hint tries to help as much as possible. Needs to be bigger than This hint tries to help as much as possible. */
record header sz (5) if not 0 */
#ifndef CYASSL_GENERAL_ALIGNMENT #ifndef CYASSL_GENERAL_ALIGNMENT
#ifdef CYASSL_AESNI #ifdef CYASSL_AESNI
#define CYASSL_GENERAL_ALIGNMENT 16 #define CYASSL_GENERAL_ALIGNMENT 16
#elif defined(XSTREAM_ALIGNMENT) #elif defined(XSTREAM_ALIGNMENT)
#define CYASSL_GENERAL_ALIGNMENT 8 #define CYASSL_GENERAL_ALIGNMENT 4
#else #else
#define CYASSL_GENERAL_ALIGNMENT 0 #define CYASSL_GENERAL_ALIGNMENT 0
#endif #endif

44
src/internal.c
View File

@ -2315,10 +2315,12 @@ void ShrinkInputBuffer(CYASSL* ssl, int forcedFree)
ssl->buffers.inputBuffer.buffer + ssl->buffers.inputBuffer.idx, ssl->buffers.inputBuffer.buffer + ssl->buffers.inputBuffer.idx,
usedLength); usedLength);
XFREE(ssl->buffers.inputBuffer.buffer, ssl->heap, DYNAMIC_TYPE_IN_BUFFER); XFREE(ssl->buffers.inputBuffer.buffer - ssl->buffers.inputBuffer.offset,
ssl->heap, DYNAMIC_TYPE_IN_BUFFER);
ssl->buffers.inputBuffer.buffer = ssl->buffers.inputBuffer.staticBuffer; ssl->buffers.inputBuffer.buffer = ssl->buffers.inputBuffer.staticBuffer;
ssl->buffers.inputBuffer.bufferSize = STATIC_BUFFER_LEN; ssl->buffers.inputBuffer.bufferSize = STATIC_BUFFER_LEN;
ssl->buffers.inputBuffer.dynamicFlag = 0; ssl->buffers.inputBuffer.dynamicFlag = 0;
ssl->buffers.inputBuffer.offset = 0;
ssl->buffers.inputBuffer.idx = 0; ssl->buffers.inputBuffer.idx = 0;
ssl->buffers.inputBuffer.length = usedLength; ssl->buffers.inputBuffer.length = usedLength;
} }
@ -2392,14 +2394,16 @@ int SendBuffered(CYASSL* ssl)
static INLINE int GrowOutputBuffer(CYASSL* ssl, int size) static INLINE int GrowOutputBuffer(CYASSL* ssl, int size)
{ {
byte* tmp; byte* tmp;
byte hdrSz = ssl->options.dtls ? DTLS_RECORD_HEADER_SZ :
RECORD_HEADER_SZ;
byte align = CYASSL_GENERAL_ALIGNMENT; byte align = CYASSL_GENERAL_ALIGNMENT;
/* the encrypted data will be offset from the front of the buffer by /* the encrypted data will be offset from the front of the buffer by
the record header, if the user wants encrypted alignment they need the header, if the user wants encrypted alignment they need
to define their alignment requirement */ to define their alignment requirement */
if (align && align < RECORD_HEADER_SZ) { if (align) {
CYASSL_MSG("CyaSSL alignment requirement is too small"); while (align < hdrSz)
return BAD_ALIGN_E; align *= 2;
} }
tmp = (byte*) XMALLOC(size + ssl->buffers.outputBuffer.length + align, tmp = (byte*) XMALLOC(size + ssl->buffers.outputBuffer.length + align,
@ -2408,18 +2412,19 @@ static INLINE int GrowOutputBuffer(CYASSL* ssl, int size)
if (!tmp) return MEMORY_E; if (!tmp) return MEMORY_E;
if (align) if (align)
tmp += align - RECORD_HEADER_SZ; tmp += align - hdrSz;
if (ssl->buffers.outputBuffer.length) if (ssl->buffers.outputBuffer.length)
XMEMCPY(tmp, ssl->buffers.outputBuffer.buffer, XMEMCPY(tmp, ssl->buffers.outputBuffer.buffer,
ssl->buffers.outputBuffer.length); ssl->buffers.outputBuffer.length);
if (ssl->buffers.outputBuffer.dynamicFlag) if (ssl->buffers.outputBuffer.dynamicFlag)
XFREE(ssl->buffers.outputBuffer.buffer, ssl->heap, XFREE(ssl->buffers.outputBuffer.buffer -
ssl->buffers.outputBuffer.offset, ssl->heap,
DYNAMIC_TYPE_OUT_BUFFER); DYNAMIC_TYPE_OUT_BUFFER);
ssl->buffers.outputBuffer.dynamicFlag = 1; ssl->buffers.outputBuffer.dynamicFlag = 1;
if (align) if (align)
ssl->buffers.outputBuffer.offset = align - RECORD_HEADER_SZ; ssl->buffers.outputBuffer.offset = align - hdrSz;
else else
ssl->buffers.outputBuffer.offset = 0; ssl->buffers.outputBuffer.offset = 0;
ssl->buffers.outputBuffer.buffer = tmp; ssl->buffers.outputBuffer.buffer = tmp;
@ -2432,20 +2437,39 @@ static INLINE int GrowOutputBuffer(CYASSL* ssl, int size)
/* Grow the input buffer, should only be to read cert or big app data */ /* Grow the input buffer, should only be to read cert or big app data */
int GrowInputBuffer(CYASSL* ssl, int size, int usedLength) int GrowInputBuffer(CYASSL* ssl, int size, int usedLength)
{ {
byte* tmp = (byte*) XMALLOC(size + usedLength, ssl->heap, byte* tmp;
byte hdrSz = DTLS_RECORD_HEADER_SZ;
byte align = ssl->options.dtls ? CYASSL_GENERAL_ALIGNMENT : 0;
/* the encrypted data will be offset from the front of the buffer by
the dtls record header, if the user wants encrypted alignment they need
to define their alignment requirement. in tls we read record header
to get size of record and put actual data back at front, so don't need */
if (align) {
while (align < hdrSz)
align *= 2;
}
tmp = (byte*) XMALLOC(size + usedLength + align, ssl->heap,
DYNAMIC_TYPE_IN_BUFFER); DYNAMIC_TYPE_IN_BUFFER);
CYASSL_MSG("growing input buffer\n"); CYASSL_MSG("growing input buffer\n");
if (!tmp) return MEMORY_E; if (!tmp) return MEMORY_E;
if (align)
tmp += align - hdrSz;
if (usedLength) if (usedLength)
XMEMCPY(tmp, ssl->buffers.inputBuffer.buffer + XMEMCPY(tmp, ssl->buffers.inputBuffer.buffer +
ssl->buffers.inputBuffer.idx, usedLength); ssl->buffers.inputBuffer.idx, usedLength);
if (ssl->buffers.inputBuffer.dynamicFlag) if (ssl->buffers.inputBuffer.dynamicFlag)
XFREE(ssl->buffers.inputBuffer.buffer,ssl->heap,DYNAMIC_TYPE_IN_BUFFER); XFREE(ssl->buffers.inputBuffer.buffer - ssl->buffers.inputBuffer.offset,
ssl->heap,DYNAMIC_TYPE_IN_BUFFER);
ssl->buffers.inputBuffer.dynamicFlag = 1; ssl->buffers.inputBuffer.dynamicFlag = 1;
if (align)
ssl->buffers.inputBuffer.offset = align - hdrSz;
else
ssl->buffers.inputBuffer.offset = 0;
ssl->buffers.inputBuffer.buffer = tmp; ssl->buffers.inputBuffer.buffer = tmp;
ssl->buffers.inputBuffer.bufferSize = size + usedLength; ssl->buffers.inputBuffer.bufferSize = size + usedLength;
ssl->buffers.inputBuffer.idx = 0; ssl->buffers.inputBuffer.idx = 0;