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

Merge branch 'master' into ti

Browse Source
This commit is contained in:
toddouska
2014-06-26 08:57:35 -06:00
parent 16d64104db 9339d7d5b1
commit f2de04ae46
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cyassl/internal.h
View File

@ -1184,6 +1184,7 @@ typedef struct TLSX {
CYASSL_LOCAL TLSX* TLSX_Find(TLSX* list, TLSX_Type type); CYASSL_LOCAL TLSX* TLSX_Find(TLSX* list, TLSX_Type type);
CYASSL_LOCAL void TLSX_FreeAll(TLSX* list); CYASSL_LOCAL void TLSX_FreeAll(TLSX* list);
CYASSL_LOCAL int TLSX_SupportExtensions(CYASSL* ssl);
#ifndef NO_CYASSL_CLIENT #ifndef NO_CYASSL_CLIENT
CYASSL_LOCAL word16 TLSX_GetRequestSize(CYASSL* ssl); CYASSL_LOCAL word16 TLSX_GetRequestSize(CYASSL* ssl);

7
src/internal.c
View File

@ -7948,7 +7948,7 @@ static void PickHashSigAlgo(CYASSL* ssl,
/* tls extensions */ /* tls extensions */
if ( (i - begin) < helloSz) { if ( (i - begin) < helloSz) {
#ifdef HAVE_TLS_EXTENSIONS #ifdef HAVE_TLS_EXTENSIONS
if (IsTLS(ssl)) { if (TLSX_SupportExtensions(ssl)) {
int ret = 0; int ret = 0;
word16 totalExtSz; word16 totalExtSz;
Suites clSuites; /* just for compatibility right now */ Suites clSuites; /* just for compatibility right now */
@ -9285,8 +9285,7 @@ static void PickHashSigAlgo(CYASSL* ssl,
/* last, extensions */ /* last, extensions */
#ifdef HAVE_TLS_EXTENSIONS #ifdef HAVE_TLS_EXTENSIONS
if (IsTLS(ssl)) TLSX_WriteResponse(ssl, output + idx);
TLSX_WriteResponse(ssl, output + idx);
#endif #endif
ssl->buffers.outputBuffer.length += sendSz; ssl->buffers.outputBuffer.length += sendSz;
@ -11086,7 +11085,7 @@ static void PickHashSigAlgo(CYASSL* ssl,
/* tls extensions */ /* tls extensions */
if ((i - begin) < helloSz) { if ((i - begin) < helloSz) {
#ifdef HAVE_TLS_EXTENSIONS #ifdef HAVE_TLS_EXTENSIONS
if (IsTLS(ssl)) { if (TLSX_SupportExtensions(ssl)) {
int ret = 0; int ret = 0;
#else #else
if (IsAtLeastTLSv1_2(ssl)) { if (IsAtLeastTLSv1_2(ssl)) {

18
src/tls.c
View File

@ -1214,8 +1214,8 @@ static int TLSX_THM_Parse(CYASSL* ssl, byte* input, word16 length,
#ifdef HAVE_SUPPORTED_CURVES #ifdef HAVE_SUPPORTED_CURVES
#ifndef HAVE_ECC #ifndef HAVE_ECC
#error "Elliptic Curves Extension requires Elliptic Curve Cryptography. \ #error Elliptic Curves Extension requires Elliptic Curve Cryptography. \
Use --enable-ecc in the configure script or define HAVE_ECC." Use --enable-ecc in the configure script or define HAVE_ECC.
#endif #endif
static void TLSX_EllipticCurve_FreeAll(EllipticCurve* list) static void TLSX_EllipticCurve_FreeAll(EllipticCurve* list)
@ -1536,6 +1536,10 @@ void TLSX_FreeAll(TLSX* list)
} }
} }
int TLSX_SupportExtensions(CYASSL* ssl) {
return ssl && (IsTLS(ssl) || ssl->version.major == DTLS_MAJOR);
}
static word16 TLSX_GetSize(TLSX* list, byte* semaphore, byte isRequest) static word16 TLSX_GetSize(TLSX* list, byte* semaphore, byte isRequest)
{ {
TLSX* extension; TLSX* extension;
@ -1635,7 +1639,7 @@ word16 TLSX_GetRequestSize(CYASSL* ssl)
{ {
word16 length = 0; word16 length = 0;
if (ssl && IsTLS(ssl)) { if (TLSX_SupportExtensions(ssl)) {
byte semaphore[16] = {0}; byte semaphore[16] = {0};
EC_VALIDATE_REQUEST(ssl, semaphore); EC_VALIDATE_REQUEST(ssl, semaphore);
@ -1660,7 +1664,7 @@ word16 TLSX_WriteRequest(CYASSL* ssl, byte* output)
{ {
word16 offset = 0; word16 offset = 0;
if (ssl && IsTLS(ssl) && output) { if (TLSX_SupportExtensions(ssl) && output) {
byte semaphore[16] = {0}; byte semaphore[16] = {0};
offset += OPAQUE16_LEN; /* extensions length */ offset += OPAQUE16_LEN; /* extensions length */
@ -1711,7 +1715,7 @@ word16 TLSX_GetResponseSize(CYASSL* ssl)
word16 length = 0; word16 length = 0;
byte semaphore[16] = {0}; byte semaphore[16] = {0};
if (ssl && IsTLS(ssl)) if (TLSX_SupportExtensions(ssl))
length += TLSX_GetSize(ssl->extensions, semaphore, 0); length += TLSX_GetSize(ssl->extensions, semaphore, 0);
/* All the response data is set at the ssl object only, so no ctx here. */ /* All the response data is set at the ssl object only, so no ctx here. */
@ -1726,7 +1730,7 @@ word16 TLSX_WriteResponse(CYASSL *ssl, byte* output)
{ {
word16 offset = 0; word16 offset = 0;
if (ssl && IsTLS(ssl) && output) { if (TLSX_SupportExtensions(ssl) && output) {
byte semaphore[16] = {0}; byte semaphore[16] = {0};
offset += OPAQUE16_LEN; /* extensions length */ offset += OPAQUE16_LEN; /* extensions length */
@ -1829,7 +1833,7 @@ int TLSX_Parse(CYASSL* ssl, byte* input, word16 length, byte isRequest,
|| defined(HAVE_TRUNCATED_HMAC) \ || defined(HAVE_TRUNCATED_HMAC) \
|| defined(HAVE_SUPPORTED_CURVES) || defined(HAVE_SUPPORTED_CURVES)
#error "Using TLS extensions requires HAVE_TLS_EXTENSIONS to be defined." #error Using TLS extensions requires HAVE_TLS_EXTENSIONS to be defined.
#endif /* HAVE_TLS_EXTENSIONS */ #endif /* HAVE_TLS_EXTENSIONS */