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

Remove tabs

Browse Source
This commit is contained in:
Juliusz Sosinowicz
2019-11-07 11:48:02 +01:00
parent 944d5e1045
commit 9be1b4cfd8
2 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/ssl.c
View File

@ -12690,19 +12690,19 @@ int AddSession(WOLFSSL* ssl)
for (i=0; i<SESSIONS_PER_ROW; i++) { for (i=0; i<SESSIONS_PER_ROW; i++) {
if (ssl->options.tls1_3) { if (ssl->options.tls1_3) {
if (XMEMCMP(ssl->session.sessionID, SessionCache[row].Sessions[i].sessionID, ID_LEN) == 0) { if (XMEMCMP(ssl->session.sessionID, SessionCache[row].Sessions[i].sessionID, ID_LEN) == 0) {
WOLFSSL_MSG("Session already exists. Overwriting."); WOLFSSL_MSG("Session already exists. Overwriting.");
overwrite = 1; overwrite = 1;
idx = i; idx = i;
break; break;
} }
} else { } else {
if (XMEMCMP(ssl->arrays->sessionID, SessionCache[row].Sessions[i].sessionID, ID_LEN) == 0) { if (XMEMCMP(ssl->arrays->sessionID, SessionCache[row].Sessions[i].sessionID, ID_LEN) == 0) {
WOLFSSL_MSG("Session already exists. Overwriting."); WOLFSSL_MSG("Session already exists. Overwriting.");
overwrite = 1; overwrite = 1;
idx = i; idx = i;
break; break;
} }
} }
} }
@ -12782,15 +12782,15 @@ int AddSession(WOLFSSL* ssl)
#ifdef SESSION_CERTS #ifdef SESSION_CERTS
if (error == 0) { if (error == 0) {
if (!overwrite || (overwrite && ssl->session.chain.count > 0)) { if (!overwrite || (overwrite && ssl->session.chain.count > 0)) {
/* /*
* If we are overwriting and no certs present in ssl->session.chain * If we are overwriting and no certs present in ssl->session.chain
* then keep the old chain. * then keep the old chain.
*/ */
session->chain.count = ssl->session.chain.count; session->chain.count = ssl->session.chain.count;
XMEMCPY(session->chain.certs, ssl->session.chain.certs, XMEMCPY(session->chain.certs, ssl->session.chain.certs,
sizeof(x509_buffer) * session->chain.count); sizeof(x509_buffer) * session->chain.count);
} }
} }
#endif /* SESSION_CERTS */ #endif /* SESSION_CERTS */
#if defined(SESSION_CERTS) || (defined(WOLFSSL_TLS13) && \ #if defined(SESSION_CERTS) || (defined(WOLFSSL_TLS13) && \

16
wolfcrypt/src/asn.c
View File

@ -14880,12 +14880,12 @@ static int DecodeSingleResponse(byte* source,
cs->thisDateAsn = source + idx; cs->thisDateAsn = source + idx;
localIdx = 0; localIdx = 0;
if (GetDateInfo(cs->thisDateAsn, &localIdx, NULL, if (GetDateInfo(cs->thisDateAsn, &localIdx, NULL,
(byte*)&cs->thisDateParsed.type, (byte*)&cs->thisDateParsed.type,
&cs->thisDateParsed.length, size) < 0) &cs->thisDateParsed.length, size) < 0)
return ASN_PARSE_E; return ASN_PARSE_E;
XMEMCPY(cs->thisDateParsed.data, XMEMCPY(cs->thisDateParsed.data,
cs->thisDateAsn + localIdx - cs->thisDateParsed.length, cs->thisDateAsn + localIdx - cs->thisDateParsed.length,
cs->thisDateParsed.length); cs->thisDateParsed.length);
#endif #endif
if (GetBasicDate(source, &idx, cs->thisDate, if (GetBasicDate(source, &idx, cs->thisDate,
&cs->thisDateFormat, size) < 0) &cs->thisDateFormat, size) < 0)
@ -14913,12 +14913,12 @@ static int DecodeSingleResponse(byte* source,
cs->nextDateAsn = source + idx; cs->nextDateAsn = source + idx;
localIdx = 0; localIdx = 0;
if (GetDateInfo(cs->nextDateAsn, &localIdx, NULL, if (GetDateInfo(cs->nextDateAsn, &localIdx, NULL,
(byte*)&cs->nextDateParsed.type, (byte*)&cs->nextDateParsed.type,
&cs->nextDateParsed.length, size) < 0) &cs->nextDateParsed.length, size) < 0)
return ASN_PARSE_E; return ASN_PARSE_E;
XMEMCPY(cs->nextDateParsed.data, XMEMCPY(cs->nextDateParsed.data,
cs->nextDateAsn + localIdx - cs->nextDateParsed.length, cs->nextDateAsn + localIdx - cs->nextDateParsed.length,
cs->nextDateParsed.length); cs->nextDateParsed.length);
#endif #endif
if (GetBasicDate(source, &idx, cs->nextDate, if (GetBasicDate(source, &idx, cs->nextDate,
&cs->nextDateFormat, size) < 0) &cs->nextDateFormat, size) < 0)