Append _prf to sslv3, tlsv1, x932 module names

3 files changed, 133 insertions, 0 deletions

diff --git a/src/kdf/x942_prf/info.txt b/src/kdf/x942_prf/info.txt
new file mode 100644
index 000000000..096745dce
--- /dev/null
+++ b/src/kdf/x942_prf/info.txt
@@ -0,0 +1,15 @@
+realname "X942 PRF"
+
+define X942_PRF
+
+load_on auto
+
+<requires>
+core
+oid_lookup
+</requires>
+
+<add>
+prf_x942.cpp
+prf_x942.h
+</add>
diff --git a/src/kdf/x942_prf/prf_x942.cpp b/src/kdf/x942_prf/prf_x942.cpp
new file mode 100644
index 000000000..3a7298771
--- /dev/null
+++ b/src/kdf/x942_prf/prf_x942.cpp
@@ -0,0 +1,89 @@
+/*************************************************
+* X9.42 PRF Source File                          *
+* (C) 1999-2007 Jack Lloyd                       *
+*************************************************/
+
+#include <botan/prf_x942.h>
+#include <botan/der_enc.h>
+#include <botan/oids.h>
+#include <botan/lookup.h>
+#include <botan/loadstor.h>
+#include <algorithm>
+#include <memory>
+
+namespace Botan {
+
+namespace {
+
+/*************************************************
+* Encode an integer as an OCTET STRING           *
+*************************************************/
+MemoryVector<byte> encode_x942_int(u32bit n)
+   {
+   byte n_buf[4] = { 0 };
+   store_be(n, n_buf);
+   return DER_Encoder().encode(n_buf, 4, OCTET_STRING).get_contents();
+   }
+
+}
+
+/*************************************************
+* X9.42 PRF                                      *
+*************************************************/
+SecureVector<byte> X942_PRF::derive(u32bit key_len,
+                                    const byte secret[], u32bit secret_len,
+                                    const byte salt[], u32bit salt_len) const
+   {
+   std::auto_ptr<HashFunction> hash(get_hash("SHA-1"));
+   const OID kek_algo(key_wrap_oid);
+
+   SecureVector<byte> key;
+   u32bit counter = 1;
+
+   while(key.size() != key_len && counter)
+      {
+      hash->update(secret, secret_len);
+
+      hash->update(
+         DER_Encoder().start_cons(SEQUENCE)
+
+            .start_cons(SEQUENCE)
+               .encode(kek_algo)
+               .raw_bytes(encode_x942_int(counter))
+            .end_cons()
+
+            .encode_if(salt_len != 0,
+               DER_Encoder()
+                  .start_explicit(0)
+                     .encode(salt, salt_len, OCTET_STRING)
+                  .end_explicit()
+               )
+
+            .start_explicit(2)
+               .raw_bytes(encode_x942_int(8 * key_len))
+            .end_explicit()
+
+         .end_cons().get_contents()
+         );
+
+      SecureVector<byte> digest = hash->final();
+      key.append(digest, std::min(digest.size(), key_len - key.size()));
+
+      ++counter;
+      }
+
+   return key;
+   }
+
+/*************************************************
+* X9.42 Constructor                              *
+*************************************************/
+X942_PRF::X942_PRF(const std::string& oid)
+   {
+   if(OIDS::have_oid(oid))
+      key_wrap_oid = OIDS::lookup(oid).as_string();
+   else
+      key_wrap_oid = oid;
+   }
+
+}
diff --git a/src/kdf/x942_prf/prf_x942.h b/src/kdf/x942_prf/prf_x942.h
new file mode 100644
index 000000000..3b5bb93c0
--- /dev/null
+++ b/src/kdf/x942_prf/prf_x942.h
@@ -0,0 +1,29 @@
+/*************************************************
+* X9.42 PRF Header File                          *
+* (C) 1999-2007 Jack Lloyd                       *
+*************************************************/
+
+#ifndef BOTAN_ANSI_X942_PRF_H__
+#define BOTAN_ANSI_X942_PRF_H__
+
+#include <botan/kdf.h>
+
+namespace Botan {
+
+/*************************************************
+* X9.42 PRF                                      *
+*************************************************/
+class BOTAN_DLL X942_PRF : public KDF
+   {
+   public:
+      SecureVector<byte> derive(u32bit, const byte[], u32bit,
+                                const byte[], u32bit) const;
+
+      X942_PRF(const std::string&);
+   private:
+      std::string key_wrap_oid;
+   };
+
+}
+
+#endif