From: Mark Wooding <mdw@distorted.org.uk>
Date: Tue, 7 Apr 2020 23:56:01 +0000 (+0100)
Subject: Merge branch '1.2.x' into 1.3.x
X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb-python/commitdiff_plain/2a3f4da1c95d71e6045ddf1617754bacddfd46c3?hp=-c

Merge branch '1.2.x' into 1.3.x

* 1.2.x:
  rand.c: More `Py_ssize_t' fixes.
---

2a3f4da1c95d71e6045ddf1617754bacddfd46c3
diff --combined rand.c
index b662fd5,641b9bd..841a402
--- a/rand.c
+++ b/rand.c
@@@ -124,9 -124,9 +124,9 @@@ static PyObject *grmeth_mp(PyObject *me
  {
    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);
@@@ -214,10 -214,10 +214,10 @@@ end
  
  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;
 -  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;
@@@ -332,8 -332,8 +332,8 @@@ static PyTypeObject grand_pytype_skel 
  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));
  }
@@@ -363,7 -363,7 +363,7 @@@ static PyTypeObject lcrand_pytype_skel 
      Py_TPFLAGS_BASETYPE,
  
    /* @tp_doc@ */
 -"Linear congruential generator.",
 +"LCRand([seed = 0]): linear congruential generator.",
  
    0,					/* @tp_traverse@ */
    0,					/* @tp_clear@ */
@@@ -389,8 -389,8 +389,8 @@@
  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));
  }
@@@ -420,7 -420,7 +420,7 @@@ static PyTypeObject fibrand_pytype_ske
      Py_TPFLAGS_BASETYPE,
  
    /* @tp_doc@ */
 -"Fibonacci generator.",
 +"FibRand([seed = 0]): Fibonacci generator.",
  
    0,					/* @tp_traverse@ */
    0,					/* @tp_clear@ */
@@@ -503,10 -503,10 +503,10 @@@ static PyObject *trmeth_timer(PyObject 
  static PyObject *truerand_pynew(PyTypeObject *ty,
  				PyObject *arg, PyObject *kw)
  {
 -  char *kwlist[] = { 0 };
 +  static const char *const kwlist[] = { 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);
@@@ -565,7 -565,7 +565,7 @@@ static PyTypeObject truerand_pytype_ske
      Py_TPFLAGS_BASETYPE,
  
    /* @tp_doc@ */
 -"True random number source.",
 +"TrueRand(): true random number source.",
  
    0,					/* @tp_traverse@ */
    0,					/* @tp_clear@ */
@@@ -639,11 -639,11 +639,11 @@@ static const gccrand_info *const gcrand
  static PyObject *gcrand_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
  {
    const gccrand_info *info = GCCRAND_INFO(ty);
 -  static char *kwlist[] = { "key", 0 };
 +  static const char *const kwlist[] = { "key", 0 };
    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));
@@@ -655,11 -655,11 +655,11 @@@ static PyObject *gcirand_pynew(PyTypeOb
  {
    const gccrand_info *info = GCCRAND_INFO(ty);
    uint32 i = 0;
 -  static char *kwlist[] = { "key", "i", 0 };
 +  static const char *const kwlist[] = { "key", "i", 0 };
    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");
@@@ -673,11 -673,11 +673,11 @@@ end
  static PyObject *gcnrand_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
  {
    const gccrand_info *info = GCCRAND_INFO(ty);
 -  static char *kwlist[] = { "key", "nonce", 0 };
 +  static const char *const kwlist[] = { "key", "nonce", 0 };
    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");
@@@ -693,18 -693,15 +693,18 @@@ static PyObject *gcshakyrand_pynew(PyTy
  				   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
 -	? !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)
 -	: !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");
@@@ -938,12 -935,12 +938,12 @@@ static PyTypeObject gclatinrand_pytype_
  static PyObject *sslprf_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
  {
    char *k, *s;
-   int ksz, ssz;
+   Py_ssize_t 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;
@@@ -955,12 -952,12 +955,12 @@@ end
  static PyObject *tlsdx_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
  {
    char *k, *s;
-   int ksz, ssz;
+   Py_ssize_t 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;
@@@ -972,12 -969,12 +972,12 @@@ end
  static PyObject *tlsprf_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
  {
    char *k, *s;
-   int ksz, ssz;
+   Py_ssize_t 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;
@@@ -1011,8 -1008,7 +1011,8 @@@ static PyTypeObject sslprf_pytype_skel 
      Py_TPFLAGS_BASETYPE,
  
    /* @tp_doc@ */
 -"Random number generator for SSL master secret.",
 +"SSLRand(KEY, SEED, [ohash = md5], [ihash = sha]):\n\
 +  RNG for SSL master secret.",
  
    0,					/* @tp_traverse@ */
    0,					/* @tp_clear@ */
@@@ -1060,8 -1056,7 +1060,8 @@@ static PyTypeObject tlsdx_pytype_skel 
      Py_TPFLAGS_BASETYPE,
  
    /* @tp_doc@ */
 -"TLS data expansion function.",
 +"TLSDataExpansion(KEY, SEED, [mac = sha_hmac]):\n\
 +  TLS data expansion function.",
  
    0,					/* @tp_traverse@ */
    0,					/* @tp_clear@ */
@@@ -1109,8 -1104,7 +1109,8 @@@ static PyTypeObject tlsprf_pytype_skel 
      Py_TPFLAGS_BASETYPE,
  
    /* @tp_doc@ */
 -"TLS pseudorandom function.",
 +"TLSPRF(KEY, SEED, [lmac = md5_hmac], [rmac = sha_hmac]):\n\
 +  TLS pseudorandom function.",
  
    0,					/* @tp_traverse@ */
    0,					/* @tp_clear@ */
@@@ -1138,11 -1132,11 +1138,11 @@@
  static PyObject *dsarand_pynew(PyTypeObject *ty, PyObject *arg, PyObject *kw)
  {
    char *p;
-   int sz;
+   Py_ssize_t 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:
@@@ -1190,7 -1184,7 +1190,7 @@@ static PyTypeObject dsarand_pytype_ske
      Py_TPFLAGS_BASETYPE,
  
    /* @tp_doc@ */
 -"Pseudorandom number generator for constructing DSA parameters.",
 +"DSARand(SEED): pseudorandom number generator for DSA parameters.",
  
    0,					/* @tp_traverse@ */
    0,					/* @tp_clear@ */
@@@ -1219,9 -1213,9 +1219,9 @@@ static PyObject *bbs_pynew(PyTypeObjec
  {
    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);
@@@ -1268,8 -1262,7 +1268,8 @@@ static PyObject *bbsget_x(PyObject *me
  static int bbsset_x(PyObject *me, PyObject *val, void *hunoz)
  {
    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;
 +  if ((x = getmp(val)) == 0) goto end;
 +  r->ops->misc(r, BBS_SET, x); rc = 0;
    end: mp_drop(x); return (rc);
  }
  
@@@ -1322,7 -1315,7 +1322,7 @@@ static PyTypeObject bbs_pytype_skel = 
      Py_TPFLAGS_BASETYPE,
  
    /* @tp_doc@ */
 -"Blum-Blum-Shub strong pseudorandom number generator.",
 +"BlumBlumShub(N, [x = 2]): Blum-Blum-Shub pseudorandom number generator.",
  
    0,					/* @tp_traverse@ */
    0,					/* @tp_clear@ */
@@@ -1357,9 -1350,9 +1357,9 @@@ static PyObject *bbspriv_pynew(PyTypeOb
  {
    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;
@@@ -1387,12 -1380,11 +1387,12 @@@ static PyObject *meth__BBSPriv_generate
    pypgev evt = { { 0 } };
    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;
  
    evt.exc = &exc;
 -  if (!PyArg_ParseTupleAndKeywords(arg, kw, "OO&|O&O&O&O&:generate", kwlist,
 +  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;
@@@ -1483,8 -1475,7 +1483,8 @@@ static PyTypeObject bbspriv_pytype_ske
      Py_TPFLAGS_BASETYPE,
  
    /* @tp_doc@ */
 -"Blum-Blum-Shub strong pseudorandom generator, with private key.",
 +"BBSPriv(..., [seed = 2]): Blum-Blum-Shub, with private key.\n\
 +  Keywords: n, p, q; must provide at least two",
  
    0,					/* @tp_traverse@ */
    0,					/* @tp_clear@ */