5 * (c) 2004 Straylight/Edgeware
8 /*----- Licensing notice --------------------------------------------------*
10 * This file is part of the Python interface to Catacomb.
12 * Catacomb/Python is free software; you can redistribute it and/or modify
13 * it under the terms of the GNU General Public License as published by
14 * the Free Software Foundation; either version 2 of the License, or
15 * (at your option) any later version.
17 * Catacomb/Python is distributed in the hope that it will be useful,
18 * but WITHOUT ANY WARRANTY; without even the implied warranty of
19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20 * GNU General Public License for more details.
22 * You should have received a copy of the GNU General Public License
23 * along with Catacomb/Python; if not, write to the Free Software Foundation,
24 * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
27 /*----- Header files ------------------------------------------------------*/
29 #include "catacomb-python.h"
31 /*----- Utility functions -------------------------------------------------*/
33 PyTypeObject
*ecpt_pytype
;
34 PyTypeObject
*ecptcurve_pytype
;
35 PyTypeObject
*eccurve_pytype
;
36 PyTypeObject
*ecprimecurve_pytype
;
37 PyTypeObject
*ecprimeprojcurve_pytype
;
38 PyTypeObject
*ecbincurve_pytype
;
39 PyTypeObject
*ecbinprojcurve_pytype
;
40 PyTypeObject
*ecinfo_pytype
;
42 ec_curve
*eccurve_copy(ec_curve
*c
)
47 if ((f
= field_copy(c
->f
)) == 0)
49 a
= F_OUT(f
, MP_NEW
, c
->a
);
50 b
= F_OUT(f
, MP_NEW
, c
->b
);
51 if (strcmp(EC_NAME(c
), "prime") == 0)
52 c
= ec_prime(f
, a
, b
);
53 else if (strcmp(EC_NAME(c
), "primeproj") == 0)
54 c
= ec_primeproj(f
, a
, b
);
55 else if (strcmp(EC_NAME(c
), "bin") == 0)
57 else if (strcmp(EC_NAME(c
), "binproj") == 0)
58 c
= ec_binproj(f
, a
, b
);
67 static PyObject
*ecpt_dopywrap(PyObject
*cobj
, ec_curve
*c
, ec
*p
)
69 ecpt_pyobj
*z
= PyObject_New(ecpt_pyobj
, (PyTypeObject
*)cobj
);
73 return ((PyObject
*)z
);
76 PyObject
*ecpt_pywrap(PyObject
*cobj
, ec
*p
)
77 { return (ecpt_dopywrap(cobj
, ECCURVE_C(cobj
), p
)); }
79 PyObject
*ecpt_pywrapout(void *cobj
, ec
*p
)
83 if (!PyType_IsSubtype(cobj
, ecptcurve_pytype
))
87 EC_IN(ECCURVE_C(cobj
), p
, p
);
89 return (ecpt_dopywrap(cobj
, c
, p
));
92 int toecpt(ec_curve
*c
, ec
*d
, PyObject
*p
)
94 if (ECPTCURVE_PYCHECK(p
)) {
95 if (ECPT_C(p
) != c
&& !ec_samep(ECPT_C(p
), c
))
97 EC_COPY(d
, ECPT_P(p
));
98 } else if (ECPT_PYCHECK(p
))
99 EC_IN(c
, d
, ECPT_P(p
));
105 int getecpt(ec_curve
*c
, ec
*d
, PyObject
*p
)
107 if (toecpt(c
, d
, p
)) {
108 PyErr_Format(PyExc_TypeError
, "can't convert %.100s to ecpt",
109 p
->ob_type
->tp_name
);
115 void getecptout(ec
*d
, PyObject
*p
)
117 if (ECPTCURVE_PYCHECK(p
))
118 EC_OUT(ECPT_C(p
), d
, ECPT_P(p
));
120 assert(ECPT_PYCHECK(p
));
121 EC_COPY(d
, ECPT_P(p
));
125 int convecpt(PyObject
*o
, void *p
)
127 if (!ECPT_PYCHECK(o
))
128 TYERR("want elliptic curve point");
135 /*----- Curve points ------------------------------------------------------*/
137 static int ecbinop(PyObject
*x
, PyObject
*y
,
138 ec_curve
**c
, PyObject
**cobj
, ec
*xx
, ec
*yy
)
140 if (ECPTCURVE_PYCHECK(x
)) *cobj
= ECPT_COBJ(x
);
141 else if (ECPTCURVE_PYCHECK(y
)) *cobj
= ECPT_COBJ(y
);
143 *c
= ECCURVE_C(*cobj
);
144 if (toecpt(*c
, xx
, x
) || toecpt(*c
, yy
, y
)) return (-1);
148 #define BINOP(name) \
149 static PyObject *ecpt_py##name(PyObject *x, PyObject *y) { \
150 ec xx = EC_INIT, yy = EC_INIT, zz = EC_INIT; \
153 if (ecbinop(x, y, &c, &cobj, &xx, &yy)) RETURN_NOTIMPL; \
154 c->ops->name(c, &zz, &xx, &yy); \
155 EC_DESTROY(&xx); EC_DESTROY(&yy); \
156 return (ecpt_pywrap(ECPT_COBJ(x), &zz)); \
163 static PyObject *ecpt_py##name(PyObject *x) { \
165 ec_curve *c = ECPT_C(x); \
166 c->ops->name(c, &zz, ECPT_P(x)); \
167 return (ecpt_pywrap(ECPT_COBJ(x), &zz)); \
172 static PyObject
*ecpt_pyid(PyObject
*x
) { RETURN_OBJ(x
); }
174 static int ecpt_pynonzerop(PyObject
*x
) { return (!EC_ATINF(ECPT_P(x
))); }
176 static void ecpt_pydealloc(PyObject
*x
)
178 EC_DESTROY(ECPT_P(x
));
179 Py_DECREF(ECPT_COBJ(x
));
183 static PyObject
*ecpt_pymul(PyObject
*x
, PyObject
*y
)
188 if (ECPT_PYCHECK(x
)) { PyObject
*t
; t
= x
; x
= y
; y
= t
; }
189 if (!ECPT_PYCHECK(y
) || (xx
= tomp(x
)) == 0) RETURN_NOTIMPL
;
190 ec_imul(ECPT_C(y
), &zz
, ECPT_P(y
), xx
);
191 return (ecpt_pywrap(ECPT_COBJ(y
), &zz
));
194 static long ecpt_pyhash(PyObject
*me
)
199 EC_OUT(ECPT_C(me
), &p
, ECPT_P(me
));
200 i
= 0xe0fdd039; /* random perturbance */
201 if (p
.x
) i
^= mp_tolong(p
.x
);
202 if (p
.y
) i
^= mp_tolong(p
.y
);
208 static PyObject
*ecpt_pyrichcompare(PyObject
*x
, PyObject
*y
, int op
)
212 ec p
= EC_INIT
, q
= EC_INIT
;
216 if (ecbinop(x
, y
, &c
, &cobj
, &p
, &q
)) RETURN_NOTIMPL
;
220 case Py_EQ
: b
= EC_EQ(&p
, &q
); break;
221 case Py_NE
: b
= !EC_EQ(&p
, &q
); break;
222 default: TYERR("elliptic curve points are unordered");
231 static PyObject
*epmeth_oncurvep(PyObject
*me
, PyObject
*arg
)
233 if (!PyArg_ParseTuple(arg
, ":oncurvep")) return (0);
234 return (getbool(EC_ATINF(ECPT_P(me
)) ||
235 !EC_CHECK(ECPT_C(me
), ECPT_P(me
))));
238 static PyObject
*epmeth_dbl(PyObject
*me
, PyObject
*arg
)
241 if (!PyArg_ParseTuple(arg
, ":dbl")) return (0);
242 EC_DBL(ECPT_C(me
), &p
, ECPT_P(me
));
243 return (ecpt_pywrap(ECPT_COBJ(me
), &p
));
246 static PyObject
*epmeth_tobuf(PyObject
*me
, PyObject
*arg
)
253 if (!PyArg_ParseTuple(arg
, ":tobuf")) return (0);
258 n
= mp_octets(p
.x
) + mp_octets(p
.y
) + 4;
259 rc
= bytestring_pywrap(0, n
);
260 buf_init(&b
, PyString_AS_STRING(rc
), n
);
263 _PyString_Resize(&rc
, BLEN(&b
));
268 static PyObject
*epmeth_toraw(PyObject
*me
, PyObject
*arg
)
273 ec_curve
*c
= ECPT_C(me
);
277 if (!PyArg_ParseTuple(arg
, ":toraw")) return (0);
278 len
= c
->f
->noctets
* 2 + 1;
279 rc
= bytestring_pywrap(0, len
);
280 p
= PyString_AS_STRING(rc
);
281 buf_init(&b
, p
, len
);
282 EC_OUT(c
, &pp
, ECPT_P(me
));
283 ec_putraw(c
, &b
, &pp
);
285 _PyString_Resize(&rc
, BLEN(&b
));
289 static PyObject
*epget_curve(PyObject
*me
, void *hunoz
)
290 { RETURN_OBJ(ECPT_COBJ(me
)); }
292 static PyObject
*epncget_ix(PyObject
*me
, void *hunoz
)
296 if (EC_ATINF(ECPT_P(me
))) RETURN_NONE
;
298 rc
= mp_pywrap(MP_COPY(p
.x
));
303 static PyObject
*epncget_iy(PyObject
*me
, void *hunoz
)
307 if (EC_ATINF(ECPT_P(me
))) RETURN_NONE
;
309 rc
= mp_pywrap(MP_COPY(p
.y
));
314 static PyObject
*epncget_point(PyObject
*me
, void *hunoz
)
317 static PyObject
*epget_point(PyObject
*me
, void *hunoz
)
321 return (ecpt_pywrapout(ecpt_pytype
, &p
));
324 static PyObject
*epget_x(PyObject
*me
, void *hunoz
)
326 ec_curve
*c
= ECPT_C(me
);
328 PyObject
*fobj
= ECPT_FOBJ(me
);
332 if (EC_ATINF(pp
)) RETURN_NONE
;
334 rc
= fe_pywrap(fobj
, F_IN(c
->f
, MP_NEW
, p
.x
));
339 static PyObject
*epget_y(PyObject
*me
, void *hunoz
)
341 ec_curve
*c
= ECPT_C(me
);
343 PyObject
*fobj
= ECPT_FOBJ(me
);
347 if (EC_ATINF(pp
)) RETURN_NONE
;
349 rc
= fe_pywrap(fobj
, F_IN(c
->f
, MP_NEW
, p
.y
));
354 static PyObject
*epget__x(PyObject
*me
, void *hunoz
)
356 if (EC_ATINF(ECPT_P(me
))) RETURN_NONE
;
357 return (fe_pywrap(ECPT_FOBJ(me
), MP_COPY(ECPT_P(me
)->x
)));
360 static PyObject
*epget__y(PyObject
*me
, void *hunoz
)
362 if (EC_ATINF(ECPT_P(me
))) RETURN_NONE
;
363 return (fe_pywrap(ECPT_FOBJ(me
), MP_COPY(ECPT_P(me
)->y
)));
366 static PyObject
*epget__z(PyObject
*me
, void *hunoz
)
368 if (EC_ATINF(ECPT_P(me
)) || !ECPT_P(me
)->z
) RETURN_NONE
;
369 return (fe_pywrap(ECPT_FOBJ(me
), MP_COPY(ECPT_P(me
)->z
)));
372 static mp
*coord_in(field
*f
, PyObject
*x
)
375 if (FE_PYCHECK(x
) && FE_F(x
) == f
)
376 return (MP_COPY(FE_X(x
)));
377 else if ((xx
= getmp(x
)) == 0)
380 return (F_IN(f
, xx
, xx
));
383 static int ecptxl_3(ec_curve
*c
, ec
*p
,
384 PyObject
*x
, PyObject
*y
, PyObject
*z
)
388 if (!x
|| !y
|| !z
) TYERR("missing argument");
389 if (!c
) VALERR("internal form with no curve!");
390 if ((p
->x
== coord_in(c
->f
, x
)) == 0 ||
391 (p
->y
== coord_in(c
->f
, y
)) == 0 ||
392 (z
!= Py_None
&& (p
->z
= coord_in(c
->f
, z
))) == 0)
394 if (!p
->z
) p
->z
= MP_COPY(c
->f
->one
); /* just in case */
400 static int ecptxl_2(ec_curve
*c
, ec
*p
, PyObject
*x
, PyObject
*y
)
404 if (!x
|| !y
) TYERR("missing argument");
405 if ((p
->x
= getmp(x
)) == 0 ||
406 (p
->y
= getmp(y
)) == 0)
408 if (c
) EC_IN(c
, p
, p
);
414 static int ecptxl_1(ec_curve
*c
, ec
*p
, PyObject
*x
)
417 PyObject
*y
= 0, *z
= 0, *t
= 0;
424 if (!x
|| x
== Py_None
)
426 else if (ECPT_PYCHECK(x
)) {
429 } else if (PyString_Check(x
)) {
430 if (PyObject_AsReadBuffer(x
, &q
, 0))
434 if (!ec_ptparse(&qd
, p
))
437 } else if (c
&& (xx
= tomp(x
)) != 0) {
438 xx
= F_IN(c
->f
, xx
, xx
);
439 if (!EC_FIND(c
, p
, xx
)) VALERR("not on the curve");
440 } else if (PySequence_Check(x
)) {
442 n
= PySequence_Size(t
);
443 if (n
!= 2 && (n
!= 3 || !c
))
444 TYERR("want sequence of two or three items");
445 if ((x
= PySequence_GetItem(t
, 0)) == 0 ||
446 (y
= PySequence_GetItem(t
, 1)) == 0 ||
447 (n
== 3 && (z
= PySequence_GetItem(t
, 2)) == 0))
449 rc
= (n
== 2) ?
ecptxl_2(c
, p
, x
, y
) : ecptxl_3(c
, p
, x
, y
, z
);
451 TYERR("can't convert to curve point");
455 if (c
) EC_IN(c
, p
, p
);
459 Py_XDECREF(x
); Py_XDECREF(y
); Py_XDECREF(z
); Py_XDECREF(t
);
464 static int ecptxl(ec_curve
*c
, ec
*p
, PyObject
*x
, PyObject
*y
, PyObject
*z
)
467 return (ecptxl_3(c
, p
, x
, y
, z
));
469 return (ecptxl_2(c
, p
, x
, y
));
471 return (ecptxl_1(c
, p
, x
));
474 static PyObject
*ecptnc_pynew(PyTypeObject
*ty
, PyObject
*arg
, PyObject
*kw
)
476 PyObject
*x
= 0, *y
= 0, *z
= 0;
478 char *kwlist
[] = { "x", "y", 0 };
480 if (!PyArg_ParseTupleAndKeywords(arg
, kw
, "|OO:new", kwlist
, &x
, &y
) ||
481 ecptxl(0, &p
, x
, y
, z
))
483 return (ecpt_pywrapout(ty
, &p
));
489 static PyObject
*ecpt_pyint(PyObject
*me
)
494 if (EC_ATINF(ECPT_P(me
))) VALERR("point at infinity");
496 if (mp_tolong_checked(p
.x
, &l
)) goto end
;
497 rc
= PyInt_FromLong(l
);
503 static PyObject
*ecpt_pylong(PyObject
*me
)
507 if (EC_ATINF(ECPT_P(me
))) VALERR("point at infinity");
509 rc
= mp_topylong(p
.x
);
515 static PyObject
*ecpt_pynew(PyTypeObject
*ty
, PyObject
*arg
, PyObject
*kw
)
517 PyObject
*x
= 0, *y
= 0, *z
= 0;
519 char *kwlist
[] = { "x", "y", "z", 0 };
521 if (!PyArg_ParseTupleAndKeywords(arg
, kw
, "|OOO:new", kwlist
,
523 ecptxl(ECCURVE_C(ty
), &p
, x
, y
, z
))
525 return (ecpt_pywrap((PyObject
*)ty
, &p
));
531 static PyGetSetDef ecptnc_pygetset
[] = {
532 #define GETSETNAME(op, name) epnc##op##_##name
533 GET (ix
, "P.ix -> integer x coordinate of P")
534 GET (iy
, "P.iy -> integer y coordinate of P")
535 GET (point
, "P.point -> standalone curve point (no-op)")
540 static PyMethodDef ecptnc_pymethods
[] = {
541 #define METHNAME(func) epmeth_##func
542 METH (tobuf
, "X.tobuf() -> BIN")
547 static PyNumberMethods ecpt_pynumber
= {
549 0, /* @nb_subtract@ */
550 0, /* @nb_multiply@ */
552 0, /* @nb_remainder@ */
555 0, /* @nb_negative@ */
556 0, /* @nb_positive@ */
557 0, /* @nb_absolute@ */
558 ecpt_pynonzerop
, /* @nb_nonzero@ */
566 ecpt_pyint
, /* @nb_int@ */
567 ecpt_pylong
, /* @nb_long@ */
572 0, /* @nb_inplace_add@ */
573 0, /* @nb_inplace_subtract@ */
574 0, /* @nb_inplace_multiply@ */
575 0, /* @nb_inplace_divide@ */
576 0, /* @nb_inplace_remainder@ */
577 0, /* @nb_inplace_power@ */
578 0, /* @nb_inplace_lshift@ */
579 0, /* @nb_inplace_rshift@ */
580 0, /* @nb_inplace_and@ */
581 0, /* @nb_inplace_xor@ */
582 0, /* @nb_inplace_or@ */
584 0, /* @nb_floor_divide@ */
585 0, /* @nb_true_divide@ */
586 0, /* @nb_inplace_floor_divide@ */
587 0, /* @nb_inplace_true_divide@ */
590 static PyTypeObject ecpt_pytype_skel
= {
591 PyObject_HEAD_INIT(0) 0, /* Header */
592 "catacomb.ECPt", /* @tp_name@ */
593 sizeof(ecpt_pyobj
), /* @tp_basicsize@ */
594 0, /* @tp_itemsize@ */
596 ecpt_pydealloc
, /* @tp_dealloc@ */
598 0, /* @tp_getattr@ */
599 0, /* @tp_setattr@ */
600 0, /* @tp_compare@ */
602 &ecpt_pynumber
, /* @tp_as_number@ */
603 0, /* @tp_as_sequence@ */
604 0, /* @tp_as_mapping@ */
605 ecpt_pyhash
, /* @tp_hash@ */
608 0, /* @tp_getattro@ */
609 0, /* @tp_setattro@ */
610 0, /* @tp_as_buffer@ */
611 Py_TPFLAGS_DEFAULT
| /* @tp_flags@ */
612 Py_TPFLAGS_CHECKTYPES
|
616 "Elliptic curve points, not associated with any curve.",
618 0, /* @tp_traverse@ */
620 ecpt_pyrichcompare
, /* @tp_richcompare@ */
621 0, /* @tp_weaklistoffset@ */
623 0, /* @tp_iternext@ */
624 ecptnc_pymethods
, /* @tp_methods@ */
625 0, /* @tp_members@ */
626 ecptnc_pygetset
, /* @tp_getset@ */
629 0, /* @tp_descr_get@ */
630 0, /* @tp_descr_set@ */
631 0, /* @tp_dictoffset@ */
633 PyType_GenericAlloc
, /* @tp_alloc@ */
634 ecptnc_pynew
, /* @tp_new@ */
639 static PyGetSetDef ecpt_pygetset
[] = {
640 #define GETSETNAME(op, name) ep##op##_##name
641 GET (curve
, "P.curve -> elliptic curve containing P")
642 GET (point
, "P.point -> standalone curve point")
643 GET (x
, "P.x -> Cartesian x coordinate of P")
644 GET (y
, "P.y -> Cartesian y coordinate of P")
645 GET (_x
, "P._x -> internal x coordinate of P")
646 GET (_y
, "P._y -> internal y coordinate of P")
647 GET (_z
, "P._z -> internal z coordinate of P, or None")
652 static PyMethodDef ecpt_pymethods
[] = {
653 #define METHNAME(func) epmeth_##func
654 METH (toraw
, "X.toraw() -> BIN")
655 METH (dbl
, "X.dbl() -> X + X")
656 METH (oncurvep
, "X.oncurvep() -> BOOL")
661 static PyNumberMethods ecptcurve_pynumber
= {
662 ecpt_pyadd
, /* @nb_add@ */
663 ecpt_pysub
, /* @nb_subtract@ */
664 ecpt_pymul
, /* @nb_multiply@ */
666 0, /* @nb_remainder@ */
669 ecpt_pyneg
, /* @nb_negative@ */
670 ecpt_pyid
, /* @nb_positive@ */
671 0, /* @nb_absolute@ */
672 0, /* @nb_nonzero@ */
686 0, /* @nb_inplace_add@ */
687 0, /* @nb_inplace_subtract@ */
688 0, /* @nb_inplace_multiply@ */
689 0, /* @nb_inplace_divide@ */
690 0, /* @nb_inplace_remainder@ */
691 0, /* @nb_inplace_power@ */
692 0, /* @nb_inplace_lshift@ */
693 0, /* @nb_inplace_rshift@ */
694 0, /* @nb_inplace_and@ */
695 0, /* @nb_inplace_xor@ */
696 0, /* @nb_inplace_or@ */
698 0, /* @nb_floor_divide@ */
699 0, /* @nb_true_divide@ */
700 0, /* @nb_inplace_floor_divide@ */
701 0, /* @nb_inplace_true_divide@ */
704 static PyTypeObject ecptcurve_pytype_skel
= {
705 PyObject_HEAD_INIT(0) 0, /* Header */
706 "catacomb.ECPtCurve", /* @tp_name@ */
707 sizeof(ecpt_pyobj
), /* @tp_basicsize@ */
708 0, /* @tp_itemsize@ */
710 ecpt_pydealloc
, /* @tp_dealloc@ */
712 0, /* @tp_getattr@ */
713 0, /* @tp_setattr@ */
714 0, /* @tp_compare@ */
716 &ecptcurve_pynumber
, /* @tp_as_number@ */
717 0, /* @tp_as_sequence@ */
718 0, /* @tp_as_mapping@ */
722 0, /* @tp_getattro@ */
723 0, /* @tp_setattro@ */
724 0, /* @tp_as_buffer@ */
725 Py_TPFLAGS_DEFAULT
| /* @tp_flags@ */
726 Py_TPFLAGS_CHECKTYPES
|
730 "Elliptic curve points; abstract base class for points on given curves.",
732 0, /* @tp_traverse@ */
734 0, /* @tp_richcompare@ */
735 0, /* @tp_weaklistoffset@ */
737 0, /* @tp_iternext@ */
738 ecpt_pymethods
, /* @tp_methods@ */
739 0, /* @tp_members@ */
740 ecpt_pygetset
, /* @tp_getset@ */
743 0, /* @tp_descr_get@ */
744 0, /* @tp_descr_set@ */
745 0, /* @tp_dictoffset@ */
747 PyType_GenericAlloc
, /* @tp_alloc@ */
748 abstract_pynew
, /* @tp_new@ */
753 /*----- Elliptic curves themselves ----------------------------------------*/
755 static PyObject
*eccurve_pyrichcompare(PyObject
*x
, PyObject
*y
, int op
)
757 int b
= ec_samep(ECCURVE_C(x
), ECCURVE_C(y
));
761 default: TYERR("can't order elliptic curves");
768 static PyObject
*ecmmul_id(PyObject
*me
)
769 { ec p
= EC_INIT
; return (ecpt_pywrap(me
, &p
)); }
771 static int ecmmul_fill(void *pp
, PyObject
*me
, PyObject
*x
, PyObject
*m
)
773 ec_mulfactor
*f
= pp
;
776 if (getecpt(ECCURVE_C(me
), &f
->base
, x
) ||
777 (f
->exp
= getmp(m
)) == 0)
782 static PyObject
*ecmmul_exp(PyObject
*me
, void *pp
, int n
)
785 ec_immul(ECCURVE_C(me
), &p
, pp
, n
);
786 return (ecpt_pywrap(me
, &p
));
789 static void ecmmul_drop(void *pp
)
791 ec_mulfactor
*f
= pp
;
792 EC_DESTROY(&f
->base
);
796 static PyObject
*ecmeth_mmul(PyObject
*me
, PyObject
*arg
)
798 return (mexp_common(me
, arg
, sizeof(ec_mulfactor
),
799 ecmmul_id
, ecmmul_fill
, ecmmul_exp
, ecmmul_drop
));
802 static PyObject
*meth__ECPtCurve_fromraw(PyObject
*me
, PyObject
*arg
)
811 if (!PyArg_ParseTuple(arg
, "Os#:fromraw", &me
, &p
, &len
))
813 buf_init(&b
, p
, len
);
815 if (ec_getraw(cc
, &b
, &pp
))
818 rc
= Py_BuildValue("(NN)", ecpt_pywrap(me
, &pp
), bytestring_pywrapbuf(&b
));
823 static PyObject
*meth__ECPt_frombuf(PyObject
*me
, PyObject
*arg
)
831 if (!PyArg_ParseTuple(arg
, "Os#:frombuf", &me
, &p
, &sz
)) goto end
;
833 if (buf_getec(&b
, &pp
)) VALERR("malformed data");
834 rc
= Py_BuildValue("(NN)", ecpt_pywrapout(me
, &pp
),
835 bytestring_pywrapbuf(&b
));
840 static PyObject
*meth__ECPt_parse(PyObject
*me
, PyObject
*arg
)
847 if (!PyArg_ParseTuple(arg
, "Os:parse", &me
, &p
)) goto end
;
850 if (!ec_ptparse(&qd
, &pp
)) SYNERR(qd
.e
);
851 rc
= Py_BuildValue("(Ns)", ecpt_pywrapout(me
, &pp
), qd
.p
);
856 static void eccurve_pydealloc(PyObject
*me
)
858 ec_destroycurve(ECCURVE_C(me
));
859 Py_DECREF(ECCURVE_FOBJ(me
));
860 PyType_Type
.tp_dealloc(me
);
863 static PyObject
*ecmeth_find(PyObject
*me
, PyObject
*arg
)
870 if (!PyArg_ParseTuple(arg
, "O:find", &x
)) goto end
;
871 if (FIELD_PYCHECK(x
) && FE_F(x
) == ECCURVE_C(me
)->f
)
872 xx
= MP_COPY(FE_X(x
));
873 else if ((xx
= getmp(x
)) == 0)
876 xx
= F_IN(ECCURVE_C(me
)->f
, xx
, xx
);
877 if (EC_FIND(ECCURVE_C(me
), &p
, xx
) == 0)
878 VALERR("not on the curve");
879 rc
= ecpt_pywrap(me
, &p
);
885 static PyObject
*ecmeth_rand(PyObject
*me
, PyObject
*arg
, PyObject
*kw
)
887 char *kwlist
[] = { "rng", 0 };
888 grand
*r
= &rand_global
;
891 if (!PyArg_ParseTupleAndKeywords(arg
, kw
, "|O&:rand", kwlist
,
894 ec_rand(ECCURVE_C(me
), &p
, r
);
895 EC_IN(ECCURVE_C(me
), &p
, &p
);
896 return (ecpt_pywrap(me
, &p
));
899 static PyObject
*eccurve_dopywrap(PyTypeObject
*ty
,
900 PyObject
*fobj
, ec_curve
*c
)
902 eccurve_pyobj
*cobj
= newtype(ty
, 0, c
->ops
->name
);
905 cobj
->ty
.ht_type
.tp_basicsize
= sizeof(ecpt_pyobj
);
906 cobj
->ty
.ht_type
.tp_base
= ecptcurve_pytype
;
907 Py_INCREF(ecptcurve_pytype
);
908 cobj
->ty
.ht_type
.tp_flags
= (Py_TPFLAGS_DEFAULT
|
909 Py_TPFLAGS_BASETYPE
|
910 Py_TPFLAGS_CHECKTYPES
|
911 Py_TPFLAGS_HEAPTYPE
);
912 cobj
->ty
.ht_type
.tp_alloc
= PyType_GenericAlloc
;
913 cobj
->ty
.ht_type
.tp_free
= 0;
914 cobj
->ty
.ht_type
.tp_new
= ecpt_pynew
;
915 PyType_Ready(&cobj
->ty
.ht_type
);
916 return ((PyObject
*)cobj
);
919 PyObject
*eccurve_pywrap(PyObject
*fobj
, ec_curve
*c
)
924 fobj
= field_pywrap(c
->f
);
927 assert(FIELD_F(fobj
) == c
->f
);
928 if (strcmp(EC_NAME(c
), "prime") == 0)
929 ty
= ecprimecurve_pytype
;
930 else if (strcmp(EC_NAME(c
), "primeproj") == 0)
931 ty
= ecprimeprojcurve_pytype
;
932 else if (strcmp(EC_NAME(c
), "bin") == 0)
933 ty
= ecbincurve_pytype
;
934 else if (strcmp(EC_NAME(c
), "binproj") == 0)
935 ty
= ecbinprojcurve_pytype
;
938 return (eccurve_dopywrap(ty
, fobj
, c
));
941 static PyObject
*eccurve_pynew(PyTypeObject
*ty
,
942 ec_curve
*(*make
)(field
*, mp
*, mp
*),
943 PyObject
*arg
, PyObject
*kw
)
947 char *kwlist
[] = { "field", "a", "b", 0 };
950 if (!PyArg_ParseTupleAndKeywords(arg
, kw
, "O!O&O&", kwlist
,
952 convmp
, &aa
, convmp
, &bb
))
955 cobj
= eccurve_dopywrap(ty
, fobj
, make(FIELD_F(fobj
), aa
, bb
));
962 static PyObject
*meth__ECCurve_parse(PyObject
*me
, PyObject
*arg
)
969 if (!PyArg_ParseTuple(arg
, "Os:parse", &me
, &p
))
973 if ((c
= ec_curveparse(&qd
)) == 0)
975 rc
= eccurve_pywrap(0, c
);
980 static PyObject
*ecget_name(PyObject
*me
, void *hunoz
)
981 { return (PyString_FromString(EC_NAME(ECCURVE_C(me
)))); }
983 static PyObject
*ecget_a(PyObject
*me
, void *hunoz
)
984 { return (fe_pywrap(ECCURVE_FOBJ(me
), MP_COPY(ECCURVE_C(me
)->a
))); }
986 static PyObject
*ecget_b(PyObject
*me
, void *hunoz
)
987 { return (fe_pywrap(ECCURVE_FOBJ(me
), MP_COPY(ECCURVE_C(me
)->b
))); }
989 static PyObject
*ecget_field(PyObject
*me
, void *hunoz
)
990 { RETURN_OBJ(ECCURVE_FOBJ(me
)); }
992 static PyObject
*ecget_inf(PyObject
*me
, void *hunoz
)
993 { ec inf
= EC_INIT
; return (ecpt_pywrap(me
, &inf
)); }
995 static PyGetSetDef eccurve_pygetset
[] = {
996 #define GETSETNAME(op, name) ec##op##_##name
997 GET (name
, "E.name -> name of this kind of curve")
998 GET (a
, "E.a -> first parameter of curve")
999 GET (b
, "E.b -> second parameter of curve")
1000 GET (field
, "E.field -> finite field containing this curve")
1001 GET (inf
, "E.inf -> point at infinity of this curve")
1006 static PyMethodDef eccurve_pymethods
[] = {
1007 #define METHNAME(name) ecmeth_##name
1009 E.mmul([(P0, N0), (P1, N1), ...]) = N0 P0 + N1 P1 + ...")
1010 METH (find
, "E.find(X) -> P")
1011 KWMETH(rand
, "E.rand(rng = rand) ->P")
1016 static PyTypeObject eccurve_pytype_skel
= {
1017 PyObject_HEAD_INIT(0) 0, /* Header */
1018 "catacomb.ECCurve", /* @tp_name@ */
1019 sizeof(eccurve_pyobj
), /* @tp_basicsize@ */
1020 0, /* @tp_itemsize@ */
1022 eccurve_pydealloc
, /* @tp_dealloc@ */
1024 0, /* @tp_getattr@ */
1025 0, /* @tp_setattr@ */
1026 0, /* @tp_compare@ */
1028 0, /* @tp_as_number@ */
1029 0, /* @tp_as_sequence@ */
1030 0, /* @tp_as_mapping@ */
1034 0, /* @tp_getattro@ */
1035 0, /* @tp_setattro@ */
1036 0, /* @tp_as_buffer@ */
1037 Py_TPFLAGS_DEFAULT
| /* @tp_flags@ */
1038 Py_TPFLAGS_BASETYPE
,
1041 "An elliptic curve. Abstract class.",
1043 0, /* @tp_traverse@ */
1045 eccurve_pyrichcompare
, /* @tp_richcompare@ */
1046 0, /* @tp_weaklistoffset@ */
1048 0, /* @tp_iternext@ */
1049 eccurve_pymethods
, /* @tp_methods@ */
1050 0, /* @tp_members@ */
1051 eccurve_pygetset
, /* @tp_getset@ */
1054 0, /* @tp_descr_get@ */
1055 0, /* @tp_descr_set@ */
1056 0, /* @tp_dictoffset@ */
1058 PyType_GenericAlloc
, /* @tp_alloc@ */
1059 abstract_pynew
, /* @tp_new@ */
1064 static PyObject
*ecprimecurve_pynew(PyTypeObject
*ty
,
1065 PyObject
*arg
, PyObject
*kw
)
1067 return (eccurve_pynew(ty
, ec_prime
, arg
, kw
));
1070 static PyTypeObject ecprimecurve_pytype_skel
= {
1071 PyObject_HEAD_INIT(0) 0, /* Header */
1072 "catacomb.ECPrimeCurve", /* @tp_name@ */
1073 sizeof(eccurve_pyobj
), /* @tp_basicsize@ */
1074 0, /* @tp_itemsize@ */
1076 eccurve_pydealloc
, /* @tp_dealloc@ */
1078 0, /* @tp_getattr@ */
1079 0, /* @tp_setattr@ */
1080 0, /* @tp_compare@ */
1082 0, /* @tp_as_number@ */
1083 0, /* @tp_as_sequence@ */
1084 0, /* @tp_as_mapping@ */
1088 0, /* @tp_getattro@ */
1089 0, /* @tp_setattro@ */
1090 0, /* @tp_as_buffer@ */
1091 Py_TPFLAGS_DEFAULT
| /* @tp_flags@ */
1092 Py_TPFLAGS_BASETYPE
,
1095 "An elliptic curve over a prime field. Use ecprimeprojcurve.",
1097 0, /* @tp_traverse@ */
1099 eccurve_pyrichcompare
, /* @tp_richcompare@ */
1100 0, /* @tp_weaklistoffset@ */
1102 0, /* @tp_iternext@ */
1103 0, /* @tp_methods@ */
1104 0, /* @tp_members@ */
1105 0, /* @tp_getset@ */
1108 0, /* @tp_descr_get@ */
1109 0, /* @tp_descr_set@ */
1110 0, /* @tp_dictoffset@ */
1112 PyType_GenericAlloc
, /* @tp_alloc@ */
1113 ecprimecurve_pynew
, /* @tp_new@ */
1118 static PyObject
*ecprimeprojcurve_pynew(PyTypeObject
*ty
,
1119 PyObject
*arg
, PyObject
*kw
)
1121 return (eccurve_pynew(ty
, ec_primeproj
, arg
, kw
));
1124 static PyTypeObject ecprimeprojcurve_pytype_skel
= {
1125 PyObject_HEAD_INIT(0) 0, /* Header */
1126 "catacomb.ECPrimeProjCurve", /* @tp_name@ */
1127 sizeof(eccurve_pyobj
), /* @tp_basicsize@ */
1128 0, /* @tp_itemsize@ */
1130 eccurve_pydealloc
, /* @tp_dealloc@ */
1132 0, /* @tp_getattr@ */
1133 0, /* @tp_setattr@ */
1134 0, /* @tp_compare@ */
1136 0, /* @tp_as_number@ */
1137 0, /* @tp_as_sequence@ */
1138 0, /* @tp_as_mapping@ */
1142 0, /* @tp_getattro@ */
1143 0, /* @tp_setattro@ */
1144 0, /* @tp_as_buffer@ */
1145 Py_TPFLAGS_DEFAULT
| /* @tp_flags@ */
1146 Py_TPFLAGS_BASETYPE
,
1149 "An elliptic curve over a prime field, using projective coordinates.",
1151 0, /* @tp_traverse@ */
1153 eccurve_pyrichcompare
, /* @tp_richcompare@ */
1154 0, /* @tp_weaklistoffset@ */
1156 0, /* @tp_iternext@ */
1157 0, /* @tp_methods@ */
1158 0, /* @tp_members@ */
1159 0, /* @tp_getset@ */
1162 0, /* @tp_descr_get@ */
1163 0, /* @tp_descr_set@ */
1164 0, /* @tp_dictoffset@ */
1166 PyType_GenericAlloc
, /* @tp_alloc@ */
1167 ecprimeprojcurve_pynew
, /* @tp_new@ */
1172 static PyObject
*ecbincurve_pynew(PyTypeObject
*ty
,
1173 PyObject
*arg
, PyObject
*kw
)
1175 return (eccurve_pynew(ty
, ec_bin
, arg
, kw
));
1178 static PyTypeObject ecbincurve_pytype_skel
= {
1179 PyObject_HEAD_INIT(0) 0, /* Header */
1180 "catacomb.ECBinCurve", /* @tp_name@ */
1181 sizeof(eccurve_pyobj
), /* @tp_basicsize@ */
1182 0, /* @tp_itemsize@ */
1184 eccurve_pydealloc
, /* @tp_dealloc@ */
1186 0, /* @tp_getattr@ */
1187 0, /* @tp_setattr@ */
1188 0, /* @tp_compare@ */
1190 0, /* @tp_as_number@ */
1191 0, /* @tp_as_sequence@ */
1192 0, /* @tp_as_mapping@ */
1196 0, /* @tp_getattro@ */
1197 0, /* @tp_setattro@ */
1198 0, /* @tp_as_buffer@ */
1199 Py_TPFLAGS_DEFAULT
| /* @tp_flags@ */
1200 Py_TPFLAGS_BASETYPE
,
1203 "An elliptic curve over a binary field. Use ecbinprojcurve.",
1205 0, /* @tp_traverse@ */
1207 eccurve_pyrichcompare
, /* @tp_richcompare@ */
1208 0, /* @tp_weaklistoffset@ */
1210 0, /* @tp_iternext@ */
1211 0, /* @tp_methods@ */
1212 0, /* @tp_members@ */
1213 0, /* @tp_getset@ */
1216 0, /* @tp_descr_get@ */
1217 0, /* @tp_descr_set@ */
1218 0, /* @tp_dictoffset@ */
1220 PyType_GenericAlloc
, /* @tp_alloc@ */
1221 ecbincurve_pynew
, /* @tp_new@ */
1226 static PyObject
*ecbinprojcurve_pynew(PyTypeObject
*ty
,
1227 PyObject
*arg
, PyObject
*kw
)
1229 return (eccurve_pynew(ty
, ec_binproj
, arg
, kw
));
1232 static PyTypeObject ecbinprojcurve_pytype_skel
= {
1233 PyObject_HEAD_INIT(0) 0, /* Header */
1234 "catacomb.ECBinProjCurve", /* @tp_name@ */
1235 sizeof(eccurve_pyobj
), /* @tp_basicsize@ */
1236 0, /* @tp_itemsize@ */
1238 eccurve_pydealloc
, /* @tp_dealloc@ */
1240 0, /* @tp_getattr@ */
1241 0, /* @tp_setattr@ */
1242 0, /* @tp_compare@ */
1244 0, /* @tp_as_number@ */
1245 0, /* @tp_as_sequence@ */
1246 0, /* @tp_as_mapping@ */
1250 0, /* @tp_getattro@ */
1251 0, /* @tp_setattro@ */
1252 0, /* @tp_as_buffer@ */
1253 Py_TPFLAGS_DEFAULT
| /* @tp_flags@ */
1254 Py_TPFLAGS_BASETYPE
,
1257 "An elliptic curve over a binary field, using projective coordinates.",
1259 0, /* @tp_traverse@ */
1261 eccurve_pyrichcompare
, /* @tp_richcompare@ */
1262 0, /* @tp_weaklistoffset@ */
1264 0, /* @tp_iternext@ */
1265 0, /* @tp_methods@ */
1266 0, /* @tp_members@ */
1267 0, /* @tp_getset@ */
1270 0, /* @tp_descr_get@ */
1271 0, /* @tp_descr_set@ */
1272 0, /* @tp_dictoffset@ */
1274 PyType_GenericAlloc
, /* @tp_alloc@ */
1275 ecbinprojcurve_pynew
, /* @tp_new@ */
1280 /*----- Curve info --------------------------------------------------------*/
1282 static int ncurves
= -1;
1284 void ecinfo_copy(ec_info
*eic
, const ec_info
*ei
)
1286 eic
->c
= eccurve_copy(ei
->c
);
1288 EC_COPY(&eic
->g
, &ei
->g
);
1289 eic
->r
= MP_COPY(ei
->r
);
1290 eic
->h
= MP_COPY(ei
->h
);
1293 PyObject
*ecinfo_pywrap(ec_info
*ei
)
1297 o
= PyObject_NEW(ecinfo_pyobj
, ecinfo_pytype
);
1299 o
->cobj
= eccurve_pywrap(0, o
->ei
.c
);
1301 return ((PyObject
*)o
);
1304 static void ecinfo_pydealloc(PyObject
*me
)
1306 ec_info
*ei
= ECINFO_EI(me
);
1310 Py_DECREF(ECINFO_COBJ(me
));
1314 static PyObject
*ecinfo_pynew(PyTypeObject
*ty
, PyObject
*arg
, PyObject
*kw
)
1318 char *kwlist
[] = { "curve", "G", "r", "h", 0 };
1319 ecinfo_pyobj
*rc
= 0;
1321 if (!PyArg_ParseTupleAndKeywords(arg
, kw
, "O!O!O&O&:new", kwlist
,
1322 eccurve_pytype
, &e
, ecpt_pytype
, &g
,
1323 convmp
, &ei
.r
, convmp
, &ei
.h
))
1325 if (ECPT_C(g
) != ECCURVE_C(e
) && !ec_samep(ECPT_C(g
), ECCURVE_C(e
)))
1326 TYERR("point not from this curve");
1327 ei
.c
= ECCURVE_C(e
);
1329 EC_OUT(ei
.c
, &ei
.g
, ECPT_P(g
));
1330 rc
= (ecinfo_pyobj
*)ty
->tp_alloc(ty
, 0);
1333 Py_INCREF(rc
->cobj
);
1334 return ((PyObject
*)rc
);
1342 static PyObject
*meth__ECInfo_parse(PyObject
*me
, PyObject
*arg
)
1349 if (!PyArg_ParseTuple(arg
, "Os:parse", &me
, &p
))
1353 if (ec_infoparse(&qd
, &ei
))
1355 rc
= Py_BuildValue("(Ns)", ecinfo_pywrap(&ei
), qd
.p
);
1360 static PyObject
*meth__ECInfo__curven(PyObject
*me
, PyObject
*arg
)
1366 if (!PyArg_ParseTuple(arg
, "Oi:_curven", &me
, &i
)) goto end
;
1367 if (i
< 0 || i
>= ncurves
) VALERR("curve index out of range");
1368 ec_infofromdata(&ei
, ectab
[i
].data
);
1369 rc
= ecinfo_pywrap(&ei
);
1374 static PyObject
*ecinfo_pyrichcompare(PyObject
*x
, PyObject
*y
, int op
)
1376 int b
= ec_sameinfop(ECINFO_EI(x
), ECINFO_EI(y
));
1380 default: TYERR("can't order elliptic curve infos");
1382 return (getbool(b
));
1387 static PyObject
*eimeth_check(PyObject
*me
, PyObject
*arg
, PyObject
*kw
)
1389 char *kwlist
[] = { "rng", 0 };
1390 grand
*r
= &rand_global
;
1393 if (!PyArg_ParseTupleAndKeywords(arg
, kw
, "|O&:check", kwlist
,
1396 if ((p
= ec_checkinfo(ECINFO_EI(me
), r
)) != 0)
1403 static PyObject
*eiget_curve(PyObject
*me
, void *hunoz
)
1404 { RETURN_OBJ(ECINFO_COBJ(me
)); }
1406 static PyObject
*eiget_G(PyObject
*me
, void *hunoz
)
1408 ec_info
*ei
= ECINFO_EI(me
);
1410 EC_IN(ei
->c
, &p
, &ei
->g
);
1411 return (ecpt_pywrap(ECINFO_COBJ(me
), &p
));
1414 static PyObject
*eiget_r(PyObject
*me
, void *hunoz
)
1415 { return (mp_pywrap(MP_COPY(ECINFO_EI(me
)->r
))); }
1417 static PyObject
*eiget_h(PyObject
*me
, void *hunoz
)
1418 { return (mp_pywrap(MP_COPY(ECINFO_EI(me
)->h
))); }
1420 static PyGetSetDef ecinfo_pygetset
[] = {
1421 #define GETSETNAME(op, name) ei##op##_##name
1422 GET (curve
, "I.curve -> the elliptic curve")
1423 GET (G
, "I.G -> generator point for the group")
1424 GET (r
, "I.r -> order of the group (and hence of G")
1425 GET (h
, "I.h -> cofactor of the group")
1430 static PyMethodDef ecinfo_pymethods
[] = {
1431 #define METHNAME(name) eimeth_##name
1432 KWMETH(check
, "I.check() -> None")
1437 static PyTypeObject ecinfo_pytype_skel
= {
1438 PyObject_HEAD_INIT(0) 0, /* Header */
1439 "catacomb.ECInfo", /* @tp_name@ */
1440 sizeof(ecinfo_pyobj
), /* @tp_basicsize@ */
1441 0, /* @tp_itemsize@ */
1443 ecinfo_pydealloc
, /* @tp_dealloc@ */
1445 0, /* @tp_getattr@ */
1446 0, /* @tp_setattr@ */
1447 0, /* @tp_compare@ */
1449 0, /* @tp_as_number@ */
1450 0, /* @tp_as_sequence@ */
1451 0, /* @tp_as_mapping@ */
1455 0, /* @tp_getattro@ */
1456 0, /* @tp_setattro@ */
1457 0, /* @tp_as_buffer@ */
1458 Py_TPFLAGS_DEFAULT
| /* @tp_flags@ */
1459 Py_TPFLAGS_BASETYPE
,
1462 "Elliptic curve domain parameters.",
1464 0, /* @tp_traverse@ */
1466 ecinfo_pyrichcompare
, /* @tp_richcompare@ */
1467 0, /* @tp_weaklistoffset@ */
1469 0, /* @tp_iternext@ */
1470 ecinfo_pymethods
, /* @tp_methods@ */
1471 0, /* @tp_members@ */
1472 ecinfo_pygetset
, /* @tp_getset@ */
1475 0, /* @tp_descr_get@ */
1476 0, /* @tp_descr_set@ */
1477 0, /* @tp_dictoffset@ */
1479 PyType_GenericAlloc
, /* @tp_alloc@ */
1480 ecinfo_pynew
, /* @tp_new@ */
1485 /*----- Setup -------------------------------------------------------------*/
1487 static PyMethodDef methods
[] = {
1488 #define METHNAME(func) meth_##func
1489 METH (_ECPt_frombuf
, "frombuf(E, STR) -> (P, REST)")
1490 METH (_ECPtCurve_fromraw
, "fromraw(E, STR) -> (P, REST)")
1491 METH (_ECPt_parse
, "parse(E, STR) -> (P, REST)")
1492 METH (_ECCurve_parse
, "parse(STR) -> (E, REST)")
1493 METH (_ECInfo_parse
, "parse(STR) -> (I, REST)")
1494 METH (_ECInfo__curven
, "_curven(N) -> I")
1499 void ec_pyinit(void)
1501 INITTYPE(ecpt
, root
);
1502 INITTYPE(ecptcurve
, ecpt
);
1503 INITTYPE(eccurve
, type
);
1504 INITTYPE(ecprimecurve
, eccurve
);
1505 INITTYPE(ecprimeprojcurve
, ecprimecurve
);
1506 INITTYPE(ecbincurve
, eccurve
);
1507 INITTYPE(ecbinprojcurve
, ecbincurve
);
1508 INITTYPE(ecinfo
, root
);
1509 addmethods(methods
);
1512 static PyObject
*namedcurves(void)
1519 for (i
= 0; ectab
[i
].name
; i
++) {
1521 for (j
= 0; j
< i
; j
++) {
1522 if (ectab
[i
].data
== ectab
[j
].data
) {
1523 c
= PyDict_GetItemString(d
, (/*unconst*/ char *)ectab
[j
].name
);
1528 c
= PyInt_FromLong(i
);
1530 PyDict_SetItemString(d
, (/*unconst*/ char *)p
, c
);
1537 void ec_pyinsert(PyObject
*mod
)
1539 INSERT("ECPt", ecpt_pytype
);
1540 INSERT("ECPtCurve", ecptcurve_pytype
);
1541 INSERT("ECCurve", eccurve_pytype
);
1542 INSERT("ECPrimeCurve", ecprimecurve_pytype
);
1543 INSERT("ECPrimeProjCurve", ecprimeprojcurve_pytype
);
1544 INSERT("ECBinCurve", ecbincurve_pytype
);
1545 INSERT("ECBinProjCurve", ecbinprojcurve_pytype
);
1546 INSERT("ECInfo", ecinfo_pytype
);
1547 INSERT("_eccurves", namedcurves());
1550 /*----- That's all, folks -------------------------------------------------*/