fix test_wolfSSL_CTX_load_verify_locations() build error

This commit is contained in:
Go Hosohara
2018-09-11 15:55:55 +09:00
parent cf5377ec5b
commit ca9f62713d
2 changed files with 2 additions and 4 deletions

View File

@ -51,13 +51,9 @@ int strncasecmp(const char *s1, const char * s2, unsigned int sz)
} }
if(toupper(*s1) > toupper(*s2)){ if(toupper(*s1) > toupper(*s2)){
return 1; return 1;
<<<<<<< HEAD
return 0;
=======
} }
} }
return 0; return 0;
>>>>>>> Refactor cs+ project
} }
void abort(void) void abort(void)

View File

@ -749,7 +749,9 @@ static void test_wolfSSL_CTX_load_verify_locations(void)
#if !defined(NO_WOLFSSL_DIR) && !defined(WOLFSSL_TIRTOS) #if !defined(NO_WOLFSSL_DIR) && !defined(WOLFSSL_TIRTOS)
const char* load_certs_path = "./certs/external"; const char* load_certs_path = "./certs/external";
const char* load_no_certs_path = "./examples"; const char* load_no_certs_path = "./examples";
#ifndef NO_RSA
const char* load_expired_path = "./certs/test/expired"; const char* load_expired_path = "./certs/test/expired";
#endif
#endif #endif
AssertNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_client_method())); AssertNotNull(ctx = wolfSSL_CTX_new(wolfSSLv23_client_method()));