commit 4fde40f656a000486c2898e8a0842ea7a92e875f
author Paul Bakker <paul.bakker@arm.com> Mon May 09 15:13:04 2016 +0100
committer Simon Butcher <simon.butcher@arm.com> Mon May 23 14:29:30 2016 +0100
tree 26aea2a87e31015c0395fd10e808669ae33f45b7
parent 37068a79fe27eb277a8e675b3e05af76cc64d56a

Fix logic to allow at least one PKCS version enabled

include/mbedtls/check_config.h

diff --git a/include/mbedtls/check_config.h b/include/mbedtls/check_config.h
index 8c0c689..d31555d 100644
--- a/include/mbedtls/check_config.h
+++ b/include/mbedtls/check_config.h
@@ -362,7 +362,7 @@
 #error "MBEDTLS_RSA_C defined, but not all prerequisites"
 #endif
 
-#if defined(MBEDTLS_RSA_C) && ( !defined(MBEDTLS_PKCS1_V21) ||         \
+#if defined(MBEDTLS_RSA_C) && ( !defined(MBEDTLS_PKCS1_V21) &&         \
     !defined(MBEDTLS_PKCS1_V15) )
 #error "MBEDTLS_RSA_C defined, but none of the PKCS1 versions enabled"
 #endif