The unified diff between revisions [2fac918f..] and [4e40e885..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'include/libstate.h'

#
#
# patch "include/libstate.h"
#  from [447f0bbcbc4387c2622e86efd374413784764484]
#    to [cc522cb9ab803f77a13c05a42addb46e0272cdcc]
#
============================================================
--- include/libstate.h	447f0bbcbc4387c2622e86efd374413784764484
+++ include/libstate.h	cc522cb9ab803f77a13c05a42addb46e0272cdcc
@@ -42,19 +42,13 @@ class BOTAN_DLL Library_State
          };
       friend class Engine_Iterator;

-      class BOTAN_DLL UI
-         {
-         public:
-            virtual void pulse(Pulse_Type) {}
-            virtual ~UI() {}
-         };
-
       Allocator* get_allocator(const std::string& = "") const;
       void add_allocator(Allocator*);
       void set_default_allocator(const std::string&) const;

       bool rng_is_seeded() const { return rng->is_seeded(); }
       void randomize(byte[], u32bit);
+      byte random();

       void set_prng(RandomNumberGenerator*);
       void add_entropy_source(EntropySource*, bool = true);
@@ -62,22 +56,9 @@ class BOTAN_DLL Library_State
       void add_entropy(EntropySource&, bool);
       u32bit seed_prng(bool, u32bit);

-      void set_timer(class Timer*);
-      u64bit system_clock() const;
-
       class Config& config() const;

       class Mutex* get_mutex() const;
-
-      void set_x509_state(class X509_GlobalState*);
-      class X509_GlobalState& x509_state();
-
-      void pulse(Pulse_Type) const;
-      void set_ui(UI*);
-
-      void set_transcoder(class Charset_Transcoder*);
-      std::string transcode(const std::string,
-                            Character_Set, Character_Set) const;
    private:
       Library_State(const Library_State&) {}
       Library_State& operator=(const Library_State&) { return (*this); }
@@ -89,15 +70,11 @@ class BOTAN_DLL Library_State
       class Mutex* engine_lock;
       class Mutex* rng_lock;

-      class Timer* timer;
       mutable class Config* config_obj;
-      class X509_GlobalState* x509_state_obj;

       std::map<std::string, Allocator*> alloc_factory;
       mutable Allocator* cached_default_allocator;

-      UI* ui;
-      class Charset_Transcoder* transcoder;
       RandomNumberGenerator* rng;
       std::vector<Allocator*> allocators;
       std::vector<EntropySource*> entropy_sources;