return (rc);
}
+static PyObject *epmeth_ec2osp(PyObject *me, PyObject *arg, PyObject *kw)
+{
+ buf b;
+ PyObject *rc;
+ char *p;
+ ec_curve *c = ECPT_C(me);
+ ec pp = EC_INIT;
+ int f = EC_EXPLY;
+ int len;
+ char *kwlist[] = { "flags", 0 };
+
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "|i:ectosp", kwlist, &f))
+ return (0);
+ len = c->f->noctets * 2 + 1;
+ rc = bytestring_pywrap(0, len);
+ p = PyString_AS_STRING(rc);
+ buf_init(&b, p, len);
+ EC_OUT(c, &pp, ECPT_P(me));
+ if (ec_ec2osp(c, f, &b, &pp)) {
+ Py_DECREF(rc); rc = 0;
+ VALERR("invalid flags");
+ }
+ EC_DESTROY(&pp);
+ _PyString_Resize(&rc, BLEN(&b));
+end:
+ return (rc);
+}
+
static PyObject *epget_curve(PyObject *me, void *hunoz)
{ RETURN_OBJ(ECPT_COBJ(me)); }
qd.p = q;
qd.e = 0;
if (!ec_ptparse(&qd, p))
- SYNERR(qd.e);
+ VALERR(qd.e);
goto fix;
} else if (c && (xx = tomp(x)) != 0) {
xx = F_IN(c->f, xx, xx);
static PyMethodDef ecpt_pymethods[] = {
#define METHNAME(func) epmeth_##func
METH (toraw, "X.toraw() -> BIN")
+ KWMETH(ec2osp, "X.ec2osp([flags = EC_EXPLY]) -> BIN")
METH (dbl, "X.dbl() -> X + X")
METH (oncurvep, "X.oncurvep() -> BOOL")
#undef METHNAME
buf_init(&b, p, len);
cc = ECCURVE_C(me);
if (ec_getraw(cc, &b, &pp))
- SYNERR("bad point");
+ VALERR("bad point");
+ EC_IN(cc, &pp, &pp);
+ rc = Py_BuildValue("(NN)", ecpt_pywrap(me, &pp), bytestring_pywrapbuf(&b));
+end:
+ return (rc);
+}
+
+static PyObject *meth__ECPtCurve_os2ecp(PyObject *me,
+ PyObject *arg, PyObject *kw)
+{
+ char *p;
+ int len;
+ buf b;
+ PyObject *rc = 0;
+ ec_curve *cc;
+ int f = EC_XONLY | EC_LSB | EC_SORT | EC_EXPLY;
+ ec pp = EC_INIT;
+ char *kwlist[] = { "buf", "flags", 0 };
+
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "Os#|f:os2ecp", kwlist,
+ &me, &p, &len, &f))
+ return (0);
+ buf_init(&b, p, len);
+ cc = ECCURVE_C(me);
+ if (ec_os2ecp(cc, f, &b, &pp)) VALERR("bad point");
EC_IN(cc, &pp, &pp);
rc = Py_BuildValue("(NN)", ecpt_pywrap(me, &pp), bytestring_pywrapbuf(&b));
end:
if (!PyArg_ParseTuple(arg, "Os:parse", &me, &p)) goto end;
qd.p = p;
qd.e = 0;
- if (!ec_ptparse(&qd, &pp)) SYNERR(qd.e);
+ if (!ec_ptparse(&qd, &pp)) VALERR(qd.e);
rc = Py_BuildValue("(Ns)", ecpt_pywrapout(me, &pp), qd.p);
end:
return (rc);
cobj->ty.ht_type.tp_alloc = PyType_GenericAlloc;
cobj->ty.ht_type.tp_free = 0;
cobj->ty.ht_type.tp_new = ecpt_pynew;
- PyType_Ready(&cobj->ty.ht_type);
+ typeready(&cobj->ty.ht_type);
return ((PyObject *)cobj);
}
qd.p = p;
qd.e = 0;
if ((c = ec_curveparse(&qd)) == 0)
- SYNERR(qd.e);
+ VALERR(qd.e);
rc = eccurve_pywrap(0, c);
end:
return (rc);
qd.p = p;
qd.e = 0;
if (ec_infoparse(&qd, &ei))
- SYNERR(qd.e);
+ VALERR(qd.e);
rc = Py_BuildValue("(Ns)", ecinfo_pywrap(&ei), qd.p);
end:
return (rc);
#define METHNAME(func) meth_##func
METH (_ECPt_frombuf, "frombuf(E, STR) -> (P, REST)")
METH (_ECPtCurve_fromraw, "fromraw(E, STR) -> (P, REST)")
+ KWMETH(_ECPtCurve_os2ecp, "os2ecp(E, STR, [flags = ...]) -> (P, REST)")
METH (_ECPt_parse, "parse(E, STR) -> (P, REST)")
METH (_ECCurve_parse, "parse(STR) -> (E, REST)")
METH (_ECInfo_parse, "parse(STR) -> (I, REST)")