1 files changed, 56 insertions, 41 deletions

diff --git a/src/pubkey/ecdsa/ecdsa.h b/src/pubkey/ecdsa/ecdsa.h
index e7f29b600..e20a234fc 100644
--- a/src/pubkey/ecdsa/ecdsa.h
+++ b/src/pubkey/ecdsa/ecdsa.h
@@ -11,18 +11,31 @@
 #define BOTAN_ECDSA_KEY_H__
 
 #include <botan/ecc_key.h>
+#include <botan/pk_ops.h>
 
 namespace Botan {
 
 /**
 * This class represents ECDSA Public Keys.
 */
-class BOTAN_DLL ECDSA_PublicKey : public virtual EC_PublicKey,
-                                  public PK_Verifying_wo_MR_Key
+class BOTAN_DLL ECDSA_PublicKey : public virtual EC_PublicKey
    {
    public:
 
       /**
+      * 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
+      */
+      ECDSA_PublicKey(const EC_Domain_Params& dom_par,
+                      const PointGFp& public_point) :
+         EC_PublicKey(dom_par, public_point) {}
+
+      ECDSA_PublicKey(const AlgorithmIdentifier& alg_id,
+                      const MemoryRegion<byte>& key_bits) :
+         EC_PublicKey(alg_id, key_bits) {}
+
+      /**
       * Get this keys algorithm name.
       * @result this keys algorithm name ("ECDSA")
       */
@@ -40,46 +53,21 @@ class BOTAN_DLL ECDSA_PublicKey : public virtual EC_PublicKey,
       u32bit message_part_size() const
          { return domain().get_order().bytes(); }
 
-      /**
-      * Verify a message with this key.
-      * @param message the byte array containing the message
-      * @param mess_len the number of bytes in the message byte array
-      * @param signature the byte array containing the signature
-      * @param sig_len the number of bytes in the signature byte array
-      */
-      bool verify(const byte message[], u32bit mess_len,
-                  const byte signature[], u32bit sig_len) const;
-
-      /**
-      * Default constructor. Use this one if you want to later fill
-      * this object with data from an encoded key.
-      */
+   protected:
       ECDSA_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
-      */
-      ECDSA_PublicKey(const EC_Domain_Params& dom_par,
-                      const PointGFp& public_point) :
-         EC_PublicKey(dom_par, public_point) {}
-
    };
 
 /**
 * This class represents ECDSA Private Keys
 */
 class BOTAN_DLL ECDSA_PrivateKey : public ECDSA_PublicKey,
-                                   public EC_PrivateKey,
-                                   public PK_Signing_Key
+                                   public EC_PrivateKey
    {
    public:
-      /**
-      * Default constructor. Use this one if you want to later fill
-      * this object with data from an encoded key.
-      */
-      ECDSA_PrivateKey() {}
+
+      ECDSA_PrivateKey(const AlgorithmIdentifier& alg_id,
+                       const MemoryRegion<byte>& key_bits) :
+         EC_PrivateKey(alg_id, key_bits) {}
 
       /**
       * Generate a new private key
@@ -96,16 +84,43 @@ class BOTAN_DLL ECDSA_PrivateKey : public ECDSA_PublicKey,
       */
       ECDSA_PrivateKey(const EC_Domain_Params& domain, const BigInt& x) :
          EC_PrivateKey(domain, x) {}
+   };
 
-      /**
-      * Sign a message with this key.
-      * @param message the byte array representing the message to be signed
-      * @param mess_len the length of the message byte array
-      * @result the signature
-      */
+class BOTAN_DLL ECDSA_Signature_Operation : public PK_Ops::Signature
+   {
+   public:
+      ECDSA_Signature_Operation(const ECDSA_PrivateKey& ecdsa);
+
+      SecureVector<byte> sign(const byte msg[], u32bit msg_len,
+                              RandomNumberGenerator& rng);
+
+      u32bit message_parts() const { return 2; }
+      u32bit message_part_size() const { return order.bytes(); }
+      u32bit max_input_bits() const { return order.bits(); }
+
+   private:
+      const PointGFp& base_point;
+      const BigInt& order;
+      const BigInt& x;
+   };
+
+class BOTAN_DLL ECDSA_Verification_Operation : public PK_Ops::Verification
+   {
+   public:
+      ECDSA_Verification_Operation(const ECDSA_PublicKey& ecdsa);
+
+      u32bit message_parts() const { return 2; }
+      u32bit message_part_size() const { return order.bytes(); }
+      u32bit max_input_bits() const { return order.bits(); }
+
+      bool with_recovery() const { return false; }
 
-      SecureVector<byte> sign(const byte message[], u32bit mess_len,
-                              RandomNumberGenerator& rng) const;
+      bool verify(const byte msg[], u32bit msg_len,
+                  const byte sig[], u32bit sig_len);
+   private:
+      const PointGFp& base_point;
+      const PointGFp& public_point;
+      const BigInt& order;
    };
 
 }