~mdw
/
catacomb-python
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
t/t-algorithms.py: Add a simple test for `Keccak1600.copy'.
[catacomb-python]
/
rand.c
diff --git
a/rand.c
b/rand.c
index
e208237
..
d57795a
100644
(file)
--- a/
rand.c
+++ b/
rand.c
@@
-124,9
+124,9
@@
static PyObject *grmeth_mp(PyObject *me, PyObject *arg, PyObject *kw)
{
size_t l;
mpw o = 0;
{
size_t l;
mpw o = 0;
-
char *
kwlist[] = { "bits", "or", 0 };
+
static const char *const
kwlist[] = { "bits", "or", 0 };
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&|O&:mp",
kwlist
,
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&|O&:mp",
KWLIST
,
convszt, &l, convmpw, &o))
goto end;
if (grand_check(me)) return (0);
convszt, &l, convmpw, &o))
goto end;
if (grand_check(me)) return (0);
@@
-214,10
+214,10
@@
end:
static PyObject *grmeth_seedrand(PyObject *me, PyObject *arg, PyObject *kw)
{
static PyObject *grmeth_seedrand(PyObject *me, PyObject *arg, PyObject *kw)
{
-
char *
kwlist[] = { "rng", 0 };
+
static const char *const
kwlist[] = { "rng", 0 };
grand *r = GRAND_R(me);
grand *rr = &rand_global;
grand *r = GRAND_R(me);
grand *rr = &rand_global;
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&:seedrand",
kwlist
,
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&:seedrand",
KWLIST
,
convgrand, &rr) ||
grand_check(me) || checkop(r, GRAND_SEEDRAND, "seedrand"))
goto end;
convgrand, &rr) ||
grand_check(me) || checkop(r, GRAND_SEEDRAND, "seedrand"))
goto end;
@@
-332,8
+332,8
@@
static PyTypeObject grand_pytype_skel = {
static PyObject *lcrand_pynew(PyTypeObject *me, PyObject *arg, PyObject *kw)
{
uint32 n = 0;
static PyObject *lcrand_pynew(PyTypeObject *me, PyObject *arg, PyObject *kw)
{
uint32 n = 0;
-
char *
kwlist[] = { "seed", 0 };
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&:new",
kwlist
, convu32, &n))
+
static const char *const
kwlist[] = { "seed", 0 };
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&:new",
KWLIST
, convu32, &n))
return (0);
return (grand_dopywrap(lcrand_pytype, lcrand_create(n), f_freeme));
}
return (0);
return (grand_dopywrap(lcrand_pytype, lcrand_create(n), f_freeme));
}
@@
-389,8
+389,8
@@
static PyTypeObject lcrand_pytype_skel = {
static PyObject *fibrand_pynew(PyTypeObject *me, PyObject *arg, PyObject *kw)
{
uint32 n = 0;
static PyObject *fibrand_pynew(PyTypeObject *me, PyObject *arg, PyObject *kw)
{
uint32 n = 0;
-
char *
kwlist[] = { "seed", 0 };
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&:new",
kwlist
, convu32, &n))
+
static const char *const
kwlist[] = { "seed", 0 };
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&:new",
KWLIST
, convu32, &n))
return (0);
return (grand_dopywrap(fibrand_pytype, fibrand_create(n), f_freeme));
}
return (0);
return (grand_dopywrap(fibrand_pytype, fibrand_create(n), f_freeme));
}
@@
-503,10
+503,10
@@
static PyObject *trmeth_timer(PyObject *me, PyObject *arg)
static PyObject *truerand_pynew(PyTypeObject *ty,
PyObject *arg, PyObject *kw)
{
static PyObject *truerand_pynew(PyTypeObject *ty,
PyObject *arg, PyObject *kw)
{
-
char *
kwlist[] = { 0 };
+
static const char *const
kwlist[] = { 0 };
grand *r;
PyObject *rc = 0;
grand *r;
PyObject *rc = 0;
- if (
PyArg_ParseTupleAndKeywords(arg, kw, ":new", kwlist
)) goto end;
+ if (
!PyArg_ParseTupleAndKeywords(arg, kw, ":new", KWLIST
)) goto end;
r = rand_create();
r->ops->misc(r, RAND_NOISESRC, &noise_source);
r->ops->misc(r, RAND_SEED, 160);
r = rand_create();
r->ops->misc(r, RAND_NOISESRC, &noise_source);
r->ops->misc(r, RAND_SEED, 160);
@@
-639,11
+639,11
@@
static const gccrand_info *const gcrandtab[] = {
static PyObject *gcrand_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
{
const gccrand_info *info = GCCRAND_INFO(ty);
static PyObject *gcrand_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
{
const gccrand_info *info = GCCRAND_INFO(ty);
- static c
har *
kwlist[] = { "key", 0 };
+ static c
onst char *const
kwlist[] = { "key", 0 };
char *k;
Py_ssize_t n;
char *k;
Py_ssize_t n;
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#:new",
kwlist
, &k, &n))
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#:new",
KWLIST
, &k, &n))
goto end;
if (keysz(n, info->keysz) != n) VALERR("bad key length");
return (grand_dopywrap(ty, info->func(k, n), f_freeme));
goto end;
if (keysz(n, info->keysz) != n) VALERR("bad key length");
return (grand_dopywrap(ty, info->func(k, n), f_freeme));
@@
-655,11
+655,11
@@
static PyObject *gcirand_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
{
const gccrand_info *info = GCCRAND_INFO(ty);
uint32 i = 0;
{
const gccrand_info *info = GCCRAND_INFO(ty);
uint32 i = 0;
- static c
har *
kwlist[] = { "key", "i", 0 };
+ static c
onst char *const
kwlist[] = { "key", "i", 0 };
char *k;
Py_ssize_t n;
char *k;
Py_ssize_t n;
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#O&:new",
kwlist
,
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#O&:new",
KWLIST
,
&k, &n, convu32, &i))
goto end;
if (keysz(n, info->keysz) != n) VALERR("bad key length");
&k, &n, convu32, &i))
goto end;
if (keysz(n, info->keysz) != n) VALERR("bad key length");
@@
-673,11
+673,11
@@
end:
static PyObject *gcnrand_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
{
const gccrand_info *info = GCCRAND_INFO(ty);
static PyObject *gcnrand_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
{
const gccrand_info *info = GCCRAND_INFO(ty);
- static c
har *
kwlist[] = { "key", "nonce", 0 };
+ static c
onst char *const
kwlist[] = { "key", "nonce", 0 };
char *k, *n;
Py_ssize_t ksz, nsz;
char *k, *n;
Py_ssize_t ksz, nsz;
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#s#:new",
kwlist
,
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#s#:new",
KWLIST
,
&k, &ksz, &n, &nsz))
goto end;
if (keysz(ksz, info->keysz) != ksz) VALERR("bad key length");
&k, &ksz, &n, &nsz))
goto end;
if (keysz(ksz, info->keysz) != ksz) VALERR("bad key length");
@@
-693,15
+693,18
@@
static PyObject *gcshakyrand_pynew(PyTypeObject *ty,
PyObject *arg, PyObject *kw)
{
const gccrand_info *info = GCCRAND_INFO(ty);
PyObject *arg, PyObject *kw)
{
const gccrand_info *info = GCCRAND_INFO(ty);
- static char *kwlist_shake[] = { "key", "func", "perso", 0 };
- static char *kwlist_func[] = { "key", "perso", 0 };
+ static const char
+ *const kwlist_shake[] = { "key", "func", "perso", 0 },
+ *const kwlist_func[] = { "key", "perso", 0 };
char *k, *f = 0, *p = 0;
Py_ssize_t ksz, fsz = 0, psz = 0;
if ((info->f&RNGF_MASK) == RNG_SHAKE
char *k, *f = 0, *p = 0;
Py_ssize_t ksz, fsz = 0, psz = 0;
if ((info->f&RNGF_MASK) == RNG_SHAKE
- ? !PyArg_ParseTupleAndKeywords(arg, kw, "s#|s#s#:new", kwlist_shake,
+ ? !PyArg_ParseTupleAndKeywords(arg, kw, "s#|s#s#:new",
+ (/*unconst*/ char **)kwlist_shake,
&k, &ksz, &f, &fsz, &p, &psz)
&k, &ksz, &f, &fsz, &p, &psz)
- : !PyArg_ParseTupleAndKeywords(arg, kw, "s#|s#:new", kwlist_func,
+ : !PyArg_ParseTupleAndKeywords(arg, kw, "s#|s#:new",
+ (/*unconst*/ char **)kwlist_func,
&k, &ksz, &p, &psz))
goto end;
if (keysz(ksz, info->keysz) != ksz) VALERR("bad key length");
&k, &ksz, &p, &psz))
goto end;
if (keysz(ksz, info->keysz) != ksz) VALERR("bad key length");
@@
-938,9
+941,9
@@
static PyObject *sslprf_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
int ksz, ssz;
const gchash *hco = &md5, *hci = &sha;
PyObject *rc = 0;
int ksz, ssz;
const gchash *hco = &md5, *hci = &sha;
PyObject *rc = 0;
-
char *
kwlist[] = { "key", "seed", "ohash", "ihash", 0 };
+
static const char *const
kwlist[] = { "key", "seed", "ohash", "ihash", 0 };
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#s#|O&O&:new",
kwlist
,
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#s#|O&O&:new",
KWLIST
,
&k, &ksz, &s, &ssz,
convgchash, &hco, convgchash, &hci))
goto end;
&k, &ksz, &s, &ssz,
convgchash, &hco, convgchash, &hci))
goto end;
@@
-955,9
+958,9
@@
static PyObject *tlsdx_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
int ksz, ssz;
const gcmac *mc = &sha_hmac;
PyObject *rc = 0;
int ksz, ssz;
const gcmac *mc = &sha_hmac;
PyObject *rc = 0;
-
char *
kwlist[] = { "key", "seed", "mac", 0 };
+
static const char *const
kwlist[] = { "key", "seed", "mac", 0 };
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#s#|O&:new",
kwlist
,
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#s#|O&:new",
KWLIST
,
&k, &ksz, &s, &ssz,
convgcmac, &mc))
goto end;
&k, &ksz, &s, &ssz,
convgcmac, &mc))
goto end;
@@
-972,9
+975,9
@@
static PyObject *tlsprf_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
int ksz, ssz;
const gcmac *mcl = &md5_hmac, *mcr = &sha_hmac;
PyObject *rc = 0;
int ksz, ssz;
const gcmac *mcl = &md5_hmac, *mcr = &sha_hmac;
PyObject *rc = 0;
-
char *
kwlist[] = { "key", "seed", "lmac", "rmac", 0 };
+
static const char *const
kwlist[] = { "key", "seed", "lmac", "rmac", 0 };
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#s#|O&O&:new",
kwlist
,
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#s#|O&O&:new",
KWLIST
,
&k, &ksz, &s, &ssz,
convgcmac, &mcl, convgcmac, &mcr))
goto end;
&k, &ksz, &s, &ssz,
convgcmac, &mcl, convgcmac, &mcr))
goto end;
@@
-1137,9
+1140,9
@@
static PyObject *dsarand_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
char *p;
int sz;
PyObject *rc = 0;
char *p;
int sz;
PyObject *rc = 0;
-
char *
kwlist[] = { "seed", 0 };
+
static const char *const
kwlist[] = { "seed", 0 };
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#:new",
kwlist
, &p, &sz))
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#:new",
KWLIST
, &p, &sz))
goto end;
rc = grand_dopywrap(ty, dsarand_create(p, sz), f_freeme);
end:
goto end;
rc = grand_dopywrap(ty, dsarand_create(p, sz), f_freeme);
end:
@@
-1216,9
+1219,9
@@
static PyObject *bbs_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
{
mp *n = 0, *x = MP_TWO;
PyObject *rc = 0;
{
mp *n = 0, *x = MP_TWO;
PyObject *rc = 0;
-
char *
kwlist[] = { "n", "x", 0 };
+
static const char *const
kwlist[] = { "n", "x", 0 };
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&|O&:new",
kwlist
,
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "O&|O&:new",
KWLIST
,
convmp, &n, convmp, &x))
goto end;
rc = grand_dopywrap(ty, bbs_rand(n, x), f_freeme);
convmp, &n, convmp, &x))
goto end;
rc = grand_dopywrap(ty, bbs_rand(n, x), f_freeme);
@@
-1264,7
+1267,7
@@
static PyObject *bbsget_x(PyObject *me, void *hunoz)
static int bbsset_x(PyObject *me, PyObject *val, void *hunoz)
{
static int bbsset_x(PyObject *me, PyObject *val, void *hunoz)
{
- mp *x = 0; grand *r = GRAND_R(me); int rc = -1; if (!
x
) NIERR("__del__");
+ mp *x = 0; grand *r = GRAND_R(me); int rc = -1; if (!
val
) NIERR("__del__");
if ((x = getmp(val)) == 0) goto end;
r->ops->misc(r, BBS_SET, x); rc = 0;
end: mp_drop(x); return (rc);
if ((x = getmp(val)) == 0) goto end;
r->ops->misc(r, BBS_SET, x); rc = 0;
end: mp_drop(x); return (rc);
@@
-1354,9
+1357,9
@@
static PyObject *bbspriv_pynew(PyTypeObject *ty,
{
mp *p = 0, *q = 0, *n = 0, *x = MP_TWO;
bbspriv_pyobj *rc = 0;
{
mp *p = 0, *q = 0, *n = 0, *x = MP_TWO;
bbspriv_pyobj *rc = 0;
-
char *
kwlist[] = { "n", "p", "q", "seed", 0 };
+
static const char *const
kwlist[] = { "n", "p", "q", "seed", 0 };
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&O&O&O&:new",
kwlist
,
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "|O&O&O&O&:new",
KWLIST
,
convmp, &n, convmp, &p, convmp, &q,
convmp, &x))
goto end;
convmp, &n, convmp, &p, convmp, &q,
convmp, &x))
goto end;
@@
-1380,18
+1383,21
@@
static PyObject *meth__BBSPriv_generate(PyObject *me,
{
bbs_priv bp = { 0 };
mp *x = MP_TWO;
{
bbs_priv bp = { 0 };
mp *x = MP_TWO;
- pgev evt = { 0 };
+ struct excinfo exc = EXCINFO_INIT;
+ pypgev evt = { { 0 } };
unsigned nbits, n = 0;
grand *r = &rand_global;
unsigned nbits, n = 0;
grand *r = &rand_global;
- char *kwlist[] = { "class", "nbits", "event", "rng", "nsteps", "seed", 0 };
+ static const char *const kwlist[] =
+ { "class", "nbits", "event", "rng", "nsteps", "seed", 0 };
bbspriv_pyobj *rc = 0;
bbspriv_pyobj *rc = 0;
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "OO&|O&O&O&O&:generate", kwlist,
+ evt.exc = &exc;
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "OO&|O&O&O&O&:generate", KWLIST,
&me, convuint, &nbits, convpgev, &evt,
convgrand, &r, convuint, &n, convmp, &x))
goto end;
&me, convuint, &nbits, convpgev, &evt,
convgrand, &r, convuint, &n, convmp, &x))
goto end;
- if (bbs_gen(&bp, nbits, r, n, evt.
proc, evt
.ctx))
-
VALERR("prime genration failed"
);
+ if (bbs_gen(&bp, nbits, r, n, evt.
ev.proc, evt.ev
.ctx))
+
PGENERR(&exc
);
rc = PyObject_New(bbspriv_pyobj, bbspriv_pytype);
rc->gr.r = bbs_rand(bp.n, x);
rc->gr.f = f_freeme;
rc = PyObject_New(bbspriv_pyobj, bbspriv_pytype);
rc->gr.r = bbs_rand(bp.n, x);
rc->gr.f = f_freeme;
@@
-1506,7
+1512,8
@@
static PyTypeObject bbspriv_pytype_skel = {
static PyMethodDef methods[] = {
#define METHNAME(name) meth_##name
KWMETH(_BBSPriv_generate, "\
static PyMethodDef methods[] = {
#define METHNAME(name) meth_##name
KWMETH(_BBSPriv_generate, "\
-generate(NBITS, [event = pgen_nullev, rng = rand, nsteps = 0, seed = 2])")
+generate(NBITS, [event = pgen_nullev], [rng = rand],\n\
+ [nsteps = 0], [seed = 2]) -> R")
#undef METHNAME
{ 0 }
};
#undef METHNAME
{ 0 }
};