Merge branch 'master' of git://git-nokia.trolltech.com.au/qtsoftware/research/qtuitest

1 files changed, 53 insertions, 0 deletions

diff --git a/botan/build/botan/pbes2.h b/botan/build/botan/pbes2.h
new file mode 100644
index 0000000..fc460a2
--- /dev/null
+++ b/botan/build/botan/pbes2.h
@@ -0,0 +1,53 @@
+/*
+* PKCS #5 v2.0 PBE
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
+
+#ifndef BOTAN_PBE_PKCS_v20_H__
+#define BOTAN_PBE_PKCS_v20_H__
+
+#include <botan/pbe.h>
+#include <botan/block_cipher.h>
+#include <botan/hash.h>
+#include <botan/pipe.h>
+
+namespace Botan {
+
+/*
+* PKCS#5 v2.0 PBE
+*/
+class BOTAN_DLL PBE_PKCS5v20 : public PBE
+   {
+   public:
+      static bool known_cipher(const std::string&);
+
+      void write(const byte[], u32bit);
+      void start_msg();
+      void end_msg();
+
+      PBE_PKCS5v20(DataSource&);
+      PBE_PKCS5v20(BlockCipher*, HashFunction*);
+
+      ~PBE_PKCS5v20();
+   private:
+      void set_key(const std::string&);
+      void new_params(RandomNumberGenerator& rng);
+      MemoryVector<byte> encode_params() const;
+      void decode_params(DataSource&);
+      OID get_oid() const;
+
+      void flush_pipe(bool);
+
+      Cipher_Dir direction;
+      BlockCipher* block_cipher;
+      HashFunction* hash_function;
+      SecureVector<byte> salt, key, iv;
+      u32bit iterations, key_length;
+      Pipe pipe;
+   };
+
+}
+
+#endif