3 files changed, 14 insertions, 15 deletions
diff --git a/src/pubkey/ecdsa/ecdsa.cpp b/src/pubkey/ecdsa/ecdsa.cpp
index 9a3510c33..5c45c5ed3 100644
--- a/src/pubkey/ecdsa/ecdsa.cpp
+++ b/src/pubkey/ecdsa/ecdsa.cpp
@@ -80,12 +80,13 @@ bool ECDSA_Verification_Operation::verify(const byte msg[], size_t msg_len,
    BigInt r(sig, sig_len / 2);
    BigInt s(sig + sig_len / 2, sig_len / 2);
 
-   if(r < 0 || r >= order || s < 0 || s >= order)
+   if(r <= 0 || r >= order || s <= 0 || s >= order)
       return false;
 
    BigInt w = inverse_mod(s, order);
 
-   PointGFp R = w * (e * base_point + r * public_point);
+   PointGFp R = w * multi_exponentiate(base_point, e,
+                                       public_point, r);
 
    if(R.is_zero())
       return false;
diff --git a/src/pubkey/ecdsa/ecdsa.h b/src/pubkey/ecdsa/ecdsa.h
index 6d62a168d..f0834abd8 100644
--- a/src/pubkey/ecdsa/ecdsa.h
+++ b/src/pubkey/ecdsa/ecdsa.h
@@ -28,7 +28,7 @@ class BOTAN_DLL ECDSA_PublicKey : public virtual EC_PublicKey
       * @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,
+      ECDSA_PublicKey(const EC_Group& dom_par,
                       const PointGFp& public_point) :
          EC_PublicKey(dom_par, public_point) {}
 
@@ -66,6 +66,11 @@ class BOTAN_DLL ECDSA_PrivateKey : public ECDSA_PublicKey,
    {
    public:
 
+      /**
+      * Load a private key
+      * @param alg_id the X.509 algorithm identifier
+      * @param key_bits PKCS #8 structure
+      */
       ECDSA_PrivateKey(const AlgorithmIdentifier& alg_id,
                        const MemoryRegion<byte>& key_bits) :
          EC_PrivateKey(alg_id, key_bits) {}
@@ -74,19 +79,12 @@ class BOTAN_DLL ECDSA_PrivateKey : public ECDSA_PublicKey,
       * Generate a new private key
       * @param rng a random number generator
       * @param domain parameters to used for this key
+      * @param x the private key (if zero, generate a ney random key)
       */
       ECDSA_PrivateKey(RandomNumberGenerator& rng,
-                       const EC_Domain_Params& domain) :
-         EC_PrivateKey(rng, domain) {}
-
-      /**
-      * Load a private key
-      * @param domain parameters
-      * @param x the private key
-      */
-      ECDSA_PrivateKey(const EC_Domain_Params& domain,
-                       const BigInt& x) :
-         EC_PrivateKey(domain, x) {}
+                       const EC_Group& domain,
+                       const BigInt& x = 0) :
+         EC_PrivateKey(rng, domain, x) {}
 
       bool check_key(RandomNumberGenerator& rng, bool) const;
    };
diff --git a/src/pubkey/ecdsa/info.txt b/src/pubkey/ecdsa/info.txt
index ca2694ad1..7a2113a30 100644
--- a/src/pubkey/ecdsa/info.txt
+++ b/src/pubkey/ecdsa/info.txt
@@ -2,7 +2,7 @@ define ECDSA
 
 <requires>
 asn1
-ec_dompar
+ec_group
 ecc_key
 numbertheory
 rng