Merge pull request #313 from kaleb-himes/master

wolfssl.com and google.com now differ in pre-reqs for external test
pull/314/merge
toddouska 2016-02-16 11:05:55 -08:00
commit c1ef4d4521
1 changed files with 8 additions and 4 deletions

View File

@ -771,11 +771,15 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
#if !defined(HAVE_ECC) && !defined(WOLFSSL_STATIC_RSA) \ #if !defined(HAVE_ECC) && !defined(WOLFSSL_STATIC_RSA) \
|| ( defined(HAVE_ECC) && !defined(HAVE_SUPPORTED_CURVES) \ || ( defined(HAVE_ECC) && !defined(HAVE_SUPPORTED_CURVES) \
&& !defined(WOLFSSL_STATIC_RSA) ) && !defined(WOLFSSL_STATIC_RSA) )
if (!XSTRNCMP(domain, "www.google.com", 14) || /* google needs ECDHE+Supported Curves or static RSA */
!XSTRNCMP(domain, "www.wolfssl.com", 15)) { if (!XSTRNCMP(domain, "www.google.com", 14))
/* google/wolfssl need ECDHE or static RSA */ done += 1;
#endif
#if !defined(HAVE_ECC) && !defined(WOLFSSL_STATIC_RSA)
/* wolfssl needs ECDHE or static RSA */
if (!XSTRNCMP(domain, "www.wolfssl.com", 15))
done += 1; done += 1;
}
#endif #endif
#if !defined(WOLFSSL_SHA384) #if !defined(WOLFSSL_SHA384)