The unified diff between revisions [c8611a24..] and [51b865be..] 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 [6217b172b8acec9c985be72bfd4fde3cbd51586e]
#    to [723c0621d44f4e256cb7f45a809707bea2089af9]
#
============================================================
--- include/libstate.h	6217b172b8acec9c985be72bfd4fde3cbd51586e
+++ include/libstate.h	723c0621d44f4e256cb7f45a809707bea2089af9
@@ -1,15 +1,13 @@
 /*************************************************
 * Library Internal/Global State Header File      *
-* (C) 1999-2007 The Botan Project                *
+* (C) 1999-2008 Jack Lloyd                       *
 *************************************************/

 #ifndef BOTAN_LIB_STATE_H__
 #define BOTAN_LIB_STATE_H__

 #include <botan/base.h>
-#include <botan/enums.h>
 #include <botan/init.h>
-#include <botan/ui.h>
 #include <string>
 #include <vector>
 #include <map>
@@ -19,7 +17,7 @@ namespace Botan {
 /*************************************************
 * Global State Container Base                    *
 *************************************************/
-class Library_State
+class BOTAN_DLL Library_State
    {
    public:
       Library_State();
@@ -31,7 +29,7 @@ class Library_State

       void add_engine(class Engine*);

-      class Engine_Iterator
+      class BOTAN_DLL Engine_Iterator
          {
          public:
             class Engine* next();
@@ -48,6 +46,7 @@ class Library_State

       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);
@@ -55,18 +54,9 @@ class Library_State
       void add_entropy(EntropySource&, bool);
       u32bit seed_prng(bool, u32bit);

-      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 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); }
@@ -74,30 +64,28 @@ class Library_State
       class Engine* get_engine_n(u32bit) const;

       class Mutex_Factory* mutex_factory;
-      class Mutex* allocator_lock;
-      class Mutex* engine_lock;
-      class Mutex* rng_lock;

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

+      class Mutex* allocator_lock;
       std::map<std::string, Allocator*> alloc_factory;
       mutable Allocator* cached_default_allocator;

-      class Charset_Transcoder* transcoder;
+      class Mutex* rng_lock;
       RandomNumberGenerator* rng;
       std::vector<Allocator*> allocators;
       std::vector<EntropySource*> entropy_sources;
+
+      class Mutex* engine_lock;
       std::vector<class Engine*> engines;
    };

 /*************************************************
 * Global State                                   *
 *************************************************/
-Library_State& global_state();
-void set_global_state(Library_State*);
-Library_State* swap_global_state(Library_State*);
+BOTAN_DLL Library_State& global_state();
+BOTAN_DLL void set_global_state(Library_State*);
+BOTAN_DLL Library_State* swap_global_state(Library_State*);

 }