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

SEP Profile

Browse Source 
1. Changed session index shift values to constants.
2. Added bounds checking when retrieving a session.
3. Added function to retrieve the peer cert chain from
   a CYASSL_SESSION record.
This commit is contained in:
John Safranek
2013-08-02 16:03:41 -07:00
parent 3b4ff94931
commit 831d9cf640
3 changed files with 66 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cyassl/internal.h
View File

@@ -706,6 +706,13 @@ enum Misc {
}; };
#ifdef SESSION_INDEX
/* Shift values for making a session index */
#define SESSIDX_ROW_SHIFT 4
#define SESSIDX_IDX_MASK 0x0F
#endif
/* max cert chain peer depth */ /* max cert chain peer depth */
#ifndef MAX_CHAIN_DEPTH #ifndef MAX_CHAIN_DEPTH
#define MAX_CHAIN_DEPTH 9 #define MAX_CHAIN_DEPTH 9

11
cyassl/ssl.h
View File

@@ -248,9 +248,14 @@ CYASSL_API int CyaSSL_SetServerID(CYASSL* ssl, const unsigned char*,
int, int); int, int);
#ifdef SESSION_INDEX #ifdef SESSION_INDEX
CYASSL_API int CyaSSL_GetSessionIndex(CYASSL* ssl); CYASSL_API int CyaSSL_GetSessionIndex(CYASSL* ssl);
CYASSL_API int CyaSSL_GetSessionAtIndex(int index, CYASSL_SESSION* session); CYASSL_API int CyaSSL_GetSessionAtIndex(int index, CYASSL_SESSION* session);
#endif #endif /* SESSION_INDEX */
#if defined(SESSION_INDEX) && defined(SESSION_CERTS)
CYASSL_API
CYASSL_X509_CHAIN* CyaSSL_SESSION_get_peer_chain(CYASSL_SESSION* session);
#endif /* SESSION_INDEX && SESSION_CERTS */
typedef int (*VerifyCallback)(int, CYASSL_X509_STORE_CTX*); typedef int (*VerifyCallback)(int, CYASSL_X509_STORE_CTX*);
typedef int (*pem_password_cb)(char*, int, int, void*); typedef int (*pem_password_cb)(char*, int, int, void*);

77
src/ssl.c
View File

@@ -4553,7 +4553,7 @@ int AddSession(CYASSL* ssl)
idx = SessionCache[row].nextIdx++; idx = SessionCache[row].nextIdx++;
#ifdef SESSION_INDEX #ifdef SESSION_INDEX
ssl->sessionIndex = (row << 4) | idx; ssl->sessionIndex = (row << SESSIDX_ROW_SHIFT) | idx;
#endif #endif
XMEMCPY(SessionCache[row].Sessions[idx].masterSecret, XMEMCPY(SessionCache[row].Sessions[idx].masterSecret,
@@ -4611,34 +4611,59 @@ int AddSession(CYASSL* ssl)
#ifdef SESSION_INDEX #ifdef SESSION_INDEX
int CyaSSL_GetSessionIndex(CYASSL* ssl)
{ int CyaSSL_GetSessionIndex(CYASSL* ssl)
return ssl->sessionIndex; {
CYASSL_ENTER("CyaSSL_GetSessionIndex");
CYASSL_LEAVE("CyaSSL_GetSessionIndex", ssl->sessionIndex);
return ssl->sessionIndex;
}
int CyaSSL_GetSessionAtIndex(int index, CYASSL_SESSION* session)
{
int row, col, result = SSL_FAILURE;
CYASSL_ENTER("CyaSSL_GetSessionAtIndex");
row = index >> SESSIDX_ROW_SHIFT;
col = index & SESSIDX_IDX_MASK;
if (LockMutex(&session_mutex) != 0) {
return BAD_MUTEX_ERROR;
} }
if (row < SESSION_ROWS &&
int CyaSSL_GetSessionAtIndex(int index, CYASSL_SESSION* session) col < (int)min(SessionCache[row].totalCount, SESSIONS_PER_ROW)) {
{ XMEMCPY(session,
int row, col, result = SSL_FAILURE; &SessionCache[row].Sessions[col], sizeof(CYASSL_SESSION));
result = SSL_SUCCESS;
row = index >> 4;
col = index & 0x0F;
if (LockMutex(&session_mutex) != 0)
return BAD_MUTEX_ERROR;
if (row < SESSION_ROWS && col < SessionCache[row].totalCount) {
XMEMCPY(session,
&SessionCache[row].Sessions[col], sizeof(CYASSL_SESSION));
result = SSL_SUCCESS;
}
if (UnLockMutex(&session_mutex) != 0)
return BAD_MUTEX_ERROR;
return result;
} }
#endif
if (UnLockMutex(&session_mutex) != 0)
result = BAD_MUTEX_ERROR;
CYASSL_LEAVE("CyaSSL_GetSessionAtIndex", result);
return result;
}
#endif /* SESSION_INDEX */
#if defined(SESSION_INDEX) && defined(SESSION_CERTS)
CYASSL_X509_CHAIN* CyaSSL_SESSION_get_peer_chain(CYASSL_SESSION* session)
{
CYASSL_X509_CHAIN* chain = NULL;
CYASSL_ENTER("CyaSSL_SESSION_get_peer_chain");
if (session)
chain = &session->chain;
CYASSL_LEAVE("CyaSSL_SESSION_get_peer_chain", chain ? 1 : 0);
return chain;
}
#endif /* SESSION_INDEX && SESSION_CERTS */
#ifdef SESSION_STATS #ifdef SESSION_STATS