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

Merge branch 'master' of github.com:cyassl/cyassl

Browse Source
This commit is contained in:
John Safranek
2012-11-27 22:19:01 -08:00
parent 66a3ce2ec1 4af555b502
commit 77bf77dfd7
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ctaocrypt/src/asn.c
View File

@@ -4947,13 +4947,13 @@ int ParseCRL(DecodedCRL* dcrl, const byte* buff, word32 sz, void* cm)
{ {
int version, len; int version, len;
word32 oid, idx = 0; word32 oid, idx = 0;
Sha sha;
Signer* ca; Signer* ca;
CYASSL_MSG("ParseCRL"); CYASSL_MSG("ParseCRL");
/* raw crl hash */ /* raw crl hash */
/* hash here if needed for optimized comparisons /* hash here if needed for optimized comparisons
* Sha sha;
* InitSha(&sha); * InitSha(&sha);
* ShaUpdate(&sha, buff, sz); * ShaUpdate(&sha, buff, sz);
* ShaFinal(&sha, dcrl->crlHash); */ * ShaFinal(&sha, dcrl->crlHash); */

2
cyassl/crl.h
View File

@@ -33,7 +33,7 @@
typedef struct CYASSL_CRL CYASSL_CRL; typedef struct CYASSL_CRL CYASSL_CRL;
CYASSL_LOCAL int InitCRL(CYASSL_CRL*, CYASSL_CERT_MANAGER*); CYASSL_LOCAL int InitCRL(CYASSL_CRL*, CYASSL_CERT_MANAGER*);
CYASSL_LOCAL void FreeCRL(CYASSL_CRL*); CYASSL_LOCAL void FreeCRL(CYASSL_CRL*, int dynamic);
CYASSL_LOCAL int LoadCRL(CYASSL_CRL* crl, const char* path, int type, int mon); CYASSL_LOCAL int LoadCRL(CYASSL_CRL* crl, const char* path, int type, int mon);
CYASSL_LOCAL int BufferLoadCRL(CYASSL_CRL*, const byte*, long, int); CYASSL_LOCAL int BufferLoadCRL(CYASSL_CRL*, const byte*, long, int);

14
src/crl.c
View File

@@ -90,7 +90,7 @@ static void FreeCRL_Entry(CRL_Entry* crle)
/* Free all CRL resources */ /* Free all CRL resources */
void FreeCRL(CYASSL_CRL* crl) void FreeCRL(CYASSL_CRL* crl, int dynamic)
{ {
CRL_Entry* tmp = crl->crlList; CRL_Entry* tmp = crl->crlList;
@@ -116,6 +116,8 @@ void FreeCRL(CYASSL_CRL* crl)
} }
#endif #endif
FreeMutex(&crl->crlLock); FreeMutex(&crl->crlLock);
if (dynamic) /* free self */
XFREE(crl, NULL, DYNAMIC_TYPE_CRL);
} }
@@ -295,7 +297,7 @@ static int SwapLists(CYASSL_CRL* crl)
ret = LoadCRL(&tmp, crl->monitors[0].path, SSL_FILETYPE_PEM, 0); ret = LoadCRL(&tmp, crl->monitors[0].path, SSL_FILETYPE_PEM, 0);
if (ret != SSL_SUCCESS) { if (ret != SSL_SUCCESS) {
CYASSL_MSG("PEM LoadCRL on dir change failed"); CYASSL_MSG("PEM LoadCRL on dir change failed");
FreeCRL(&tmp); FreeCRL(&tmp, 0);
return -1; return -1;
} }
} }
@@ -304,14 +306,14 @@ static int SwapLists(CYASSL_CRL* crl)
ret = LoadCRL(&tmp, crl->monitors[1].path, SSL_FILETYPE_ASN1, 0); ret = LoadCRL(&tmp, crl->monitors[1].path, SSL_FILETYPE_ASN1, 0);
if (ret != SSL_SUCCESS) { if (ret != SSL_SUCCESS) {
CYASSL_MSG("DER LoadCRL on dir change failed"); CYASSL_MSG("DER LoadCRL on dir change failed");
FreeCRL(&tmp); FreeCRL(&tmp, 0);
return -1; return -1;
} }
} }
if (LockMutex(&crl->crlLock) != 0) { if (LockMutex(&crl->crlLock) != 0) {
CYASSL_MSG("LockMutex failed"); CYASSL_MSG("LockMutex failed");
FreeCRL(&tmp); FreeCRL(&tmp, 0);
return -1; return -1;
} }
@@ -323,7 +325,7 @@ static int SwapLists(CYASSL_CRL* crl)
UnLockMutex(&crl->crlLock); UnLockMutex(&crl->crlLock);
FreeCRL(&tmp); FreeCRL(&tmp, 0);
return 0; return 0;
} }
@@ -582,6 +584,8 @@ int LoadCRL(CYASSL_CRL* crl, const char* path, int type, int monitor)
} }
} }
closedir(dir);
return ret; return ret;
} }

7
src/ssl.c
View File

@@ -592,7 +592,7 @@ void CyaSSL_CertManagerFree(CYASSL_CERT_MANAGER* cm)
if (cm) { if (cm) {
#ifdef HAVE_CRL #ifdef HAVE_CRL
if (cm->crl) if (cm->crl)
FreeCRL(cm->crl); FreeCRL(cm->crl, 1);
#endif #endif
FreeSigners(cm->caList, NULL); FreeSigners(cm->caList, NULL);
FreeMutex(&cm->caLock); FreeMutex(&cm->caLock);
@@ -1719,7 +1719,7 @@ int CyaSSL_CertManagerEnableCRL(CYASSL_CERT_MANAGER* cm, int options)
if (InitCRL(cm->crl, cm) != 0) { if (InitCRL(cm->crl, cm) != 0) {
CYASSL_MSG("Init CRL failed"); CYASSL_MSG("Init CRL failed");
FreeCRL(cm->crl); FreeCRL(cm->crl, 1);
cm->crl = NULL; cm->crl = NULL;
return SSL_FAILURE; return SSL_FAILURE;
} }
@@ -3179,6 +3179,9 @@ int AddSession(CYASSL* ssl)
/* No session cache version */ /* No session cache version */
CYASSL_SESSION* GetSession(CYASSL* ssl, byte* masterSecret) CYASSL_SESSION* GetSession(CYASSL* ssl, byte* masterSecret)
{ {
(void)ssl;
(void)masterSecret;
return NULL; return NULL;
} }