}
static PyObject *dsa_setup(PyTypeObject *ty, PyObject *G, PyObject *u,
- PyObject *p, PyObject *rng, PyObject *hash)
+ PyObject *p, PyObject *rng, PyObject *hash,
+ void (*calcpub)(group *, ge *, mp *))
{
dsa_pyobj *g;
+ ge *pp;
g = PyObject_New(dsa_pyobj, ty);
- if (GROUP_G(G) != GE_G(p) && !group_samep(GROUP_G(G), GE_G(p)))
- TYERR("public key not from group");
+ if (p) Py_INCREF(p);
if (!u) {
g->d.u = 0;
u = Py_None;
- } else if ((g->d.u = getmp(u)) == 0)
- goto end;
+ } else {
+ if ((g->d.u = getmp(u)) == 0)
+ goto end;
+ if (MP_PYCHECK(u)) Py_INCREF(u);
+ else u = mp_pywrap(g->d.u);
+ }
+ if (!p) {
+ assert(g->d.u); assert(calcpub);
+ pp = G_CREATE(GROUP_G(G));
+ calcpub(GROUP_G(G), pp, g->d.u);
+ p = ge_pywrap(G, pp);
+ } else if (GROUP_G(G) != GE_G(p) && !group_samep(GROUP_G(G), GE_G(p)))
+ TYERR("public key not from group");
g->d.g = GROUP_G(G);
g->d.p = GE_X(p);
g->d.r = GRAND_R(rng);
g->d.h = GCHASH_CH(hash);
- g->G = G; Py_INCREF(G); g->u = u; Py_INCREF(u); g->p = p; Py_INCREF(p);
+ g->G = G; Py_INCREF(G); g->u = u; g->p = p;
g->rng = rng; Py_INCREF(rng); g->hash = hash; Py_INCREF(hash);
return ((PyObject *)g);
end:
+ if (p) Py_DECREF(p);
FREEOBJ(g);
return (0);
}
static PyObject *dsapub_pynew(PyTypeObject *ty,
PyObject *arg, PyObject *kw)
{
- PyObject *G, *p, *u = 0, *rng = rand_pyobj, *hash = sha_pyobj;
+ PyObject *G, *p, *rng = rand_pyobj, *hash = sha_pyobj;
PyObject *rc = 0;
- char *kwlist[] = { "G", "p", "u", "hash", "rng", 0 };
+ char *kwlist[] = { "G", "p", "hash", "rng", 0 };
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!O!|OO!O!:new", kwlist,
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!O!|O!O!:new", kwlist,
group_pytype, &G,
ge_pytype, &p,
- &u,
gchash_pytype, &hash,
grand_pytype, &rng) ||
- (rc = dsa_setup(dsapub_pytype, G, u, p, rng, hash)) == 0)
+ (rc = dsa_setup(dsapub_pytype, G, 0, p, rng, hash, 0)) == 0)
goto end;
end:
return (rc);
return (rc);
}
+static void dsa_calcpub(group *g, ge *p, mp *u) { G_EXP(g, p, g->g, u); }
+
static PyObject *dsapriv_pynew(PyTypeObject *ty,
PyObject *arg, PyObject *kw)
{
- PyObject *G, *p, *u = Py_None, *rng = rand_pyobj, *hash = sha_pyobj;
+ PyObject *G, *p = 0, *u, *rng = rand_pyobj, *hash = sha_pyobj;
PyObject *rc = 0;
- char *kwlist[] = { "G", "p", "u", "hash", "rng", 0 };
+ char *kwlist[] = { "G", "u", "p", "hash", "rng", 0 };
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!O!O|O!O!:new", kwlist,
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!O|O!O!O!:new", kwlist,
group_pytype, &G,
- ge_pytype, &p,
&u,
+ ge_pytype, &p,
gchash_pytype, &hash,
grand_pytype, &rng) ||
- (rc = dsa_setup(dsapriv_pytype, G, u, p, rng, hash)) == 0)
+ (rc = dsa_setup(dsapriv_pytype, G, u, p, rng, hash, dsa_calcpub)) == 0)
goto end;
end:
return (rc);
static PyMethodDef dsapriv_pymethods[] = {
#define METHNAME(name) dsameth_##name
- KWMETH(sign, "D.sign(MSG, k = K) -> R, S")
+ KWMETH(sign, "D.sign(MSG, [k = K]) -> R, S")
#undef METHNAME
{ 0 }
};
static PyObject *kcdsapub_pynew(PyTypeObject *ty,
PyObject *arg, PyObject *kw)
{
- PyObject *G, *p, *u = 0, *rng = rand_pyobj, *hash = has160_pyobj;
+ PyObject *G, *p, *rng = rand_pyobj, *hash = has160_pyobj;
PyObject *rc = 0;
- char *kwlist[] = { "G", "p", "u", "hash", "rng", 0 };
+ char *kwlist[] = { "G", "p", "hash", "rng", 0 };
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!O!O|O!O!:new", kwlist,
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!O!|O!O!:new", kwlist,
group_pytype, &G,
ge_pytype, &p,
- &u,
gchash_pytype, &hash,
grand_pytype, &rng) ||
- (rc = dsa_setup(kcdsapub_pytype, G, u, p, rng, hash)) == 0)
+ (rc = dsa_setup(kcdsapub_pytype, G, 0, p, rng, hash, 0)) == 0)
goto end;
end:
return (rc);
}
+static void kcdsa_calcpub(group *g, ge *p, mp *u)
+{
+ mp *uinv = mp_modinv(MP_NEW, u, g->r);
+ G_EXP(g, p, g->g, uinv);
+ mp_drop(uinv);
+}
+
static PyObject *kcdsapriv_pynew(PyTypeObject *ty,
PyObject *arg, PyObject *kw)
{
- PyObject *G, *p, *u = Py_None, *rng = rand_pyobj, *hash = has160_pyobj;
+ PyObject *G, *u, *p = 0, *rng = rand_pyobj, *hash = has160_pyobj;
PyObject *rc = 0;
- char *kwlist[] = { "G", "p", "u", "hash", "rng", 0 };
+ char *kwlist[] = { "G", "u", "p", "hash", "rng", 0 };
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!O!|OO!O!:new", kwlist,
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "O!O|O!O!O!:new", kwlist,
group_pytype, &G,
- ge_pytype, &p,
&u,
+ ge_pytype, &p,
gchash_pytype, &hash,
grand_pytype, &rng) ||
- (rc = dsa_setup(kcdsapriv_pytype, G, u, p, rng, hash)) == 0)
+ (rc = dsa_setup(kcdsapriv_pytype, G, u, p,
+ rng, hash, kcdsa_calcpub)) == 0)
goto end;
end:
return (rc);
static PyMethodDef kcdsapriv_pymethods[] = {
#define METHNAME(name) kcdsameth_##name
- KWMETH(sign, "D.sign(MSG, k = K) -> R, S")
+ KWMETH(sign, "D.sign(MSG, [k = K]) -> R, S")
#undef METHNAME
{ 0 }
};
goto end;
if ((rp.n && !MP_ODDP(rp.n)) ||
(rp.p && !MP_ODDP(rp.p)) ||
- (rp.p && !MP_ODDP(rp.q)))
+ (rp.q && !MP_ODDP(rp.q)))
VALERR("RSA modulus and factors must be odd");
if (rsa_recover(&rp)) VALERR("couldn't construct private key");
if (rng != Py_None && !GRAND_PYCHECK(rng))
unsigned nbits;
unsigned n = 0;
rsa_priv rp;
- pgev evt = { 0 };
- char *kwlist[] = { "class", "nbits", "event", "rng", "nsteps", 0 };
+ mp *e = 0;
+ struct excinfo exc = EXCINFO_INIT;
+ pypgev evt = { { 0 } };
+ char *kwlist[] = { "class", "nbits", "event", "rng", "nsteps", "e", 0 };
PyObject *rc = 0;
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "OO&|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))
+ convgrand, &r, convuint, &n,
+ convmp, &e))
goto end;
- if (rsa_gen(&rp, nbits, r, n, evt.proc, evt.ctx))
- PGENERR;
+ if (e) MP_COPY(e);
+ else e = mp_fromulong(MP_NEW, 65537);
+ if (rsa_gen_e(&rp, nbits, e, r, n, evt.ev.proc, evt.ev.ctx))
+ PGENERR(&exc);
rc = rsapriv_pywrap(&rp);
end:
droppgev(&evt);
+ mp_drop(e);
return (rc);
}
static PyMethodDef rsapriv_pymethods[] = {
#define METHNAME(name) rsameth_##name
- KWMETH(privop, "R.privop(X, rng = None) -> X^D (mod N)")
+ KWMETH(privop, "R.privop(X, [rng = None]) -> X^D (mod N)")
#undef METHNAME
{ 0 }
};
return (rc);
}
-/*----- X25519 ------------------------------------------------------------*/
-
-static PyObject *meth_x25519(PyObject *me, PyObject *arg)
-{
- const char *k, *p;
- Py_ssize_t ksz, psz;
- PyObject *rc = 0;
- if (!PyArg_ParseTuple(arg, "s#s#:x25519", &k, &ksz, &p, &psz)) goto end;
- if (ksz != X25519_KEYSZ) VALERR("bad key length");
- if (psz != X25519_PUBSZ) VALERR("bad public length");
- rc = bytestring_pywrap(0, X25519_OUTSZ);
- x25519((octet *)PyString_AS_STRING(rc),
- (const octet *)k, (const octet *)p);
- return (rc);
-end:
- return (0);
-}
-
-/*----- Ed25519 -----------------------------------------------------------*/
-
-static PyObject *meth_ed25519_pubkey(PyObject *me, PyObject *arg)
-{
- const char *k;
- Py_ssize_t ksz;
- PyObject *rc = 0;
- if (!PyArg_ParseTuple(arg, "s#:ed25519_pubkey", &k, &ksz)) goto end;
- rc = bytestring_pywrap(0, ED25519_PUBSZ);
- ed25519_pubkey((octet *)PyString_AS_STRING(rc), k, ksz);
- return (rc);
-end:
- return (0);
-}
-
-static PyObject *meth_ed25519_sign(PyObject *me, PyObject *arg, PyObject *kw)
-{
- const char *k, *p = 0, *m;
- Py_ssize_t ksz, psz, msz;
- PyObject *rc = 0;
- octet pp[ED25519_PUBSZ];
- char *kwlist[] = { "key", "msg", "pub", 0 };
- if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#s#|s#:ed25519_sign", kwlist,
- &k, &ksz, &m, &msz, &p, &psz))
- goto end;
- if (p && psz != ED25519_PUBSZ) VALERR("bad public length");
- if (!p) { p = (const char *)pp; ed25519_pubkey(pp, k, ksz); }
- rc = bytestring_pywrap(0, ED25519_SIGSZ);
- ed25519_sign((octet *)PyString_AS_STRING(rc), k, ksz,
- (const octet *)p, m, msz);
- return (rc);
-end:
- return (0);
-}
-
-static PyObject *meth_ed25519_verify(PyObject *me, PyObject *arg)
-{
- const char *p, *m, *s;
- Py_ssize_t psz, msz, ssz;
- PyObject *rc = 0;
- if (!PyArg_ParseTuple(arg, "s#s#s#:ed25519_verify",
- &p, &psz, &m, &msz, &s, &ssz))
- goto end;
- if (psz != ED25519_PUBSZ) VALERR("bad public length");
- if (ssz != ED25519_SIGSZ) VALERR("bad signature length");
- rc = getbool(!ed25519_verify((const octet *)p, m, msz, (const octet *)s));
- return (rc);
-end:
- return (0);
-}
+/*----- X25519 and related algorithms -------------------------------------*/
+
+#define XDHS(_) \
+ _(X25519, x25519) \
+ _(X448, x448)
+
+#define DEFXDH(X, x) \
+ static PyObject *meth_##x(PyObject *me, PyObject *arg) \
+ { \
+ const char *k, *p; \
+ Py_ssize_t ksz, psz; \
+ PyObject *rc = 0; \
+ if (!PyArg_ParseTuple(arg, "s#s#:" #x, &k, &ksz, &p, &psz)) \
+ goto end; \
+ if (ksz != X##_KEYSZ) VALERR("bad key length"); \
+ if (psz != X##_PUBSZ) VALERR("bad public length"); \
+ rc = bytestring_pywrap(0, X##_OUTSZ); \
+ x((octet *)PyString_AS_STRING(rc), \
+ (const octet *)k, (const octet *)p); \
+ return (rc); \
+ end: \
+ return (0); \
+ }
+XDHS(DEFXDH)
+#undef DEFXDH
+
+/*----- Ed25519 and related algorithms ------------------------------------*/
+
+#define EDDSAS(_) \
+ _(ED25519, ed25519, -1, ctx) \
+ _(ED448, ed448, 0, )
+
+#define DEFEDDSA(ED, ed, phdflt, sigver) \
+ \
+ static PyObject *meth_##ed##_pubkey(PyObject *me, PyObject *arg) \
+ { \
+ const char *k; \
+ Py_ssize_t ksz; \
+ PyObject *rc = 0; \
+ if (!PyArg_ParseTuple(arg, "s#:" #ed "_pubkey", &k, &ksz)) \
+ goto end; \
+ rc = bytestring_pywrap(0, ED##_PUBSZ); \
+ ed##_pubkey((octet *)PyString_AS_STRING(rc), k, ksz); \
+ return (rc); \
+ end: \
+ return (0); \
+ } \
+ \
+ static PyObject *meth_##ed##_sign(PyObject *me, PyObject *arg, \
+ PyObject *kw) \
+ { \
+ const char *k, *p = 0, *c = 0, *m; \
+ Py_ssize_t ksz, psz, csz = 0, msz; \
+ int ph = phdflt; \
+ PyObject *rc = 0; \
+ octet pp[ED##_PUBSZ]; \
+ char *kwlist[] = { "key", "msg", "pub", "perso", "phflag", 0 }; \
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, \
+ "s#s#|s#s#O&:" #ed "_sign", \
+ kwlist, \
+ &k, &ksz, &m, &msz, &p, &psz, \
+ &c, &csz, convbool, &ph)) \
+ goto end; \
+ if (p && psz != ED##_PUBSZ) VALERR("bad public length"); \
+ if (c && csz > ED##_MAXPERSOSZ) \
+ VALERR("personalization string too long"); \
+ if (c && ph == -1) ph = 0; \
+ if (!p) { p = (const char *)pp; ed##_pubkey(pp, k, ksz); } \
+ rc = bytestring_pywrap(0, ED##_SIGSZ); \
+ ed##sigver##_sign((octet *)PyString_AS_STRING(rc), k, ksz, \
+ (const octet *)p, ph, c, csz, m, msz); \
+ return (rc); \
+ end: \
+ return (0); \
+ } \
+ \
+ static PyObject *meth_##ed##_verify(PyObject *me, \
+ PyObject *arg, PyObject *kw) \
+ { \
+ const char *p, *c = 0, *m, *s; \
+ Py_ssize_t psz, csz = 0, msz, ssz; \
+ int ph = phdflt; \
+ PyObject *rc = 0; \
+ char *kwlist[] = { "pub", "msg", "sig", "perso", "phflag", 0 }; \
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, \
+ "s#s#s#|s#O&:" #ed "_verify", \
+ kwlist, \
+ &p, &psz, &m, &msz, &s, &ssz, \
+ &c, &csz, convbool, &ph)) \
+ goto end; \
+ if (psz != ED##_PUBSZ) VALERR("bad public length"); \
+ if (ssz != ED##_SIGSZ) VALERR("bad signature length"); \
+ if (c && csz > ED##_MAXPERSOSZ) \
+ VALERR("personalization string too long"); \
+ if (c && ph == -1) ph = 0; \
+ rc = getbool(!ed##sigver##_verify((const octet *)p, ph, c, csz, \
+ m, msz, (const octet *)s)); \
+ return (rc); \
+ end: \
+ return (0); \
+ }
+EDDSAS(DEFEDDSA)
+#undef DEFEDDSA
/*----- Global stuff ------------------------------------------------------*/
KWMETH(_pss_encode, 0)
KWMETH(_pss_decode, 0)
KWMETH(_RSAPriv_generate, "\
-generate(NBITS, [event = pgen_nullev, rng = rand, nsteps = 0]) -> R")
- METH (x25519, "\
-x25519(KEY, PUBLIC) -> SHARED")
- METH (ed25519_pubkey, "\
-ed25519_pubkey(KEY) -> PUBLIC")
- KWMETH(ed25519_sign, "\
-ed25519_sign(KEY, MSG, [PUBLIC]) -> SIG")
- METH (ed25519_verify, "\
-ed25519_verify(PUBLIC, MSG, SIG) -> BOOL")
+generate(NBITS, [event = pgen_nullev], [rng = rand], [nsteps = 0]) -> R")
+#define DEFMETH(X, x) \
+ METH (x, "\
+" #x "(KEY, PUBLIC) -> SHARED")
+ XDHS(DEFMETH)
+#undef DEFMETH
+#define DEFMETH(ED, ed, phdflt, sigver) \
+ METH (ed##_pubkey, "\
+" #ed "_pubkey(KEY) -> PUBLIC") \
+ KWMETH(ed##_sign, "\
+" #ed "_sign(KEY, MSG, [pub = PUBLIC], " \
+ "[perso = STRING], [phflag = BOOL]) -> SIG") \
+ KWMETH(ed##_verify, "\
+" #ed "_verify(PUBLIC, MSG, SIG, " \
+ "[perso = STRING], [phflag = BOOL]) -> BOOL")
+ EDDSAS(DEFMETH)
+#undef DEFMETH
#undef METHNAME
{ 0 }
};