Skip to content

Commit

Permalink
throw error on incorrect bare SigningKey() constructor
Browse files Browse the repository at this point in the history
  • Loading branch information
warner committed Dec 1, 2010
1 parent 9e44153 commit 51b219e
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 2 deletions.
12 changes: 10 additions & 2 deletions ecdsa/keys.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,13 @@ class BadDigestError(Exception):
pass

class VerifyingKey:
def __init__(self, _error__please_use_generate=None):
if not _error__please_use_generate:
raise TypeError("Please use SigningKey.generate() to construct me")

@classmethod
def from_public_point(klass, point, curve=NIST192p):
self = klass()
self = klass(_error__please_use_generate=True)
self.curve = curve
self.pubkey = ecdsa.Public_key(curve.generator, point)
self.pubkey.order = curve.order
Expand Down Expand Up @@ -103,6 +107,10 @@ def verify_digest(self, signature, digest, sigdecode=sigdecode_string):
raise BadSignatureError

class SigningKey:
def __init__(self, _error__please_use_generate=None):
if not _error__please_use_generate:
raise TypeError("Please use SigningKey.generate() to construct me")

@classmethod
def generate(klass, curve=NIST192p, entropy=None):
secexp = randrange(curve.order, entropy)
Expand All @@ -115,7 +123,7 @@ def generate(klass, curve=NIST192p, entropy=None):

@classmethod
def from_secret_exponent(klass, secexp, curve=NIST192p):
self = klass()
self = klass(_error__please_use_generate=True)
self.curve = curve
self.baselen = curve.baselen
n = curve.order
Expand Down
5 changes: 5 additions & 0 deletions ecdsa/test_pyecdsa.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ def test_basic(self):
pub2 = VerifyingKey.from_string(pub.to_string())
self.failUnless(pub2.verify(sig, data))

def test_bad_usage(self):
# sk=SigningKey() is wrong
self.failUnlessRaises(TypeError, SigningKey)
self.failUnlessRaises(TypeError, VerifyingKey)

def test_lengths(self):
default = NIST192p
priv = SigningKey.generate()
Expand Down

0 comments on commit 51b219e

Please sign in to comment.