commit c796573487178f527654e871d71352b40ca01caa
author Simon Butcher <simon.butcher@arm.com> Fri Jul 27 17:13:39 2018 +0100
committer Simon Butcher <simon.butcher@arm.com> Fri Jul 27 17:13:39 2018 +0100
tree 3fa17927c610b92a2f68b872f9a3d1acbff319b2
parent 6c34268e203d23bbfbfda3f7362dac8b9b9382bc

Add Chacha dependency to the stream cipher field

When MBEDTLS_ARC4_C and MBEDTLS_CIPHER_NULL_CIPHER were disabled, the stream
cipher function wasn't being include in the cipher struct, yet Chacha20 requires
it.

include/mbedtls/cipher.h

diff --git a/include/mbedtls/cipher.h b/include/mbedtls/cipher.h
index ea0ce98..7f3477a 100644
--- a/include/mbedtls/cipher.h
+++ b/include/mbedtls/cipher.h
@@ -45,7 +45,8 @@
 #define MBEDTLS_CIPHER_MODE_WITH_PADDING
 #endif
 
-#if defined(MBEDTLS_ARC4_C) || defined(MBEDTLS_CIPHER_NULL_CIPHER)
+#if defined(MBEDTLS_ARC4_C) || defined(MBEDTLS_CIPHER_NULL_CIPHER) || \
+    defined(MBEDTLS_CHACHA20_C)
 #define MBEDTLS_CIPHER_MODE_STREAM
 #endif