commit a27cd4c62e7c9aea2104cd2d42702abb06fec150
author Manuel Pégourié-Gonnard <mpg@elzevir.fr> Wed Apr 02 13:46:29 2014 +0200
committer Manuel Pégourié-Gonnard <mpg@elzevir.fr> Wed Apr 02 13:46:29 2014 +0200
tree 064964fbc16503fc1621972e65844c8e8da52a5d
parent eb82a74ed2b333386ab985e4d05329aef93a7c41

Fix ENTROPY_LEN check

include/polarssl/config.h

diff --git a/include/polarssl/config.h b/include/polarssl/config.h
index 1681e1b..83aa9a3 100644
--- a/include/polarssl/config.h
+++ b/include/polarssl/config.h
@@ -2119,8 +2119,9 @@
     defined(POLARSSL_CONFIG_OPTIONS) && (CTR_DRBG_ENTROPY_LEN > 64)
 #error "CTR_DRBG_ENTROPY_LEN value too high"
 #endif
-#if defined(POLARSSL_ENTROPY_C) && !defined(POLARSSL_SHA512_C) &&        \
-    defined(POLARSSL_CONFIG_OPTIONS) && (CTR_DRBG_ENTROPY_LEN > 32)
+#if defined(POLARSSL_ENTROPY_C) &&                                            \
+    ( !defined(POLARSSL_SHA512_C) || defined(POLARSSL_ENTROPY_FORCE_SHA256) ) \
+    && defined(POLARSSL_CONFIG_OPTIONS) && (CTR_DRBG_ENTROPY_LEN > 32)
 #error "CTR_DRBG_ENTROPY_LEN value too high"
 #endif
 #if defined(POLARSSL_ENTROPY_C) && \