From 27c6625bfecd497d1bff70d499ac8afefe31e3ed Mon Sep 17 00:00:00 2001 From: Go Hosohara Date: Mon, 10 Apr 2017 14:44:48 +0900 Subject: [PATCH] Fix #ifdef in WolfSSL_DES_ecb_encrypt and test_WolfSSL_DES_ecb_encrypt. --- src/ssl.c | 4 ++-- tests/api.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ssl.c b/src/ssl.c index b03d7dc49..392b91b3d 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -15793,10 +15793,10 @@ void wolfSSL_DES_set_odd_parity(WOLFSSL_DES_cblock* myDes) } +#ifdef WOLFSSL_DES_ECB void wolfSSL_DES_ecb_encrypt(WOLFSSL_DES_cblock* desa, WOLFSSL_DES_cblock* desb, WOLFSSL_DES_key_schedule* key, int dir) { -#ifdef WOLFSSL_DES_ECB WOLFSSL_ENTER("wolfSSL_DES_ecb_encrypt"); Des3 enc; @@ -15810,8 +15810,8 @@ void wolfSSL_DES_ecb_encrypt(WOLFSSL_DES_cblock* desa, WOLFSSL_MSG("wc_Des3_EcbEncrpyt return error."); } } -#endif } +#endif #endif /* NO_DES3 */ diff --git a/tests/api.c b/tests/api.c index c9f7221c1..a7a55e670 100644 --- a/tests/api.c +++ b/tests/api.c @@ -3030,7 +3030,7 @@ static void test_wolfSSL_BIO(void) static void test_wolfSSL_DES_ecb_encrypt(void) { - #if defined(OPENSSL_EXTRA) && !defined(NO_DES3) + #if defined(OPENSSL_EXTRA) && !defined(NO_DES3) && defined(WOLFSSL_DES_ECB) WOLFSSL_DES_cblock input1,input2,output1,output2,back1,back2; WOLFSSL_DES_key_schedule key;