X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/blobdiff_plain/5f959e502e3ceea40fb3c44593e090417fa11fc9..426e898f1d1fb7514eef632174f0fe42f0eff9b3:/group.c

diff --git a/group.c b/group.c
index d9c232b..fe05f15 100644
--- a/group.c
+++ b/group.c
@@ -35,9 +35,7 @@
 PyObject *fginfo_pywrap(gprime_param *dp, PyTypeObject *ty)
 {
   fginfo_pyobj *z = PyObject_New(fginfo_pyobj, ty);
-  z->dp.p = MP_COPY(dp->p);
-  z->dp.q = MP_COPY(dp->q);
-  z->dp.g = MP_COPY(dp->g);
+  z->dp = *dp;
   return ((PyObject *)z);
 }
 
@@ -64,22 +62,22 @@ end:
 }
 
 static PyObject *figet_r(PyObject *me, void *hunoz)
-  { return mp_pywrap(FGINFO_DP(me)->q); }
+  { return mp_pywrap(MP_COPY(FGINFO_DP(me)->q)); }
 
 static PyObject *diget_p(PyObject *me, void *hunoz)
-  { return mp_pywrap(FGINFO_DP(me)->p); }
+  { return mp_pywrap(MP_COPY(FGINFO_DP(me)->p)); }
 
 static PyObject *diget_g(PyObject *me, void *hunoz)
-  { return mp_pywrap(FGINFO_DP(me)->g); }
+  { return mp_pywrap(MP_COPY(FGINFO_DP(me)->g)); }
 
 static PyObject *biget_p(PyObject *me, void *hunoz)
-  { return gf_pywrap(FGINFO_DP(me)->p); }
+  { return gf_pywrap(MP_COPY(FGINFO_DP(me)->p)); }
 
 static PyObject *biget_m(PyObject *me, void *hunoz)
   { return PyInt_FromLong(mp_octets(FGINFO_DP(me)->p) - 1); }
 
 static PyObject *biget_g(PyObject *me, void *hunoz)
-  { return gf_pywrap(FGINFO_DP(me)->g); }
+  { return gf_pywrap(MP_COPY(FGINFO_DP(me)->g)); }
 
 static void fginfo_pydealloc(PyObject *me)
 {
@@ -151,6 +149,35 @@ end:
   return (rc);
 }
 
+static PyObject *meth__DHInfo_genkcdsa(PyObject *me,
+				       PyObject *arg, PyObject *kw)
+{
+  dh_param dp;
+  unsigned ql, pl;
+  unsigned steps = 0;
+  grand *r = &rand_global;
+  pgev evt = { 0 };
+  char *kwlist[] = { "class", "pbits", "qbits",
+		     "event", "rng", "nsteps", 0 };
+  mp *v = MP_NEW;
+  PyObject *rc = 0;
+
+  if (!PyArg_ParseTupleAndKeywords(arg, kw, "OO&O&|O&O&O&:genkcdsa", kwlist,
+				   &me, convuint, &pl, convuint, &ql,
+				   convpgev, &evt, convgrand, &r,
+				   convuint, &steps))
+    goto end;
+  if (dh_kcdsagen(&dp, ql, pl, 0, steps, r, evt.proc, evt.ctx))
+    PGENERR;
+  mp_div(&v, 0, dp.p, dp.q);
+  v = mp_lsr(v, v, 1);
+  rc = Py_BuildValue("(NN)", fginfo_pywrap(&dp, dhinfo_pytype),
+		     mp_pywrap(v));
+end:
+  droppgev(&evt);
+  return (rc);
+}
+
 static PyObject *meth__DHInfo_gendsa(PyObject *me,
 				     PyObject *arg, PyObject *kw)
 {
@@ -507,17 +534,17 @@ static PyObject *group_dopywrap(PyTypeObject *ty, group *g)
 {
   group_pyobj *gobj = newtype(ty, 0, g->ops->name);
   gobj->g = g;
-  gobj->ty.type.tp_basicsize = sizeof(ge_pyobj);
-  gobj->ty.type.tp_base = ge_pytype;
+  gobj->ty.ht_type.tp_basicsize = sizeof(ge_pyobj);
+  gobj->ty.ht_type.tp_base = ge_pytype;
   Py_INCREF(group_pytype);
-  gobj->ty.type.tp_flags = (Py_TPFLAGS_DEFAULT |
-			    Py_TPFLAGS_BASETYPE |
-			    Py_TPFLAGS_CHECKTYPES |
-			    Py_TPFLAGS_HEAPTYPE);
-  gobj->ty.type.tp_alloc = PyType_GenericAlloc;
-  gobj->ty.type.tp_free = 0;
-  gobj->ty.type.tp_new = ge_pynew;
-  PyType_Ready(&gobj->ty.type);
+  gobj->ty.ht_type.tp_flags = (Py_TPFLAGS_DEFAULT |
+			       Py_TPFLAGS_BASETYPE |
+			       Py_TPFLAGS_CHECKTYPES |
+			       Py_TPFLAGS_HEAPTYPE);
+  gobj->ty.ht_type.tp_alloc = PyType_GenericAlloc;
+  gobj->ty.ht_type.tp_free = 0;
+  gobj->ty.ht_type.tp_new = ge_pynew;
+  PyType_Ready(&gobj->ty.ht_type);
   return ((PyObject *)gobj);
 }
 
@@ -1330,6 +1357,9 @@ genlimlee(PBITS, QBITS, [event = pgen_nullev, ievent = pgen_nullev,\n\
   KWMETH(_DHInfo_gendsa,	"\
 gendsa(PBITS, QBITS, SEED, [event = pgen_nullev, nsteps = 0])\n\
   -> (D, SEED, COUNT)")
+  KWMETH(_DHInfo_genkcdsa,	"\
+gendsa(PBITS, QBITS, [event = pgen_nullev, rng = rand, nsteps = 0])\n\
+  -> (D, V)")
 #undef METHNAME
   { 0 }
 };