Add ChaCha

1 files changed, 35 insertions, 1 deletions

diff --git a/src/lib/engine/core_engine/lookup_stream.cpp b/src/lib/engine/core_engine/lookup_stream.cpp
index b26bbedcd..8461fadc9 100644
--- a/src/lib/engine/core_engine/lookup_stream.cpp
+++ b/src/lib/engine/core_engine/lookup_stream.cpp
@@ -7,11 +7,24 @@
 
 #include <botan/internal/core_engine.h>
 #include <botan/scan_name.h>
+#include <botan/algo_factory.h>
+
+#if defined(BOTAN_HAS_OFB)
+  #include <botan/ofb.h>
+#endif
+
+#if defined(BOTAN_HAS_CTR_BE)
+  #include <botan/ctr.h>
+#endif
 
 #if defined(BOTAN_HAS_RC4)
   #include <botan/rc4.h>
 #endif
 
+#if defined(BOTAN_HAS_CHACHA)
+  #include <botan/chacha.h>
+#endif
+
 #if defined(BOTAN_HAS_SALSA20)
   #include <botan/salsa20.h>
 #endif
@@ -23,8 +36,24 @@ namespace Botan {
 */
 StreamCipher*
 Core_Engine::find_stream_cipher(const SCAN_Name& request,
-                                Algorithm_Factory&) const
+                                Algorithm_Factory& af) const
    {
+#if defined(BOTAN_HAS_OFB)
+   if(request.algo_name() == "OFB" && request.arg_count() == 1)
+      {
+      const BlockCipher* proto = af.prototype_block_cipher(request.arg(0));
+      return new OFB(proto->clone());
+      }
+#endif
+
+#if defined(BOTAN_HAS_CTR_BE)
+   if(request.algo_name() == "CTR-BE" && request.arg_count() == 1)
+      {
+      const BlockCipher* proto = af.prototype_block_cipher(request.arg(0));
+      return new CTR_BE(proto->clone());
+      }
+#endif
+
 #if defined(BOTAN_HAS_RC4)
    if(request.algo_name() == "RC4")
       return new RC4(request.arg_as_integer(0, 0));
@@ -32,6 +61,11 @@ Core_Engine::find_stream_cipher(const SCAN_Name& request,
       return new RC4(768);
 #endif
 
+#if defined(BOTAN_HAS_CHACHA)
+   if(request.algo_name() == "ChaCha")
+      return new ChaCha;
+#endif
+
 #if defined(BOTAN_HAS_SALSA20)
    if(request.algo_name() == "Salsa20")
       return new Salsa20;