Add ECKAEG benchmark. Fix several problems found in ECKAEG key (had pure virtuals)

2 files changed, 59 insertions, 36 deletions

diff --git a/src/pubkey/eckaeg/eckaeg.cpp b/src/pubkey/eckaeg/eckaeg.cpp
index 424715ad8..a8a32d812 100644
--- a/src/pubkey/eckaeg/eckaeg.cpp
+++ b/src/pubkey/eckaeg/eckaeg.cpp
@@ -24,29 +24,31 @@ void ECKAEG_PublicKey::affirm_init() const // virtual
    EC_PublicKey::affirm_init();
    }
 
-void ECKAEG_PublicKey::set_all_values ( ECKAEG_PublicKey const& other )
+void ECKAEG_PublicKey::set_all_values(ECKAEG_PublicKey const& other)
    {
    m_param_enc = other.m_param_enc;
    m_eckaeg_core = other.m_eckaeg_core;
    m_enc_public_point = other.m_enc_public_point;
-   if ( other.mp_dom_pars.get() )
+   if(other.mp_dom_pars.get())
       {
-      mp_dom_pars.reset ( new EC_Domain_Params ( * ( other.mp_dom_pars ) ) );
+      mp_dom_pars.reset(new EC_Domain_Params(*(other.mp_dom_pars)));
       }
-   if ( other.mp_public_point.get() )
+   if(other.mp_public_point.get())
       {
-      mp_public_point.reset ( new PointGFp ( * ( other.mp_public_point ) ) );
+      mp_public_point.reset(new PointGFp(*(other.mp_public_point)));
       }
    }
-ECKAEG_PublicKey::ECKAEG_PublicKey ( ECKAEG_PublicKey const& other )
+
+ECKAEG_PublicKey::ECKAEG_PublicKey(ECKAEG_PublicKey const& other)
    : Public_Key(),
      EC_PublicKey()
    {
-   set_all_values ( other );
+   set_all_values(other);
    }
-ECKAEG_PublicKey const& ECKAEG_PublicKey::operator= ( ECKAEG_PublicKey const& rhs )
+
+ECKAEG_PublicKey const& ECKAEG_PublicKey::operator=(ECKAEG_PublicKey const& rhs)
    {
-   set_all_values ( rhs );
+   set_all_values(rhs);
    return *this;
    }
 
@@ -54,48 +56,49 @@ void ECKAEG_PublicKey::X509_load_hook()
    {
    EC_PublicKey::X509_load_hook();
    EC_PublicKey::affirm_init();
-   m_eckaeg_core = ECKAEG_Core ( *mp_dom_pars, BigInt ( 0 ), *mp_public_point );
+   m_eckaeg_core = ECKAEG_Core(*mp_dom_pars, BigInt(0), *mp_public_point);
    }
-ECKAEG_PublicKey::ECKAEG_PublicKey ( EC_Domain_Params const& dom_par, PointGFp const& public_point )
-   {
 
-   mp_dom_pars = std::auto_ptr<EC_Domain_Params> ( new EC_Domain_Params ( dom_par ) );
-   mp_public_point = std::auto_ptr<PointGFp> ( new PointGFp ( public_point ) );
+ECKAEG_PublicKey::ECKAEG_PublicKey(EC_Domain_Params const& dom_par, PointGFp const& public_point)
+   {
+   mp_dom_pars = std::auto_ptr<EC_Domain_Params>(new EC_Domain_Params(dom_par));
+   mp_public_point = std::auto_ptr<PointGFp>(new PointGFp(public_point));
    if(mp_public_point->get_curve() != mp_dom_pars->get_curve())
       {
       throw Invalid_Argument("ECKAEG_PublicKey(): curve of arg. point and curve of arg. domain parameters are different");
       }
    EC_PublicKey::affirm_init();
-   m_eckaeg_core = ECKAEG_Core ( *mp_dom_pars, BigInt ( 0 ), *mp_public_point );
+   m_eckaeg_core = ECKAEG_Core(*mp_dom_pars, BigInt(0), *mp_public_point);
    }
 
-
 /*********************************
-* ECKAEG_PrivateKey            *
+* ECKAEG_PrivateKey              *
 *********************************/
 void ECKAEG_PrivateKey::affirm_init() const // virtual
    {
    EC_PrivateKey::affirm_init();
    }
-void ECKAEG_PrivateKey::PKCS8_load_hook ( bool generated )
+
+void ECKAEG_PrivateKey::PKCS8_load_hook(bool generated)
    {
-   EC_PrivateKey::PKCS8_load_hook ( generated );
+   EC_PrivateKey::PKCS8_load_hook(generated);
    EC_PrivateKey::affirm_init();
-   m_eckaeg_core = ECKAEG_Core ( *mp_dom_pars, m_private_value, *mp_public_point );
+   m_eckaeg_core = ECKAEG_Core(*mp_dom_pars, m_private_value, *mp_public_point);
    }
-void ECKAEG_PrivateKey::set_all_values ( ECKAEG_PrivateKey const& other )
+
+void ECKAEG_PrivateKey::set_all_values(ECKAEG_PrivateKey const& other)
    {
    m_private_value = other.m_private_value;
    m_param_enc = other.m_param_enc;
    m_eckaeg_core = other.m_eckaeg_core;
    m_enc_public_point = other.m_enc_public_point;
-   if ( other.mp_dom_pars.get() )
+   if(other.mp_dom_pars.get())
       {
-      mp_dom_pars.reset ( new EC_Domain_Params ( * ( other.mp_dom_pars ) ) );
+      mp_dom_pars.reset(new EC_Domain_Params(*(other.mp_dom_pars)));
       }
-   if ( other.mp_public_point.get() )
+   if(other.mp_public_point.get())
       {
-      mp_public_point.reset ( new PointGFp ( * ( other.mp_public_point ) ) );
+      mp_public_point.reset(new PointGFp(*(other.mp_public_point)));
       }
    }
 
@@ -106,30 +109,41 @@ ECKAEG_PrivateKey::ECKAEG_PrivateKey(ECKAEG_PrivateKey const& other)
      ECKAEG_PublicKey(),
      EC_PrivateKey(),
      PK_Key_Agreement_Key()
-
    {
    set_all_values(other);
    }
+
 ECKAEG_PrivateKey const& ECKAEG_PrivateKey::operator= (ECKAEG_PrivateKey const& rhs)
    {
    set_all_values(rhs);
    return *this;
    }
 
+MemoryVector<byte> ECKAEG_PrivateKey::public_value() const
+   {
+   return EC2OSP(public_point(), PointGFp::UNCOMPRESSED);
+   }
+
 /**
 * Derive a key
 */
-SecureVector<byte> ECKAEG_PrivateKey::derive_key(const Public_Key& key) const
+SecureVector<byte> ECKAEG_PrivateKey::derive_key(const byte key[], u32bit key_len) const
+   {
+   MemoryVector<byte> key_x(key, key_len); // XXX fix this, nasty/slow
+   PointGFp point = OS2ECP(key_x, public_point().get_curve());
+
+   return m_eckaeg_core.agree(point);
+   }
+
+/**
+* Derive a key
+*/
+SecureVector<byte> ECKAEG_PrivateKey::derive_key(const ECKAEG_PublicKey& key) const
    {
    affirm_init();
+   key.affirm_init();
 
-   const EC_PublicKey * p_ec_pk = dynamic_cast<const EC_PublicKey*>(&key);
-   if(!p_ec_pk)
-      {
-      throw Invalid_Argument("ECKAEG_PrivateKey::derive_key(): argument must be an EC_PublicKey");
-      }
-   p_ec_pk->affirm_init();
-   return m_eckaeg_core.agree ( p_ec_pk->public_point() );
+   return m_eckaeg_core.agree(key.public_point());
    }
 
 }
diff --git a/src/pubkey/eckaeg/eckaeg.h b/src/pubkey/eckaeg/eckaeg.h
index 609b13d79..9b0cd492c 100644
--- a/src/pubkey/eckaeg/eckaeg.h
+++ b/src/pubkey/eckaeg/eckaeg.h
@@ -101,13 +101,22 @@ class BOTAN_DLL ECKAEG_PrivateKey : public ECKAEG_PublicKey,
       ECKAEG_PrivateKey(ECKAEG_PrivateKey const& other);
       ECKAEG_PrivateKey const& operator=(ECKAEG_PrivateKey const& rhs);
 
+      MemoryVector<byte> public_value() const;
+
       void PKCS8_load_hook(bool = false);
 
       /**
       * Derive a shared key with the other partys public key.
-      * @param pub_key the other partys 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 partys public key.
+      * @param other the other partys public key
       */
-      SecureVector<byte> derive_key(const Public_Key& pub_key) const;
+      SecureVector<byte> derive_key(const ECKAEG_PublicKey& other) const;
 
       /**
       * Make sure that the public key parts of this object are set