wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-05 13:44:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix save cache file problem, version id, and match cache separarte error

Browse Source
This commit is contained in:
toddouska
2013-04-24 14:17:50 -07:00
parent 477129b53e
commit 942480e6ba
3 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cyassl/error.h
View File

@@ -112,6 +112,7 @@ enum CyaSSL_ErrorCodes {
GEN_COOKIE_E = -277, /* Generate Cookie Error */ GEN_COOKIE_E = -277, /* Generate Cookie Error */
NO_PEER_VERIFY = -278, /* Need peer cert verify Error */ NO_PEER_VERIFY = -278, /* Need peer cert verify Error */
FWRITE_ERROR = -279, /* fwrite problem */ FWRITE_ERROR = -279, /* fwrite problem */
CACHE_MATCH_ERROR = -280, /* session cache hdr match err */
/* add strings to SetErrorString !!!!! */ /* add strings to SetErrorString !!!!! */
/* begin negotiation parameter errors */ /* begin negotiation parameter errors */

4
src/internal.c
View File

@@ -5778,6 +5778,10 @@ void SetErrorString(int error, char* str)
XSTRNCPY(str, "fwrite Error", max); XSTRNCPY(str, "fwrite Error", max);
break; break;
case CACHE_MATCH_ERROR:
XSTRNCPY(str, "Session Cache restore header match Error", max);
break;
default : default :
XSTRNCPY(str, "unknown error number", max); XSTRNCPY(str, "unknown error number", max);
} }

27
src/ssl.c
View File

@@ -1006,6 +1006,10 @@ int AddCA(CYASSL_CERT_MANAGER* cm, buffer der, int type, int verify)
static CyaSSL_Mutex session_mutex; /* SessionCache mutex */ static CyaSSL_Mutex session_mutex; /* SessionCache mutex */
/* for persistance, if changes to layout need to increment and modify
save_session_cache() and restore_session_cache */
#define CYASSL_CACHE_VERSION 1
#endif /* NO_SESSION_CACHE */ #endif /* NO_SESSION_CACHE */
@@ -2534,6 +2538,7 @@ int CyaSSL_set_session(CYASSL* ssl, CYASSL_SESSION* session)
/* Session Cache Header information */ /* Session Cache Header information */
typedef struct { typedef struct {
int version; /* cache layout version id */
int rows; /* session rows */ int rows; /* session rows */
int columns; /* session columns */ int columns; /* session columns */
int sessionSz; /* sizeof CYASSL_SESSION */ int sessionSz; /* sizeof CYASSL_SESSION */
@@ -2551,11 +2556,12 @@ int CyaSSL_save_session_cache(const char *fname)
CYASSL_ENTER("CyaSSL_save_session_cache"); CYASSL_ENTER("CyaSSL_save_session_cache");
file = XFOPEN(fname, "rb"); file = XFOPEN(fname, "w+b");
if (file == XBADFILE) { if (file == XBADFILE) {
CYASSL_MSG("Couldn't open session cache save file"); CYASSL_MSG("Couldn't open session cache save file");
return SSL_BAD_FILE; return SSL_BAD_FILE;
} }
cache_header.version = CYASSL_CACHE_VERSION;
cache_header.rows = SESSION_ROWS; cache_header.rows = SESSION_ROWS;
cache_header.columns = SESSIONS_PER_ROW; cache_header.columns = SESSIONS_PER_ROW;
cache_header.sessionSz = (int)sizeof(CYASSL_SESSION); cache_header.sessionSz = (int)sizeof(CYASSL_SESSION);
@@ -2602,21 +2608,26 @@ int CyaSSL_restore_session_cache(const char *fname)
CYASSL_ENTER("CyaSSL_restore_session_cache"); CYASSL_ENTER("CyaSSL_restore_session_cache");
file = XFOPEN(fname, "w+b"); file = XFOPEN(fname, "rb");
if (file == XBADFILE) { if (file == XBADFILE) {
CYASSL_MSG("Couldn't open session cache save file"); CYASSL_MSG("Couldn't open session cache save file");
return SSL_BAD_FILE; return SSL_BAD_FILE;
} }
ret = (int)XFREAD(&cache_header, sizeof cache_header, 1, file); ret = (int)XFREAD(&cache_header, sizeof cache_header, 1, file);
if (ret != 1 || if (ret != 1) {
cache_header.rows != SESSION_ROWS || CYASSL_MSG("Session cache header file read failed");
cache_header.columns != SESSIONS_PER_ROW ||
cache_header.sessionSz != (int)sizeof(CYASSL_SESSION)) {
CYASSL_MSG("Session cache header file read/match failed");
XFCLOSE(file); XFCLOSE(file);
return FREAD_ERROR; return FREAD_ERROR;
} }
if (cache_header.version != CYASSL_CACHE_VERSION ||
cache_header.rows != SESSION_ROWS ||
cache_header.columns != SESSIONS_PER_ROW ||
cache_header.sessionSz != (int)sizeof(CYASSL_SESSION)) {
CYASSL_MSG("Session cache header match failed");
XFCLOSE(file);
return CACHE_MATCH_ERROR;
}
if (LockMutex(&session_mutex) != 0) { if (LockMutex(&session_mutex) != 0) {
CYASSL_MSG("Session cache mutex lock failed"); CYASSL_MSG("Session cache mutex lock failed");