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

detect SetSSL_CTX requirements and error out early

Browse Source
This commit is contained in:
toddouska
2015-08-31 11:57:30 -07:00
parent df2216d092
commit cf38d1c022
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/internal.c
View File

@@ -1562,12 +1562,19 @@ void FreeX509(WOLFSSL_X509* x509)
/* This function inherits a WOLFSSL_CTX's fields into an SSL object. /* This function inherits a WOLFSSL_CTX's fields into an SSL object.
It is used during initialization and to switch an ssl's CTX with It is used during initialization and to switch an ssl's CTX with
wolfSSL_Set_SSL_CTX */ wolfSSL_Set_SSL_CTX. Requires ssl->suites alloc and ssl-arrays with PSK
SSL_SUCCESS return value on success */
int SetSSL_CTX(WOLFSSL* ssl, WOLFSSL_CTX* ctx) int SetSSL_CTX(WOLFSSL* ssl, WOLFSSL_CTX* ctx)
{ {
if(!ssl || !ctx) if(!ssl || !ctx || ssl->suites == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
#ifndef NO_PSK
if (ctx->server_hint[0] && ssl->arrays == NULL) {
return BAD_FUNC_ARG; /* needed for copy below */
}
#endif
byte havePSK = 0; byte havePSK = 0;
byte haveAnon = 0; byte haveAnon = 0;
byte haveRSA = 0; byte haveRSA = 0;
@@ -1701,7 +1708,8 @@ int SetSSL_CTX(WOLFSSL* ssl, WOLFSSL_CTX* ctx)
/* init everything to 0, NULL, default values before calling anything that may /* init everything to 0, NULL, default values before calling anything that may
fail so that desctructor has a "good" state to cleanup */ fail so that desctructor has a "good" state to cleanup
0 on success */
int InitSSL(WOLFSSL* ssl, WOLFSSL_CTX* ctx) int InitSSL(WOLFSSL* ssl, WOLFSSL_CTX* ctx)
{ {
int ret; int ret;
@@ -1793,6 +1801,7 @@ int InitSSL(WOLFSSL* ssl, WOLFSSL_CTX* ctx)
} }
/* Initialize SSL with the appropriate fields from it's ctx */ /* Initialize SSL with the appropriate fields from it's ctx */
/* requires valid arrays and suites */
if((ret = SetSSL_CTX(ssl, ctx)) != SSL_SUCCESS) if((ret = SetSSL_CTX(ssl, ctx)) != SSL_SUCCESS)
return ret; return ret;