Rename ECKAEG to ECDH. As far as I can tell they are the same algorithm,

I'm not sure where the old name came from though as literally the only
hits for it on Google are botan-related.

1 files changed, 72 insertions, 0 deletions

diff --git a/src/pubkey/ecdh/ecdh.cpp b/src/pubkey/ecdh/ecdh.cpp
new file mode 100644
index 000000000..2ddc371b2
--- /dev/null
+++ b/src/pubkey/ecdh/ecdh.cpp
@@ -0,0 +1,72 @@
+/*
+* 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>
+
+#include <iostream>
+
+namespace Botan {
+
+ECDH_PublicKey::ECDH_PublicKey(const EC_Domain_Params& dom_par,
+                               const PointGFp& pub_point)
+   {
+   domain_params = dom_par;
+   public_key = pub_point;
+
+   if(domain().get_curve() != public_point().get_curve())
+      throw Invalid_Argument("ECDH_PublicKey: curve mismatch in constructor");
+   }
+
+ECDH_PrivateKey::ECDH_PrivateKey(RandomNumberGenerator& rng,
+                                 const EC_Domain_Params& dom_pars)
+   {
+   domain_params = dom_pars;
+   generate_private_key(rng);
+   }
+
+/**
+* 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();
+
+   //PointGFp S = point * private_value();
+
+   return BigInt::encode_1363(S.get_affine_x(),
+                              point.get_curve().get_p().bytes());
+   }
+
+}