The unified diff between revisions [695f5995..] and [51b865be..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'checks/dolook2.cpp'

#
#
# patch "checks/dolook2.cpp"
#  from [faa43ba0202c8fc388d0b6f099957bcc52ea9578]
#    to [6e047326952c5f224d647e9e9407209728bc0627]
#
============================================================
--- checks/dolook2.cpp	faa43ba0202c8fc388d0b6f099957bcc52ea9578
+++ checks/dolook2.cpp	6e047326952c5f224d647e9e9407209728bc0627
@@ -1,5 +1,3 @@
-/* This file is in the public domain */
-
 #include <vector>
 #include <string>
 #include <cstdlib>
@@ -10,7 +8,7 @@
 #include <botan/filters.h>
 #include <botan/randpool.h>
 #include <botan/x931_rng.h>
-#include <botan/rng.h>
+#include <botan/libstate.h>
 using namespace Botan;

 /* A weird little hack to fit S2K algorithms into the validation suite
@@ -21,7 +19,7 @@ class S2K_Filter : public Filter
    {
    public:
       void write(const byte in[], u32bit len)
-         { passphrase += std::string((const char*)in, len); }
+         { passphrase += std::string(reinterpret_cast<const char*>(in), len); }
       void end_msg()
          {
          s2k->change_salt(salt, salt.size());
@@ -51,7 +49,7 @@ class RNG_Filter : public Filter
       void write(const byte[], u32bit);
       RNG_Filter(RandomNumberGenerator* r) : rng(r), buffer(1024)
          {
-         Global_RNG::randomize(buffer, buffer.size());
+         global_state().randomize(buffer, buffer.size());
          rng->add_entropy(buffer, buffer.size());
          }
       ~RNG_Filter() { delete rng; }