wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-07-30 18:57:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

DTLS Maintenance

Browse Source 
The options to switch on and off the code to serialize/deserialize items
in the struct need to match the options for the struct.
(ZD5130, ZD5590)
This commit is contained in:
John Safranek
2019-09-10 15:59:22 -07:00
parent e93e3b60da
commit 22c398494e
1 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/ssl.c
View File

@ -11409,7 +11409,8 @@ static WC_INLINE void RestoreSession(WOLFSSL* ssl, WOLFSSL_SESSION* session,
#endif #endif
} }
#endif /* SESSION_CERTS */ #endif /* SESSION_CERTS */
#ifndef NO_RESUME_SUITE_CHECK #if !defined(NO_RESUME_SUITE_CHECK) || \
(defined(WOLFSSL_TLS13) && defined(HAVE_SESSION_TICKET))
ssl->session.cipherSuite0 = session->cipherSuite0; ssl->session.cipherSuite0 = session->cipherSuite0;
ssl->session.cipherSuite = session->cipherSuite; ssl->session.cipherSuite = session->cipherSuite;
#endif #endif
@ -18352,7 +18353,8 @@ const char* wolfSSL_SESSION_CIPHER_get_name(WOLFSSL_SESSION* session)
return NULL; return NULL;
} }
#ifdef SESSION_CERTS #if defined(SESSION_CERTS) || !defined(NO_RESUME_SUITE_CHECK) || \
(defined(WOLFSSL_TLS13) && defined(HAVE_SESSION_TICKET))
#if !defined(WOLFSSL_CIPHER_INTERNALNAME) && !defined(NO_ERROR_STRINGS) #if !defined(WOLFSSL_CIPHER_INTERNALNAME) && !defined(NO_ERROR_STRINGS)
return GetCipherNameIana(session->cipherSuite0, session->cipherSuite); return GetCipherNameIana(session->cipherSuite0, session->cipherSuite);
#else #else
@ -24775,12 +24777,16 @@ int wolfSSL_i2d_SSL_SESSION(WOLFSSL_SESSION* sess, unsigned char** p)
size += OPAQUE8_LEN; size += OPAQUE8_LEN;
for (i = 0; i < sess->chain.count; i++) for (i = 0; i < sess->chain.count; i++)
size += OPAQUE16_LEN + sess->chain.certs[i].length; size += OPAQUE16_LEN + sess->chain.certs[i].length;
#endif
#if defined(SESSION_CERTS) || (defined(WOLFSSL_TLS13) && \
defined(HAVE_SESSION_TICKET))
/* Protocol version */ /* Protocol version */
size += OPAQUE16_LEN; size += OPAQUE16_LEN;
#endif #endif
#if defined(SESSION_CERTS) || !defined(NO_RESUME_SUITE_CHECK) #if defined(SESSION_CERTS) || !defined(NO_RESUME_SUITE_CHECK) || \
(defined(WOLFSSL_TLS13) && defined(HAVE_SESSION_TICKET))
/* cipher suite */ /* cipher suite */
size += OPAQUE16_LEN + OPAQUE16_LEN; size += OPAQUE16_LEN;
#endif #endif
#ifndef NO_CLIENT_CACHE #ifndef NO_CLIENT_CACHE
/* ServerID len | ServerID */ /* ServerID len | ServerID */
@ -24818,10 +24824,14 @@ int wolfSSL_i2d_SSL_SESSION(WOLFSSL_SESSION* sess, unsigned char** p)
sess->chain.certs[i].length); sess->chain.certs[i].length);
idx += sess->chain.certs[i].length; idx += sess->chain.certs[i].length;
} }
#endif
#if defined(SESSION_CERTS) || (defined(WOLFSSL_TLS13) && \
defined(HAVE_SESSION_TICKET))
data[idx++] = sess->version.major; data[idx++] = sess->version.major;
data[idx++] = sess->version.minor; data[idx++] = sess->version.minor;
#endif #endif
#if defined(SESSION_CERTS) || !defined(NO_RESUME_SUITE_CHECK) #if defined(SESSION_CERTS) || !defined(NO_RESUME_SUITE_CHECK) || \
(defined(WOLFSSL_TLS13) && defined(HAVE_SESSION_TICKET))
data[idx++] = sess->cipherSuite0; data[idx++] = sess->cipherSuite0;
data[idx++] = sess->cipherSuite; data[idx++] = sess->cipherSuite;
#endif #endif
@ -24940,16 +24950,24 @@ WOLFSSL_SESSION* wolfSSL_d2i_SSL_SESSION(WOLFSSL_SESSION** sess,
XMEMCPY(s->chain.certs[j].buffer, data + idx, length); XMEMCPY(s->chain.certs[j].buffer, data + idx, length);
idx += length; idx += length;
} }
#endif
/* Protocol Version | Cipher suite */ #if defined(SESSION_CERTS) || (defined(WOLFSSL_TLS13) && \
if (i - idx < OPAQUE16_LEN + OPAQUE16_LEN) { defined(HAVE_SESSION_TICKET))
/* Protocol Version */
if (i - idx < OPAQUE16_LEN) {
ret = BUFFER_ERROR; ret = BUFFER_ERROR;
goto end; goto end;
} }
s->version.major = data[idx++]; s->version.major = data[idx++];
s->version.minor = data[idx++]; s->version.minor = data[idx++];
#endif #endif
#if defined(SESSION_CERTS) || !defined(NO_RESUME_SUITE_CHECK) #if defined(SESSION_CERTS) || !defined(NO_RESUME_SUITE_CHECK) || \
(defined(WOLFSSL_TLS13) && defined(HAVE_SESSION_TICKET))
/* Cipher suite */
if (i - idx < OPAQUE16_LEN) {
ret = BUFFER_ERROR;
goto end;
}
s->cipherSuite0 = data[idx++]; s->cipherSuite0 = data[idx++];
s->cipherSuite = data[idx++]; s->cipherSuite = data[idx++];
#endif #endif