1 files changed, 49 insertions, 1 deletions

diff --git a/src/tests/test_rng.cpp b/src/tests/test_rng.cpp
index 76e0d28ea..db532054c 100644
--- a/src/tests/test_rng.cpp
+++ b/src/tests/test_rng.cpp
@@ -1,5 +1,5 @@
 /*
-* (C) 2014,2015 Jack Lloyd
+* (C) 2014,2015,2017 Jack Lloyd
 * (C) 2016 René Korthaus, Rohde & Schwarz Cybersecurity
 *
 * Botan is released under the Simplified BSD License (see license.txt)
@@ -20,6 +20,10 @@
    #include <botan/system_rng.h>
 #endif
 
+#if defined(BOTAN_HAS_CHACHA_RNG)
+   #include <botan/chacha_rng.h>
+#endif
+
 #if defined(BOTAN_HAS_RDRAND_RNG)
    #include <botan/rdrand_rng.h>
    #include <botan/cpuid.h>
@@ -62,6 +66,7 @@ class HMAC_DRBG_Tests : public Text_Based_Test
          Test::Result result("HMAC_DRBG(" + algo + ")");
 
          auto mac = Botan::MessageAuthenticationCode::create("HMAC(" + algo + ")");
+
          if(!mac)
             {
             result.note_missing("HMAC(" + algo + ")");
@@ -603,6 +608,49 @@ BOTAN_REGISTER_TEST("hmac_drbg_unit", HMAC_DRBG_Unit_Tests);
 
 #endif
 
+
+#if defined(BOTAN_HAS_CHACHA_RNG)
+
+class ChaCha_RNG_Tests : public Text_Based_Test
+   {
+   public:
+      ChaCha_RNG_Tests()
+         : Text_Based_Test("rng/chacha_rng.vec",
+                           "EntropyInput,EntropyInputReseed,Out",
+                           "AdditionalInput1,AdditionalInput2") {}
+
+      Test::Result run_one_test(const std::string& algo, const VarMap& vars) override
+         {
+         const std::vector<uint8_t> seed_input   = get_req_bin(vars, "EntropyInput");
+         const std::vector<uint8_t> reseed_input = get_req_bin(vars, "EntropyInputReseed");
+         const std::vector<uint8_t> expected     = get_req_bin(vars, "Out");
+
+         const std::vector<uint8_t> ad1 = get_opt_bin(vars, "AdditionalInput1");
+         const std::vector<uint8_t> ad2 = get_opt_bin(vars, "AdditionalInput2");
+
+         Test::Result result("ChaCha_RNG");
+
+         Botan::ChaCha_RNG rng;
+         rng.initialize_with(seed_input.data(), seed_input.size());
+
+         // now reseed
+         rng.add_entropy(reseed_input.data(), reseed_input.size());
+
+         std::vector<uint8_t> out(expected.size());
+         // first block is discarded
+         rng.randomize_with_input(out.data(), out.size(), ad1.data(), ad1.size());
+         rng.randomize_with_input(out.data(), out.size(), ad2.data(), ad2.size());
+
+         result.test_eq("rng", out, expected);
+         return result;
+         }
+
+   };
+
+BOTAN_REGISTER_TEST("chacha_rng", ChaCha_RNG_Tests);
+
+#endif
+
 #if defined(BOTAN_HAS_AUTO_RNG)
 
 class AutoSeeded_RNG_Tests : public Test