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

Merge branch 'master' of github.com:cyassl/cyassl

Browse Source
This commit is contained in:
John Safranek
2014-10-16 22:01:55 -07:00
parent b2f25cd91c c2ade678e1
commit 60790ee4ae
9 changed files with 79 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
README
View File

@ -34,10 +34,11 @@ before calling SSL_new(); Though it's not recommended.
*** end Notes *** *** end Notes ***
CyaSSL intermediate Release 3.2.1c (9/30/2014) CyaSSL intermediate Release 3.2.2 (10/13/2014)
- Small stack improvements for at TLS/SSL layer - Small stack improvements for at TLS/SSL layer
- Adds client side Secure Renegotiation, * not recommended * - Adds client side Secure Renegotiation, * not recommended *
- Client side session ticket support, not fully tested with Secure Renegotiation
The CyaSSL manual is available at: The CyaSSL manual is available at:
http://www.wolfssl.com/documentation/CyaSSL-Manual.pdf. For build instructions http://www.wolfssl.com/documentation/CyaSSL-Manual.pdf. For build instructions

2
configure.ac
View File

@ -6,7 +6,7 @@
# #
# #
AC_INIT([cyassl],[3.2.1c],[https://github.com/cyassl/cyassl/issues],[cyassl],[http://www.wolfssl.com]) AC_INIT([cyassl],[3.2.2],[https://github.com/cyassl/cyassl/issues],[cyassl],[http://www.wolfssl.com])
AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_AUX_DIR([build-aux])

5
ctaocrypt/src/asn.c
View File

@ -424,6 +424,8 @@ CYASSL_LOCAL int GetLength(const byte* input, word32* inOutIdx, int* len,
word32 i = *inOutIdx; word32 i = *inOutIdx;
byte b; byte b;
*len = 0; /* default length */
if ( (i+1) > maxIdx) { /* for first read */ if ( (i+1) > maxIdx) { /* for first read */
CYASSL_MSG("GetLength bad index on input"); CYASSL_MSG("GetLength bad index on input");
return BUFFER_E; return BUFFER_E;
@ -452,7 +454,8 @@ CYASSL_LOCAL int GetLength(const byte* input, word32* inOutIdx, int* len,
} }
*inOutIdx = i; *inOutIdx = i;
*len = length; if (length > 0)
*len = length;
return length; return length;
} }

11
cyassl/error-ssl.h
View File

@ -119,16 +119,19 @@ enum CyaSSL_ErrorCodes {
EXTKEYUSE_AUTH_E = -386, /* ExtKeyUse server|client_auth */ EXTKEYUSE_AUTH_E = -386, /* ExtKeyUse server|client_auth */
SEND_OOB_READ_E = -387, /* Send Cb out of bounds read */ SEND_OOB_READ_E = -387, /* Send Cb out of bounds read */
SECURE_RENEGOTIATION_E = -388, /* Invalid Renegotiation Info */ SECURE_RENEGOTIATION_E = -388, /* Invalid Renegotiation Info */
SESSION_TICKET_LEN_E = -389, /* Session Ticket too large */
SESSION_TICKET_EXPECT_E = -390, /* Session Ticket missing */
SCR_DIFFERENT_CERT_E = -391, /* SCR Different cert error */
/* add strings to SetErrorString !!!!! */ /* add strings to SetErrorString !!!!! */
/* begin negotiation parameter errors */ /* begin negotiation parameter errors */
UNSUPPORTED_SUITE = -390, /* unsupported cipher suite */ UNSUPPORTED_SUITE = -500, /* unsupported cipher suite */
MATCH_SUITE_ERROR = -391, /* can't match cipher suite */ MATCH_SUITE_ERROR = -501, /* can't match cipher suite */
/* end negotiation parameter errors only 10 for now */ /* end negotiation parameter errors only 10 for now */
/* add strings to SetErrorString !!!!! */ /* add strings to SetErrorString !!!!! */
SESSION_TICKET_LEN_E = -392, /* Session Ticket too large */ /* no error stings go down here, add above negotiation errors !!!! */
SESSION_TICKET_EXPECT_E = -393 /* Session Ticket missing */
}; };

5
cyassl/internal.h
View File

@ -649,7 +649,7 @@ enum Misc {
MAX_COMP_EXTRA = 1024, /* max compression extra */ MAX_COMP_EXTRA = 1024, /* max compression extra */
MAX_MTU = 1500, /* max expected MTU */ MAX_MTU = 1500, /* max expected MTU */
MAX_UDP_SIZE = 8192 - 100, /* was MAX_MTU - 100 */ MAX_UDP_SIZE = 8192 - 100, /* was MAX_MTU - 100 */
MAX_DH_SZ = 612, /* 2240 p, pub, g + 2 byte size for each */ MAX_DH_SZ = 1036, /* 4096 p, pub, g + 2 byte size for each */
MAX_STR_VERSION = 8, /* string rep of protocol version */ MAX_STR_VERSION = 8, /* string rep of protocol version */
PAD_MD5 = 48, /* pad length for finished */ PAD_MD5 = 48, /* pad length for finished */
@ -1352,6 +1352,7 @@ typedef struct SecureRenegotiation {
enum key_cache_state cache_status; /* track key cache state */ enum key_cache_state cache_status; /* track key cache state */
byte client_verify_data[TLS_FINISHED_SZ]; /* cached */ byte client_verify_data[TLS_FINISHED_SZ]; /* cached */
byte server_verify_data[TLS_FINISHED_SZ]; /* cached */ byte server_verify_data[TLS_FINISHED_SZ]; /* cached */
byte subject_hash[SHA_DIGEST_SIZE]; /* peer cert hash */
Keys tmp_keys; /* can't overwrite real keys yet */ Keys tmp_keys; /* can't overwrite real keys yet */
} SecureRenegotiation; } SecureRenegotiation;
@ -1644,6 +1645,7 @@ struct CYASSL_X509_CHAIN {
/* CyaSSL session type */ /* CyaSSL session type */
struct CYASSL_SESSION { struct CYASSL_SESSION {
byte sessionID[ID_LEN]; /* id for protocol */ byte sessionID[ID_LEN]; /* id for protocol */
byte sessionIDSz;
byte masterSecret[SECRET_LEN]; /* stored secret */ byte masterSecret[SECRET_LEN]; /* stored secret */
word32 bornOn; /* create time in seconds */ word32 bornOn; /* create time in seconds */
word32 timeout; /* timeout in seconds */ word32 timeout; /* timeout in seconds */
@ -1803,6 +1805,7 @@ typedef struct Arrays {
byte clientRandom[RAN_LEN]; byte clientRandom[RAN_LEN];
byte serverRandom[RAN_LEN]; byte serverRandom[RAN_LEN];
byte sessionID[ID_LEN]; byte sessionID[ID_LEN];
byte sessionIDSz;
byte preMasterSecret[ENCRYPT_LEN]; byte preMasterSecret[ENCRYPT_LEN];
byte masterSecret[SECRET_LEN]; byte masterSecret[SECRET_LEN];
#ifdef CYASSL_DTLS #ifdef CYASSL_DTLS

4
cyassl/version.h
View File

@ -26,8 +26,8 @@
extern "C" { extern "C" {
#endif #endif
#define LIBCYASSL_VERSION_STRING "3.2.1c" #define LIBCYASSL_VERSION_STRING "3.2.2"
#define LIBCYASSL_VERSION_HEX 0x03002001 #define LIBCYASSL_VERSION_HEX 0x03002002
#ifdef __cplusplus #ifdef __cplusplus
} }

64
src/internal.c
View File

@ -1806,7 +1806,7 @@ int InitSSL(CYASSL* ssl, CYASSL_CTX* ctx)
/* arrays */ /* arrays */
ssl->arrays = (Arrays*)XMALLOC(sizeof(Arrays), ssl->heap, ssl->arrays = (Arrays*)XMALLOC(sizeof(Arrays), ssl->heap,
DYNAMIC_TYPE_ARRAYS); DYNAMIC_TYPE_ARRAYS);
if (ssl->arrays == NULL) { if (ssl->arrays == NULL) {
CYASSL_MSG("Arrays Memory error"); CYASSL_MSG("Arrays Memory error");
return MEMORY_E; return MEMORY_E;
@ -1919,6 +1919,7 @@ void FreeArrays(CYASSL* ssl, int keep)
if (ssl->arrays && keep) { if (ssl->arrays && keep) {
/* keeps session id for user retrieval */ /* keeps session id for user retrieval */
XMEMCPY(ssl->session.sessionID, ssl->arrays->sessionID, ID_LEN); XMEMCPY(ssl->session.sessionID, ssl->arrays->sessionID, ID_LEN);
ssl->session.sessionIDSz = ssl->arrays->sessionIDSz;
} }
XFREE(ssl->arrays, ssl->heap, DYNAMIC_TYPE_ARRAYS); XFREE(ssl->arrays, ssl->heap, DYNAMIC_TYPE_ARRAYS);
ssl->arrays = NULL; ssl->arrays = NULL;
@ -4114,6 +4115,29 @@ static int DoCertificate(CYASSL* ssl, byte* input, word32* inOutIdx,
} }
} }
#ifdef HAVE_SECURE_RENEGOTIATION
if (fatal == 0 && ssl->secure_renegotiation
&& ssl->secure_renegotiation->enabled) {
if (ssl->keys.encryptionOn) {
/* compare against previous time */
if (XMEMCMP(dCert.subjectHash,
ssl->secure_renegotiation->subject_hash,
SHA_DIGEST_SIZE) != 0) {
CYASSL_MSG("Peer sent different cert during scr, fatal");
fatal = 1;
ret = SCR_DIFFERENT_CERT_E;
}
}
/* cache peer's hash */
if (fatal == 0) {
XMEMCPY(ssl->secure_renegotiation->subject_hash,
dCert.subjectHash, SHA_DIGEST_SIZE);
}
}
#endif
#ifdef HAVE_OCSP #ifdef HAVE_OCSP
if (fatal == 0 && ssl->ctx->cm->ocspEnabled) { if (fatal == 0 && ssl->ctx->cm->ocspEnabled) {
ret = CheckCertOCSP(ssl->ctx->cm->ocsp, &dCert); ret = CheckCertOCSP(ssl->ctx->cm->ocsp, &dCert);
@ -7676,13 +7700,14 @@ const char* CyaSSL_ERR_reason_error_string(unsigned long e)
case SECURE_RENEGOTIATION_E: case SECURE_RENEGOTIATION_E:
return "Invalid Renegotiation Error"; return "Invalid Renegotiation Error";
#ifdef HAVE_SESSION_TICKET
case SESSION_TICKET_LEN_E: case SESSION_TICKET_LEN_E:
return "Session Ticket Too Long Error"; return "Session Ticket Too Long Error";
case SESSION_TICKET_EXPECT_E: case SESSION_TICKET_EXPECT_E:
return "Session Ticket Error"; return "Session Ticket Error";
#endif
case SCR_DIFFERENT_CERT_E:
return "Peer sent different cert during SCR";
default : default :
return "unknown error number"; return "unknown error number";
@ -8745,7 +8770,9 @@ static void PickHashSigAlgo(CYASSL* ssl,
byte *output; byte *output;
word32 length, idx = RECORD_HEADER_SZ + HANDSHAKE_HEADER_SZ; word32 length, idx = RECORD_HEADER_SZ + HANDSHAKE_HEADER_SZ;
int sendSz; int sendSz;
int idSz = ssl->options.resuming ? ID_LEN : 0; int idSz = ssl->options.resuming
? ssl->session.sessionIDSz
: 0;
int ret; int ret;
if (ssl->suites == NULL) { if (ssl->suites == NULL) {
@ -8754,7 +8781,7 @@ static void PickHashSigAlgo(CYASSL* ssl,
} }
#ifdef HAVE_SESSION_TICKET #ifdef HAVE_SESSION_TICKET
if (ssl->session.ticketLen > 0) { if (ssl->options.resuming && ssl->session.ticketLen > 0) {
SessionTicket* ticket; SessionTicket* ticket;
ticket = TLSX_SessionTicket_Create(0, ticket = TLSX_SessionTicket_Create(0,
@ -8828,8 +8855,9 @@ static void PickHashSigAlgo(CYASSL* ssl,
/* then session id */ /* then session id */
output[idx++] = (byte)idSz; output[idx++] = (byte)idSz;
if (idSz) { if (idSz) {
XMEMCPY(output + idx, ssl->session.sessionID, ID_LEN); XMEMCPY(output + idx, ssl->session.sessionID,
idx += ID_LEN; ssl->session.sessionIDSz);
idx += ssl->session.sessionIDSz;
} }
/* then DTLS cookie */ /* then DTLS cookie */
@ -8987,7 +9015,6 @@ static void PickHashSigAlgo(CYASSL* ssl,
static int DoServerHello(CYASSL* ssl, const byte* input, word32* inOutIdx, static int DoServerHello(CYASSL* ssl, const byte* input, word32* inOutIdx,
word32 helloSz) word32 helloSz)
{ {
byte b;
byte cs0; /* cipher suite bytes 0, 1 */ byte cs0; /* cipher suite bytes 0, 1 */
byte cs1; byte cs1;
ProtocolVersion pv; ProtocolVersion pv;
@ -9053,20 +9080,23 @@ static void PickHashSigAlgo(CYASSL* ssl,
i += RAN_LEN; i += RAN_LEN;
/* session id */ /* session id */
b = input[i++]; ssl->arrays->sessionIDSz = input[i++];
if (b == ID_LEN) { if (ssl->arrays->sessionIDSz > ID_LEN) {
if ((i - begin) + ID_LEN > helloSz) CYASSL_MSG("Invalid session ID size");
ssl->arrays->sessionIDSz = 0;
return BUFFER_ERROR;
}
else if (ssl->arrays->sessionIDSz) {
if ((i - begin) + ssl->arrays->sessionIDSz > helloSz)
return BUFFER_ERROR; return BUFFER_ERROR;
XMEMCPY(ssl->arrays->sessionID, input + i, min(b, ID_LEN)); XMEMCPY(ssl->arrays->sessionID, input + i,
i += ID_LEN; ssl->arrays->sessionIDSz);
i += ssl->arrays->sessionIDSz;
ssl->options.haveSessionId = 1; ssl->options.haveSessionId = 1;
} }
else if (b) {
CYASSL_MSG("Invalid session ID size");
return BUFFER_ERROR; /* session ID nor 0 neither 32 bytes long */
}
/* suite and compression */ /* suite and compression */
if ((i - begin) + OPAQUE16_LEN + OPAQUE8_LEN > helloSz) if ((i - begin) + OPAQUE16_LEN + OPAQUE8_LEN > helloSz)

12
src/ssl.c
View File

@ -736,7 +736,7 @@ int CyaSSL_UseSecureRenegotiation(CYASSL* ssl)
} }
/* do a secure renegotiation handshake, use forced, we discourage */ /* do a secure renegotiation handshake, user forced, we discourage */
int CyaSSL_Rehandshake(CYASSL* ssl) int CyaSSL_Rehandshake(CYASSL* ssl)
{ {
int ret; int ret;
@ -759,6 +759,15 @@ int CyaSSL_Rehandshake(CYASSL* ssl)
return SECURE_RENEGOTIATION_E; return SECURE_RENEGOTIATION_E;
} }
#ifndef NO_FORCE_SCR_SAME_SUITE
/* force same suite */
if (ssl->suites) {
ssl->suites->suiteSz = SUITE_LEN;
ssl->suites->suites[0] = ssl->options.cipherSuite0;
ssl->suites->suites[1] = ssl->options.cipherSuite;
}
#endif
/* reset handshake states */ /* reset handshake states */
ssl->options.serverState = NULL_STATE; ssl->options.serverState = NULL_STATE;
ssl->options.clientState = NULL_STATE; ssl->options.clientState = NULL_STATE;
@ -5640,6 +5649,7 @@ int AddSession(CYASSL* ssl)
ssl->arrays->masterSecret, SECRET_LEN); ssl->arrays->masterSecret, SECRET_LEN);
XMEMCPY(SessionCache[row].Sessions[idx].sessionID, ssl->arrays->sessionID, XMEMCPY(SessionCache[row].Sessions[idx].sessionID, ssl->arrays->sessionID,
ID_LEN); ID_LEN);
SessionCache[row].Sessions[idx].sessionIDSz = ssl->arrays->sessionIDSz;
SessionCache[row].Sessions[idx].timeout = ssl->timeout; SessionCache[row].Sessions[idx].timeout = ssl->timeout;
SessionCache[row].Sessions[idx].bornOn = LowResTimer(); SessionCache[row].Sessions[idx].bornOn = LowResTimer();

2
src/tls.c
View File

@ -1776,7 +1776,7 @@ static void TLSX_SessionTicket_ValidateRequest(CYASSL* ssl)
} }
static byte TLSX_SessionTicket_GetSize(SessionTicket* ticket, int isRequest) static word16 TLSX_SessionTicket_GetSize(SessionTicket* ticket, int isRequest)
{ {
return isRequest && ticket ? ticket->size : 0; return isRequest && ticket ? ticket->size : 0;
} }