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));
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;
+ 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:
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 }
};
{
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|O!O!O!:new", kwlist,
group_pytype, &G,
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 }
};
/*----- Ed25519 and related algorithms ------------------------------------*/
#define EDDSAS(_) \
- _(ED25519, ed25519)
+ _(ED25519, ed25519, -1, ctx) \
+ _(ED448, ed448, 0, )
-#define DEFEDDSA(ED, ed) \
+#define DEFEDDSA(ED, ed, phdflt, sigver) \
\
static PyObject *meth_##ed##_pubkey(PyObject *me, PyObject *arg) \
{ \
static PyObject *meth_##ed##_sign(PyObject *me, PyObject *arg, \
PyObject *kw) \
{ \
- const char *k, *p = 0, *m; \
- Py_ssize_t ksz, psz, msz; \
+ 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", 0 }; \
+ char *kwlist[] = { "key", "msg", "pub", "perso", "phflag", 0 }; \
if (!PyArg_ParseTupleAndKeywords(arg, kw, \
- "s#s#|s#:" #ed "_sign", \
+ "s#s#|s#s#O&:" #ed "_sign", \
kwlist, \
- &k, &ksz, &m, &msz, &p, &psz)) \
+ &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##_sign((octet *)PyString_AS_STRING(rc), k, ksz, \
- (const octet *)p, m, msz); \
+ 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, *m, *s; \
- Py_ssize_t psz, msz, ssz; \
+ 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", 0 }; \
+ char *kwlist[] = { "pub", "msg", "sig", "perso", "phflag", 0 }; \
if (!PyArg_ParseTupleAndKeywords(arg, kw, \
- "s#s#s#:" #ed "_verify", \
+ "s#s#s#|s#O&:" #ed "_verify", \
kwlist, \
- &p, &psz, &m, &msz, &s, &ssz)) \
+ &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"); \
- rc = getbool(!ed##_verify((const octet *)p, \
- m, msz, (const octet *)s)); \
+ 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); \
KWMETH(_pss_encode, 0)
KWMETH(_pss_decode, 0)
KWMETH(_RSAPriv_generate, "\
-generate(NBITS, [event = pgen_nullev, rng = rand, nsteps = 0]) -> R")
+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) \
+#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") \
+" #ed "_sign(KEY, MSG, [pub = PUBLIC], " \
+ "[perso = STRING], [phflag = BOOL]) -> SIG") \
KWMETH(ed##_verify, "\
" #ed "_verify(PUBLIC, MSG, SIG, " \
- "[perso = STRING, phflag = BOOL]) -> BOOL")
+ "[perso = STRING], [phflag = BOOL]) -> BOOL")
EDDSAS(DEFMETH)
#undef DEFMETH
#undef METHNAME