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

Test fixes

Browse Source 
Config fixes
Fix windows FIPS
This commit is contained in:
Juliusz Sosinowicz
2020-03-17 17:46:10 +01:00
parent 680a481e61
commit b4d9007a48
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/ssl.c
View File

@@ -17762,6 +17762,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
} }
#endif /* WOLFSSL_AES_256 */ #endif /* WOLFSSL_AES_256 */
#endif /* HAVE_AES_CBC */ #endif /* HAVE_AES_CBC */
#if !defined(_WIN32) && !defined(HAVE_FIPS)
#ifdef HAVE_AESGCM #ifdef HAVE_AESGCM
#ifdef WOLFSSL_AES_128 #ifdef WOLFSSL_AES_128
if (ctx->cipherType == AES_128_GCM_TYPE || if (ctx->cipherType == AES_128_GCM_TYPE ||
@@ -17839,6 +17840,7 @@ int wolfSSL_EVP_MD_type(const WOLFSSL_EVP_MD *md)
} }
#endif /* WOLFSSL_AES_256 */ #endif /* WOLFSSL_AES_256 */
#endif /* HAVE_AESGCM */ #endif /* HAVE_AESGCM */
#endif /* !defined(_WIN32) && !defined(HAVE_FIPS) */
#ifdef WOLFSSL_AES_COUNTER #ifdef WOLFSSL_AES_COUNTER
#ifdef WOLFSSL_AES_128 #ifdef WOLFSSL_AES_128
if (ctx->cipherType == AES_128_CTR_TYPE || if (ctx->cipherType == AES_128_CTR_TYPE ||
@@ -38676,8 +38678,8 @@ int wolfSSL_RSA_LoadDer_ex(WOLFSSL_RSA* rsa, const unsigned char* derBuf,
return WOLFSSL_SUCCESS; return WOLFSSL_SUCCESS;
} }
#if defined(OPENSSL_ALL) || defined(WOLFSSL_ASIO) || defined(WOLFSSL_HAPROXY) \ #if defined(WC_RSA_PSS) && (defined(OPENSSL_ALL) || defined(WOLFSSL_ASIO) || \
|| defined(WOLFSSL_NGINX) defined(WOLFSSL_HAPROXY) || defined(WOLFSSL_NGINX))
static int hash2mgf(enum wc_HashType hType) static int hash2mgf(enum wc_HashType hType)
{ {
switch (hType) { switch (hType) {
@@ -48866,8 +48868,7 @@ int wolfSSL_RSA_private_decrypt(int len, const unsigned char* fr,
return ret; return ret;
} }
#if !defined(_WIN32) && !defined(HAVE_FIPS)
int wolfSSL_RSA_public_decrypt(int flen, const unsigned char* from, int wolfSSL_RSA_public_decrypt(int flen, const unsigned char* from,
unsigned char* to, WOLFSSL_RSA* rsa, int padding) unsigned char* to, WOLFSSL_RSA* rsa, int padding)
{ {
@@ -48919,8 +48920,7 @@ int wolfSSL_RSA_public_decrypt(int flen, const unsigned char* from,
} }
return tlen; return tlen;
} }
#endif /* !defined(_WIN32) && !defined(HAVE_FIPS) */
/* RSA private encrypt calls wc_RsaSSL_Sign. Similar function set up as RSA /* RSA private encrypt calls wc_RsaSSL_Sign. Similar function set up as RSA
* public decrypt. * public decrypt.

4
tests/api.c
View File

@@ -16051,10 +16051,10 @@ static int test_wc_ecc_check_key (void)
static int test_wc_ecc_get_generator(void) static int test_wc_ecc_get_generator(void)
{ {
int ret = 0; int ret = 0;
#if defined(HAVE_ECC) && !defined(WC_NO_RNG) #if defined(HAVE_ECC) && !defined(WC_NO_RNG) && !defined(HAVE_SELFTEST) && \
!defined(HAVE_FIPS)
ecc_point* pt; ecc_point* pt;
printf(testingFmt, "wc_ecc_new_point()"); printf(testingFmt, "wc_ecc_new_point()");
pt = wc_ecc_new_point(); pt = wc_ecc_new_point();