fixed key generation (issue #4 - untested)

src/potr/compatcrypto/common.py

@@ -23,15 +23,24 @@
 
 from potr.utils import human_hash, bytes_to_long, unpack, pack_mpi
 
+DEFAULT_KEYTYPE = 0x0000
 pkTypes = {}
 def registerkeytype(cls):
     if not hasattr(cls, 'parsePayload'):
         raise TypeError('registered key types need parsePayload()')
     pkTypes[cls.keyType] = cls
     return cls
 
+def generateDefaultKey():
+    return pkTypes[DEFAULT_KEYTYPE].generate()
+
 class PK(object):
     __slots__ = []
+
+    @classmethod
+    def generate(cls):
+        raise NotImplementedError
+
     def sign(self, data):
         raise NotImplementedError
     def verify(self, data):

src/potr/compatcrypto/pycrypto.py

@@ -135,7 +135,7 @@ def __ne__(self, other):
     def generate(cls):
         privkey = DSA.generate(1024)
         return cls((privkey.key.y, privkey.key.g, privkey.key.p, privkey.key.q,
-                privkey.key.x))
+                privkey.key.x), private=True)
 
     @classmethod
     def parsePayload(cls, data, private=False):

src/potr/context.py

@@ -442,7 +442,7 @@ def getPrivkey(self, autogen=True):
             self.privkey = self.loadPrivkey()
         if self.privkey is None:
             if autogen is True:
-                self.privkey = crypt.DSAKey.generate()
+                self.privkey = crypt.generateDefaultKey()
                 self.savePrivkey()
             else:
                 raise LookupError

src/potr/crypt.py

@@ -23,7 +23,7 @@
 
 
 from potr.compatcrypto import SHA256, SHA1, HMAC, SHA1HMAC, SHA256HMAC, \
-        SHA256HMAC160, Counter, AESCTR, RNG, PK
+        SHA256HMAC160, Counter, AESCTR, RNG, PK, generateDefaultKey
 from potr.utils import bytes_to_long, long_to_bytes, pack_mpi, read_mpi
 from potr import proto