propagate from branch 'net.randombit.botan' (head fc86fc4842254088bf820ea6ebf05877aa63fb22)

            to branch 'net.randombit.botan.c++0x' (head 77565ff7252df7f8faad86d65075498b0adb93d8)

3 files changed, 163 insertions, 0 deletions

diff --git a/src/pubkey/ecdh/ecdh.cpp b/src/pubkey/ecdh/ecdh.cpp
new file mode 100644
index 000000000..7577a8569
--- /dev/null
+++ b/src/pubkey/ecdh/ecdh.cpp
@@ -0,0 +1,51 @@
+/*
+* ECDH implemenation
+* (C) 2007 Manuel Hartl, FlexSecure GmbH
+*     2007 Falko Strenzke, FlexSecure GmbH
+*     2008-2010 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
+
+#include <botan/ecdh.h>
+
+namespace Botan {
+
+/**
+* Derive a key
+*/
+SecureVector<byte> ECDH_PrivateKey::derive_key(const byte key[],
+                                               u32bit key_len) const
+   {
+   MemoryVector<byte> key_x(key, key_len); // FIXME: nasty/slow
+   PointGFp point = OS2ECP(key_x, public_point().get_curve());
+
+   return derive_key(point);
+   }
+
+/**
+* Derive a key
+*/
+SecureVector<byte> ECDH_PrivateKey::derive_key(const ECDH_PublicKey& key) const
+   {
+   return derive_key(key.public_point());
+   }
+
+/**
+* Derive a key
+*/
+SecureVector<byte> ECDH_PrivateKey::derive_key(const PointGFp& point) const
+   {
+   const BigInt& cofactor = domain().get_cofactor();
+   const BigInt& n = domain().get_order();
+
+   BigInt l = inverse_mod(cofactor, n); // can precompute this
+
+   PointGFp S = (cofactor * point) * (private_value() * l);
+   S.check_invariants();
+
+   return BigInt::encode_1363(S.get_affine_x(),
+                              point.get_curve().get_p().bytes());
+   }
+
+}
diff --git a/src/pubkey/ecdh/ecdh.h b/src/pubkey/ecdh/ecdh.h
new file mode 100644
index 000000000..630237edf
--- /dev/null
+++ b/src/pubkey/ecdh/ecdh.h
@@ -0,0 +1,102 @@
+/*
+* ECDH
+* (C) 2007 Falko Strenzke, FlexSecure GmbH
+*          Manuel Hartl, FlexSecure GmbH
+* (C) 2008-2010 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
+
+#ifndef BOTAN_ECDH_KEY_H__
+#define BOTAN_ECDH_KEY_H__
+
+#include <botan/ecc_key.h>
+
+namespace Botan {
+
+/**
+* This class represents ECDH Public Keys.
+*/
+class BOTAN_DLL ECDH_PublicKey : public virtual EC_PublicKey
+   {
+   public:
+
+      /**
+      * Default constructor. Use this one if you want to later fill
+      * this object with data from an encoded key.
+      */
+      ECDH_PublicKey() {}
+
+      /**
+      * Construct a public key from a given public point.
+      * @param dom_par the domain parameters associated with this key
+      * @param public_point the public point defining this key
+      */
+      ECDH_PublicKey(const EC_Domain_Params& dom_par,
+                     const PointGFp& public_point) :
+         EC_PublicKey(dom_par, public_point) {}
+
+      /**
+      * Get this keys algorithm name.
+      * @result this keys algorithm name
+      */
+      std::string algo_name() const { return "ECDH"; }
+
+      /**
+      * Get the maximum number of bits allowed to be fed to this key.
+      * This is the bitlength of the order of the base point.
+
+      * @result the maximum number of input bits
+      */
+      u32bit max_input_bits() const { return domain().get_order().bits(); }
+   };
+
+/**
+* This class represents ECDH Private Keys.
+*/
+class BOTAN_DLL ECDH_PrivateKey : public ECDH_PublicKey,
+                                  public EC_PrivateKey,
+                                  public PK_Key_Agreement_Key
+   {
+   public:
+
+      /**
+      * Default constructor. Use this one if you want to later fill
+      * this object with data from an encoded key.
+      */
+      ECDH_PrivateKey() {}
+
+      /**
+      * Generate a new private key
+      * @param the domain parameters to used for this key
+      */
+      ECDH_PrivateKey(RandomNumberGenerator& rng,
+                      const EC_Domain_Params& domain) :
+         EC_PrivateKey(rng, domain) {}
+
+      MemoryVector<byte> public_value() const
+         { return EC2OSP(public_point(), PointGFp::UNCOMPRESSED); }
+
+      /**
+      * Derive a shared key with the other parties public key.
+      * @param key the other partys public key
+      * @param key_len the other partys public key
+      */
+      SecureVector<byte> derive_key(const byte key[], u32bit key_len) const;
+
+      /**
+      * Derive a shared key with the other parties public key.
+      * @param other the other partys public key
+      */
+      SecureVector<byte> derive_key(const ECDH_PublicKey& other) const;
+
+      /**
+      * Derive a shared key with the other parties public key.
+      * @param point the public point of the other parties key
+      */
+      SecureVector<byte> derive_key(const PointGFp& point) const;
+   };
+
+}
+
+#endif
diff --git a/src/pubkey/ecdh/info.txt b/src/pubkey/ecdh/info.txt
new file mode 100644
index 000000000..12826c81b
--- /dev/null
+++ b/src/pubkey/ecdh/info.txt
@@ -0,0 +1,10 @@
+define ECDH
+
+<requires>
+alloc
+asn1
+ec_dompar
+ecc_key
+libstate
+numbertheory
+</requires>