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

fix BIO free error on not full init w/ opensslExtra server

Browse Source
This commit is contained in:
toddouska
2011-12-15 18:49:03 -08:00
parent 8f2508b5d7
commit 7cc11ac8d5
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/internal.c
View File

@ -662,15 +662,6 @@ int InitSSL(CYASSL* ssl, CYASSL_CTX* ctx)
ssl->version = ctx->method->version; ssl->version = ctx->method->version;
ssl->suites = ctx->suites; ssl->suites = ctx->suites;
/* increment CTX reference count */
if (LockMutex(&ctx->countMutex) != 0) {
CYASSL_MSG("Couldn't lock CTX count mutex");
return BAD_MUTEX_ERROR;
}
ctx->refCount++;
UnLockMutex(&ctx->countMutex);
#ifdef HAVE_LIBZ #ifdef HAVE_LIBZ
ssl->didStreamInit = 0; ssl->didStreamInit = 0;
#endif #endif
@ -698,6 +689,22 @@ int InitSSL(CYASSL* ssl, CYASSL_CTX* ctx)
ssl->buffers.prevSent = 0; ssl->buffers.prevSent = 0;
ssl->buffers.plainSz = 0; ssl->buffers.plainSz = 0;
ssl->rfd = -1; /* set to invalid descriptor */
ssl->wfd = -1;
ssl->biord = 0;
ssl->biowr = 0;
ssl->IOCB_ReadCtx = &ssl->rfd; /* prevent invalid pointer acess if not */
ssl->IOCB_WriteCtx = &ssl->wfd; /* correctly set */
/* increment CTX reference count */
if (LockMutex(&ctx->countMutex) != 0) {
CYASSL_MSG("Couldn't lock CTX count mutex");
return BAD_MUTEX_ERROR;
}
ctx->refCount++;
UnLockMutex(&ctx->countMutex);
if ( (ret = InitRng(&ssl->rng)) != 0) if ( (ret = InitRng(&ssl->rng)) != 0)
return ret; return ret;
@ -832,13 +839,6 @@ int InitSSL(CYASSL* ssl, CYASSL_CTX* ctx)
ssl->options.haveNTRU, ssl->options.haveECDSA, ssl->options.haveNTRU, ssl->options.haveECDSA,
ssl->ctx->method->side); ssl->ctx->method->side);
ssl->rfd = -1; /* set to invalid descriptor */
ssl->wfd = -1;
ssl->biord = 0;
ssl->biowr = 0;
ssl->IOCB_ReadCtx = &ssl->rfd; /* prevent invalid pointer acess if not */
ssl->IOCB_WriteCtx = &ssl->wfd; /* correctly set */
#ifdef SESSION_CERTS #ifdef SESSION_CERTS
ssl->session.chain.count = 0; ssl->session.chain.count = 0;