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

Made changes found by Jenkins.

Browse Source
This commit is contained in:
John Blixt
2016-08-19 10:23:55 -06:00
parent 813a9b05b5
commit a9935cbc28
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/api.c
View File

@@ -218,7 +218,7 @@ static void test_wolfSSL_CTX_use_certificate_file(void)
*/ */
static int test_wolfSSL_CTX_use_certificate_buffer(void) static int test_wolfSSL_CTX_use_certificate_buffer(void)
{ {
#if !defined(NO_CERTS) && defined(USE_CERT_BUFFERS_2048) #if !defined(NO_CERTS) && defined(USE_CERT_BUFFERS_2048) && !defined(NO_RSA)
WOLFSSL_CTX* ctx; WOLFSSL_CTX* ctx;
int ret; int ret;
@@ -229,6 +229,7 @@ static int test_wolfSSL_CTX_use_certificate_buffer(void)
sizeof_server_cert_der_2048, SSL_FILETYPE_ASN1); sizeof_server_cert_der_2048, SSL_FILETYPE_ASN1);
printf(resultFmt, ret == SSL_SUCCESS ? passed : failed); printf(resultFmt, ret == SSL_SUCCESS ? passed : failed);
wolfSSL_CTX_free(ctx);
return ret; return ret;
#else #else
@@ -539,9 +540,12 @@ static int test_wolfSSL_SetMinVersion(void)
WOLFSSL* ssl; WOLFSSL* ssl;
int failFlag, itr; int failFlag, itr;
const char* versionsVar[] = { "retV1", "retV1_1", "retV1_2" }; #ifndef NO_OLD_TLS
const int versions[] = { WOLFSSL_TLSV1, WOLFSSL_TLSV1_1, const int versions[] = { WOLFSSL_TLSV1, WOLFSSL_TLSV1_1,
WOLFSSL_TLSV1_2}; WOLFSSL_TLSV1_2};
#else
const int versions[] = { WOLFSSL_TLSV1_2 };
#endif
failFlag = SSL_SUCCESS; failFlag = SSL_SUCCESS;
AssertTrue(wolfSSL_Init()); AssertTrue(wolfSSL_Init());
@@ -550,7 +554,7 @@ static int test_wolfSSL_SetMinVersion(void)
printf(testingFmt, "wolfSSL_SetMinVersion()"); printf(testingFmt, "wolfSSL_SetMinVersion()");
for (itr = 0; itr < (int)(sizeof(versionsVar)/sizeof(char*)); itr++){ for (itr = 0; itr < (int)(sizeof(versions)/sizeof(int)); itr++){
if(wolfSSL_SetMinVersion(ssl, *(versions + itr)) != SSL_SUCCESS){ if(wolfSSL_SetMinVersion(ssl, *(versions + itr)) != SSL_SUCCESS){
failFlag = SSL_FAILURE; failFlag = SSL_FAILURE;
} }
@@ -1917,9 +1921,12 @@ static int test_wolfSSL_CTX_SetMinVersion(void)
WOLFSSL_CTX* ctx; WOLFSSL_CTX* ctx;
int failFlag, itr; int failFlag, itr;
const char* versionsVar[] = { "retV1", "retV1_1", "retV1_2" }; #ifndef NO_OLD_TLS
const int versions[] = { WOLFSSL_TLSV1, WOLFSSL_TLSV1_1, const int versions[] = { WOLFSSL_TLSV1, WOLFSSL_TLSV1_1,
WOLFSSL_TLSV1_2 }; WOLFSSL_TLSV1_2 };
#else
const int versions[] = { WOLFSSL_TLSV1_2 };
#endif
failFlag = SSL_SUCCESS; failFlag = SSL_SUCCESS;
@@ -1928,7 +1935,7 @@ static int test_wolfSSL_CTX_SetMinVersion(void)
printf(testingFmt, "wolfSSL_CTX_SetMinVersion()"); printf(testingFmt, "wolfSSL_CTX_SetMinVersion()");
for (itr = 0; itr < (int)(sizeof(versionsVar)/sizeof(char*)); itr++){ for (itr = 0; itr < (int)(sizeof(versions)/sizeof(int)); itr++){
if(wolfSSL_CTX_SetMinVersion(ctx, *(versions + itr)) != SSL_SUCCESS){ if(wolfSSL_CTX_SetMinVersion(ctx, *(versions + itr)) != SSL_SUCCESS){
failFlag = SSL_FAILURE; failFlag = SSL_FAILURE;
} }