The unified diff between revisions [8ae107f9..] and [f00ecee7..] 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 [37bf56072f24c843ac66295bd79544e283de9737]
# to [6e047326952c5f224d647e9e9407209728bc0627]
#
============================================================
--- checks/dolook2.cpp 37bf56072f24c843ac66295bd79544e283de9737
+++ checks/dolook2.cpp 6e047326952c5f224d647e9e9407209728bc0627
@@ -8,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
@@ -19,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());
@@ -49,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; }