Make the contents of Botan_types namespace be just using declarations,

instead of introducing new typedefs.

2 files changed, 42 insertions, 2 deletions

diff --git a/include/sha1prng.h b/include/sha1prng.h
new file mode 100644
index 000000000..e762cf069
--- /dev/null
+++ b/include/sha1prng.h
@@ -0,0 +1,40 @@
+/*************************************************
+* SHA1PRNG RNG Header File                       *
+* (C) 2007 FlexSecure GmbH / Manuel Hartl        *
+* (C) 2008 Jack Lloyd                            *
+*************************************************/
+
+#ifndef BOTAN_SHA1PRNG_H__
+#define BOTAN_SHA1PRNG_H__
+
+#include <botan/base.h>
+
+namespace Botan {
+
+/*************************************************
+* SHA1PRNG (propriery                            *
+*************************************************/
+class SHA1PRNG : public RandomNumberGenerator
+   {
+   public:
+      void randomize(byte[], u32bit) throw(PRNG_Unseeded);
+      bool is_seeded() const;
+      void clear() throw();
+      std::string name() const;
+
+      SHA1PRNG(RandomNumberGenerator* = 0);
+      ~SHA1PRNG();
+   private:
+      void add_randomness(const byte[], u32bit);
+      void update_state(byte[]);
+
+      RandomNumberGenerator* prng;
+      HashFunction* hash;
+      SecureVector<byte> buffer;
+      SecureVector<byte> state;
+      int buf_pos;
+   };
+
+}
+
+#endif
diff --git a/include/types.h b/include/types.h
index e3d93c157..49d1a3c4c 100644
--- a/include/types.h
+++ b/include/types.h
@@ -30,8 +30,8 @@ typedef signed int s32bit;
 
 namespace Botan_types {
 
-typedef Botan::byte byte;
-typedef Botan::u32bit u32bit;
+using Botan::byte;
+using Botan::u32bit;
 
 }