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

fix sesion export buffer to be not dependent on macros defined

Browse Source
This commit is contained in:
Jacob Barthelmeh
2017-08-01 14:19:06 -06:00
parent e1ccc5acad
commit c93d348ecd
1 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/internal.c
View File

@ -861,14 +861,20 @@ static int dtls_export_new(WOLFSSL* ssl, byte* exp, word32 len, byte ver)
exp[idx++] = options->createTicket; exp[idx++] = options->createTicket;
exp[idx++] = options->useTicket; exp[idx++] = options->useTicket;
#ifdef WOLFSSL_TLS13 #ifdef WOLFSSL_TLS13
exp[idx++] = options->noTicketTls13; if (ver > DTLS_EXPORT_VERSION_3) {
exp[idx++] = options->noTicketTls13;
}
#else
if (ver > DTLS_EXPORT_VERSION_3) {
exp[idx++] = 0;
}
#endif #endif
#else #else
exp[idx++] = 0; exp[idx++] = 0;
exp[idx++] = 0; exp[idx++] = 0;
#ifdef WOLFSSL_TLS13 if (ver > DTLS_EXPORT_VERSION_3) {
exp[idx++] = 0; exp[idx++] = 0;
#endif }
#endif #endif
exp[idx++] = options->processReply; exp[idx++] = options->processReply;
exp[idx++] = options->cipherSuite0; exp[idx++] = options->cipherSuite0;
@ -887,12 +893,26 @@ static int dtls_export_new(WOLFSSL* ssl, byte* exp, word32 len, byte ver)
exp[idx++] = ssl->version.minor; exp[idx++] = ssl->version.minor;
(void)zero; (void)zero;
(void)ver;
/* check if changes were made and notify of need to update export version */ /* check if changes were made and notify of need to update export version */
if (idx != DTLS_EXPORT_OPT_SZ) { switch (ver) {
WOLFSSL_MSG("Update DTLS_EXPORT_OPT_SZ and version of wolfSSL export"); case DTLS_EXPORT_VERSION_3:
return DTLS_EXPORT_VER_E; if (idx != DTLS_EXPORT_OPT_SZ_3) {
WOLFSSL_MSG("Update DTLS_EXPORT_OPT_SZ and version of export");
return DTLS_EXPORT_VER_E;
}
break;
case DTLS_EXPORT_VERSION:
if (idx != DTLS_EXPORT_OPT_SZ) {
WOLFSSL_MSG("Update DTLS_EXPORT_OPT_SZ and version of export");
return DTLS_EXPORT_VER_E;
}
break;
default:
WOLFSSL_MSG("New version case needs added to wolfSSL export");
return DTLS_EXPORT_VER_E;
} }
WOLFSSL_LEAVE("dtls_export_new", idx); WOLFSSL_LEAVE("dtls_export_new", idx);
@ -1007,15 +1027,17 @@ static int dtls_export_load(WOLFSSL* ssl, byte* exp, word32 len, byte ver)
if (ver > DTLS_EXPORT_VERSION_3) { if (ver > DTLS_EXPORT_VERSION_3) {
options->noTicketTls13 = exp[idx++];/* Server won't create new Ticket */ options->noTicketTls13 = exp[idx++];/* Server won't create new Ticket */
} }
#else
if (ver > DTLS_EXPORT_VERSION_3) {
exp[idx++] = 0;
}
#endif #endif
#else #else
idx++; idx++;
idx++; idx++;
#ifdef WOLFSSL_TLS13
if (ver > DTLS_EXPORT_VERSION_3) { if (ver > DTLS_EXPORT_VERSION_3) {
idx++; idx++;
} }
#endif
#endif #endif
options->processReply = exp[idx++]; options->processReply = exp[idx++];
options->cipherSuite0 = exp[idx++]; options->cipherSuite0 = exp[idx++];