X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/740847afe208bb8f33e7d6cf642acaf4aa739f6a..bbb113f66ef45881f595c8dacbcb492554848878:/catacomb/__init__.py

diff --git a/catacomb/__init__.py b/catacomb/__init__.py
index 65695bb..80b6095 100644
--- a/catacomb/__init__.py
+++ b/catacomb/__init__.py
@@ -99,19 +99,6 @@ def _init():
   for i in b:
     if i[0] != '_':
       d[i] = b[i];
-  for i in ['ByteString',
-            'MP', 'GF', 'Field',
-            'ECPt', 'ECPtCurve', 'ECCurve', 'ECInfo',
-            'DHInfo', 'BinDHInfo', 'RSAPriv', 'BBSPriv',
-            'PrimeFilter', 'RabinMiller',
-            'Group', 'GE',
-            'KeySZ', 'KeyData']:
-    c = d[i]
-    pre = '_' + i + '_'
-    plen = len(pre)
-    for j in b:
-      if j[:plen] == pre:
-        setattr(c, j[plen:], classmethod(b[j]))
   for i in [gcciphers, gcaeads, gchashes, gcmacs, gcprps]:
     for c in i.itervalues():
       d[_fixname(c.name)] = c
@@ -137,7 +124,7 @@ def _augment(c, cc):
 def _checkend(r):
   x, rest = r
   if rest != '':
-    raise SyntaxError, 'junk at end of string'
+    raise SyntaxError('junk at end of string')
   return x
 
 ## Some pretty-printing utilities.
@@ -617,11 +604,11 @@ class _tmp:
     pp.end_group(ind, ')')
   def check(me, sz): return me.min <= sz <= me.max and sz%me.mod == 0
   def best(me, sz):
-    if sz < me.min: raise ValueError, 'key too small'
+    if sz < me.min: raise ValueError('key too small')
     elif sz > me.max: return me.max
     else: return sz - sz%me.mod
   def pad(me, sz):
-    if sz > me.max: raise ValueError, 'key too large'
+    if sz > me.max: raise ValueError('key too large')
     elif sz < me.min: return me.min
     else: sz += me.mod - 1; return sz - sz%me.mod
 _augment(KeySZRange, _tmp)
@@ -643,13 +630,13 @@ class _tmp:
     found = -1
     for i in me.set:
       if found < i <= sz: found = i
-    if found < 0: raise ValueError, 'key too small'
+    if found < 0: raise ValueError('key too small')
     return found
   def pad(me, sz):
     found = -1
     for i in me.set:
       if sz <= i and (found == -1 or i < found): found = i
-    if found < 0: raise ValueError, 'key too large'
+    if found < 0: raise ValueError('key too large')
     return found
 _augment(KeySZSet, _tmp)
 
@@ -929,7 +916,7 @@ Z128 = ByteString.zero(16)
 
 class _BasePub (object):
   def __init__(me, pub, *args, **kw):
-    if not me._PUBSZ.check(len(pub)): raise ValueError, 'bad public key'
+    if not me._PUBSZ.check(len(pub)): raise ValueError('bad public key')
     super(_BasePub, me).__init__(*args, **kw)
     me.pub = pub
   def __repr__(me): return '%s(pub = %r)' % (_clsname(me), me.pub)
@@ -942,7 +929,7 @@ class _BasePub (object):
 
 class _BasePriv (object):
   def __init__(me, priv, pub = None, *args, **kw):
-    if not me._KEYSZ.check(len(priv)): raise ValueError, 'bad private key'
+    if not me._KEYSZ.check(len(priv)): raise ValueError('bad private key')
     if pub is None: pub = me._pubkey(priv)
     super(_BasePriv, me).__init__(pub = pub, *args, **kw)
     me.priv = priv
@@ -1015,14 +1002,9 @@ class Ed448Priv (_EdDSAPriv, Ed448Pub):
     return ed448_sign(me.priv, msg, pub = me.pub, **kw)
 
 ###--------------------------------------------------------------------------
-### Built-in named curves and prime groups.
-
-class _groupmap (object):
-  def __init__(me, map, nth):
-    me.map = map
-    me.nth = nth
-    me._n = max(map.values()) + 1
-    me.i = me._n*[None]
+### Built-in algorithm and group tables.
+
+class _tmp:
   def __repr__(me):
     return '{%s}' % ', '.join(['%r: %r' % kv for kv in me.iteritems()])
   def _repr_pretty_(me, pp, cyclep):
@@ -1030,36 +1012,7 @@ class _groupmap (object):
     if cyclep: pp.text('...')
     else: _pp_dict(pp, me.iteritems())
     pp.end_group(ind, ' }')
-  def __len__(me):
-    return me._n
-  def __contains__(me, k):
-    return k in me.map
-  def __getitem__(me, k):
-    i = me.map[k]
-    if me.i[i] is None:
-      me.i[i] = me.nth(i)
-    return me.i[i]
-  def __setitem__(me, k, v):
-    raise TypeError, "immutable object"
-  def __iter__(me):
-    return iter(me.map)
-  def iterkeys(me):
-    return iter(me.map)
-  def itervalues(me):
-    for k in me:
-      yield me[k]
-  def iteritems(me):
-    for k in me:
-      yield k, me[k]
-  def keys(me):
-    return [k for k in me]
-  def values(me):
-    return [me[k] for k in me]
-  def items(me):
-    return [(k, me[k]) for k in me]
-eccurves = _groupmap(_base._eccurves, ECInfo._curven)
-primegroups = _groupmap(_base._pgroups, DHInfo._groupn)
-bingroups = _groupmap(_base._bingroups, BinDHInfo._groupn)
+_augment(_base._MiscTable, _tmp)
 
 ###--------------------------------------------------------------------------
 ### Prime number generation.
@@ -1169,7 +1122,7 @@ class SimulStepper (PrimeGenEventHandler):
     me.add = add
   def _stepfn(me, step):
     if step <= 0:
-      raise ValueError, 'step must be positive'
+      raise ValueError('step must be positive')
     if step <= MPW_MAX:
       return lambda f: f.step(step)
     j = PrimeFilter(step)