From 957986f1cd80f328f664a38f1fa09ceece4a915f Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Thu, 26 May 2016 09:26:09 +0100 Subject: [PATCH] math/g-bin.c, math/g-prime.c: Fix type incompatibility. Callers of the abstract group API expect to pass in a pointer-to- structure. The binary and prime group implementations expected a pointer-to-pointer, which looks different. Change the way these work, so that the group element is a structure holding a pointer, rather than just a bare pointer. This doesn't make any difference on targets with sane ABIs, but it fixes a potentially nasty problem on weirder platforms. Add a macro explaining this change so that users of this unstable interface can cope with both versions. --- math/g-bin.c | 80 ++++++++++++++++++++++++--------------------- math/g-prime.c | 97 +++++++++++++++++++++++++++++++------------------------ math/group-guts.h | 17 ++++++---- 3 files changed, 108 insertions(+), 86 deletions(-) diff --git a/math/g-bin.c b/math/g-bin.c index e076fdf1..683f94ee 100644 --- a/math/g-bin.c +++ b/math/g-bin.c @@ -32,7 +32,7 @@ #include "mpmont.h" #include "pgen.h" -#define ge mp * +#define ge ge_bin #include "group-guts.h" /*----- Main code ---------------------------------------------------------*/ @@ -41,27 +41,30 @@ static void gdestroygroup(group *gg) { gctx_bin *g = (gctx_bin *)gg; - mp_drop(g->gen); mp_drop(g->g.r); mp_drop(g->g.h); + mp_drop(g->gen.x); mp_drop(g->g.r); mp_drop(g->g.h); gfreduce_destroy(&g->r); DESTROY(g); } -static mp **gcreate(group *gg) - { mp **x = CREATE(mp *); *x = MP_COPY(*gg->i); return (x); } +static ge_bin *gcreate(group *gg) { + gctx_bin *g = (gctx_bin *)gg; ge_bin *x = CREATE(ge_bin); + x->x = MP_COPY(g->one.x); return (x); +} -static void gcopy(group *gg, mp **d, mp **x) - { mp *t = MP_COPY(*x); MP_DROP(*d); *d = t; } +static void gcopy(group *gg, ge_bin *d, ge_bin *x) + { mp *t = MP_COPY(x->x); MP_DROP(d->x); d->x = t; } -static void gburn(group *gg, mp **x) { (*x)->f |= MP_BURN; } +static void gburn(group *gg, ge_bin *x) { x->x->f |= MP_BURN; } -static void gdestroy(group *gg, mp **x) { MP_DROP(*x); DESTROY(x); } +static void gdestroy(group *gg, ge_bin *x) { MP_DROP(x->x); DESTROY(x); } static int gsamep(group *gg, group *hh) { gctx_bin *g = (gctx_bin *)gg, *h = (gctx_bin *)hh; return (MP_EQ(g->r.p, h->r.p)); } -static int geq(group *gg, mp **x, mp **y) { return (MP_EQ(*x, *y)); } +static int geq(group *gg, ge_bin *x, ge_bin *y) + { return (MP_EQ(x->x, y->x)); } static const char *gcheck(group *gg, grand *gr) { gctx_bin *g = (gctx_bin *)gg; int rc; mp *t, *tt; @@ -73,58 +76,61 @@ static const char *gcheck(group *gg, grand *gr) { return (group_stdcheck(gg, gr)); } -static void gmul(group *gg, mp **d, mp **x, mp **y) { - gctx_bin *g = (gctx_bin *)gg; mp *r = gf_mul(*d, *x, *y); - *d = gfreduce_do(&g->r, r, r); +static void gmul(group *gg, ge_bin *d, ge_bin *x, ge_bin *y) { + gctx_bin *g = (gctx_bin *)gg; mp *r = gf_mul(d->x, x->x, y->x); + d->x = gfreduce_do(&g->r, r, r); } -static void gsqr(group *gg, mp **d, mp **x) { - gctx_bin *g = (gctx_bin *)gg; mp *r = gf_sqr(*d, *x); - *d = gfreduce_do(&g->r, r, r); +static void gsqr(group *gg, ge_bin *d, ge_bin *x) { + gctx_bin *g = (gctx_bin *)gg; mp *r = gf_sqr(d->x, x->x); + d->x = gfreduce_do(&g->r, r, r); } -static void ginv(group *gg, mp **d, mp **x) - { gctx_bin *g = (gctx_bin *)gg; *d = gf_modinv(*d, *x, g->r.p); } +static void ginv(group *gg, ge_bin *d, ge_bin *x) + { gctx_bin *g = (gctx_bin *)gg; d->x = gf_modinv(d->x, x->x, g->r.p); } -static void gexp(group *gg, mp **d, mp **x, mp *n) - { gctx_bin *g = (gctx_bin *)gg; *d = gfreduce_exp(&g->r, *d, *x, n); } +static void gexp(group *gg, ge_bin *d, ge_bin *x, mp *n) { + gctx_bin *g = (gctx_bin *)gg; + d->x = gfreduce_exp(&g->r, d->x, x->x, n); +} -static int gread(group *gg, mp **d, const mptext_ops *ops, void *p) { +static int gread(group *gg, ge_bin *d, const mptext_ops *ops, void *p) { mp *t; if ((t = mp_read(MP_NEW, 0, ops, p)) == 0) return (-1); - mp_drop(*d); *d = t; return (0); + mp_drop(d->x); d->x = t; return (0); } -static int gwrite(group *gg, mp **x, const mptext_ops *ops, void *p) { +static int gwrite(group *gg, ge_bin *x, const mptext_ops *ops, void *p) { int rc = -1; - if (!ops->put("0x", 2, p) && !mp_write(*x, 16, ops, p)) rc = 0; + if (!ops->put("0x", 2, p) && !mp_write(x->x, 16, ops, p)) rc = 0; return (rc); } -static mp *gtoint(group *gg, mp *d, mp **x) { return MP_COPY(*x); } +static mp *gtoint(group *gg, mp *d, ge_bin *x) { return MP_COPY(x->x); } -static int gfromint(group *gg, mp **d, mp *x) { *d = MP_COPY(x); return 0; } +static int gfromint(group *gg, ge_bin *d, mp *x) + { d->x = MP_COPY(x); return 0; } -static int gtobuf(group *gg, buf *b, mp **x) - { int rc = buf_putmp(b, *x); return (rc); } +static int gtobuf(group *gg, buf *b, ge_bin *x) + { int rc = buf_putmp(b, x->x); return (rc); } -static int gfrombuf(group *gg, buf *b, mp **d) { +static int gfrombuf(group *gg, buf *b, ge_bin *d) { gctx_bin *g = (gctx_bin *)gg; mp *x; if ((x = buf_getmp(b)) == 0) return (-1); - MP_DROP(*d); *d = gfreduce_do(&g->r, x, x); + MP_DROP(d->x); d->x = gfreduce_do(&g->r, x, x); return (0); } -static int gtoraw(group *gg, buf *b, mp **x) { - gctx_bin * g = (gctx_bin *)gg; octet *q; +static int gtoraw(group *gg, buf *b, ge_bin *x) { + gctx_bin *g = (gctx_bin *)gg; octet *q; if ((q = buf_get(b, g->g.noctets)) == 0) return (-1); - mp_storeb(*x, q, g->g.noctets); return (0); + mp_storeb(x->x, q, g->g.noctets); return (0); } -static int gfromraw(group *gg, buf *b, mp **d) { - gctx_bin * g = (gctx_bin *)gg; mp *x; octet *q; +static int gfromraw(group *gg, buf *b, ge_bin *d) { + gctx_bin *g = (gctx_bin *)gg; mp *x; octet *q; if ((q = buf_get(b, g->g.noctets)) == 0) return (-1); x = mp_loadb(MP_NEW, q, g->g.noctets); - MP_DROP(*d); *d = gfreduce_do(&g->r, x, x); + MP_DROP(d->x); d->x = gfreduce_do(&g->r, x, x); return (0); } @@ -161,9 +167,9 @@ group *group_binary(const gbin_param *gb) g->g.nbits = mp_bits(gb->p) - 1; g->g.noctets = (g->g.nbits + 7) >> 3; gfreduce_create(&g->r, gb->p); - g->one = MP_ONE; + g->one.x = MP_ONE; g->g.i = &g->one; - g->gen = MP_COPY(gb->g); + g->gen.x = MP_COPY(gb->g); g->g.g = &g->gen; g->g.r = MP_COPY(gb->q); t = mp_lsl(MP_NEW, MP_ONE, g->g.nbits); diff --git a/math/g-prime.c b/math/g-prime.c index 9072b4ac..3cc540d5 100644 --- a/math/g-prime.c +++ b/math/g-prime.c @@ -32,7 +32,7 @@ #include "mpmont.h" #include "pgen.h" -#define ge mp * +#define ge ge_prime #include "group-guts.h" /*----- Main code ---------------------------------------------------------*/ @@ -41,27 +41,30 @@ static void gdestroygroup(group *gg) { gctx_prime *g = (gctx_prime *)gg; - mp_drop(g->gen); mp_drop(g->g.r); mp_drop(g->g.h); + mp_drop(g->gen.x); mp_drop(g->g.r); mp_drop(g->g.h); mpmont_destroy(&g->mm); DESTROY(g); } -static mp **gcreate(group *gg) - { mp **x = CREATE(mp *); *x = MP_COPY(*gg->i); return (x); } +static ge_prime *gcreate(group *gg) { + gctx_prime *g = (gctx_prime *)gg; ge_prime *x = CREATE(ge_prime); + x->x = MP_COPY(g->i.x); return (x); +} -static void gcopy(group *gg, mp **d, mp **x) - { mp *t = MP_COPY(*x); MP_DROP(*d); *d = t; } +static void gcopy(group *gg, ge_prime *d, ge_prime *x) + { mp *t = MP_COPY(x->x); MP_DROP(d->x); d->x = t; } -static void gburn(group *gg, mp **x) { (*x)->f |= MP_BURN; } +static void gburn(group *gg, ge_prime *x) { x->x->f |= MP_BURN; } -static void gdestroy(group *gg, mp **x) { MP_DROP(*x); DESTROY(x); } +static void gdestroy(group *gg, ge_prime *x) { MP_DROP(x->x); DESTROY(x); } static int gsamep(group *gg, group *hh) { gctx_prime *g = (gctx_prime *)gg, *h = (gctx_prime *)hh; return (MP_EQ(g->mm.m, h->mm.m)); } -static int geq(group *gg, mp **x, mp **y) { return (MP_EQ(*x, *y)); } +static int geq(group *gg, ge_prime *x, ge_prime *y) + { return (MP_EQ(x->x, y->x)); } static const char *gcheck(group *gg, grand *gr) { gctx_prime *g = (gctx_prime *)gg; int rc; mp *t; @@ -71,77 +74,85 @@ static const char *gcheck(group *gg, grand *gr) { return (group_stdcheck(gg, gr)); } -static void gmul(group *gg, mp **d, mp **x, mp **y) - { gctx_prime *g = (gctx_prime *)gg; *d = mpmont_mul(&g->mm, *d, *x, *y); } +static void gmul(group *gg, ge_prime *d, ge_prime *x, ge_prime *y) { + gctx_prime *g = (gctx_prime *)gg; + d->x = mpmont_mul(&g->mm, d->x, x->x, y->x); +} -static void gsqr(group *gg, mp **d, mp **x) { - gctx_prime *g = (gctx_prime *)gg; mp *r = mp_sqr(*d, *x); - *d = mpmont_reduce(&g->mm, r, r); +static void gsqr(group *gg, ge_prime *d, ge_prime *x) { + gctx_prime *g = (gctx_prime *)gg; mp *r = mp_sqr(d->x, x->x); + d->x = mpmont_reduce(&g->mm, r, r); } -static void ginv(group *gg, mp **d, mp **x) { - gctx_prime *g = (gctx_prime *)gg; mp *r = mpmont_reduce(&g->mm, *d, *x); - r = mp_modinv(r, r, g->mm.m); *d = mpmont_mul(&g->mm, r, r, g->mm.r2); +static void ginv(group *gg, ge_prime *d, ge_prime *x) { + gctx_prime *g = (gctx_prime *)gg; + mp *r = mpmont_reduce(&g->mm, d->x, x->x); + r = mp_modinv(r, r, g->mm.m); d->x = mpmont_mul(&g->mm, r, r, g->mm.r2); } -static void gexp(group *gg, mp **d, mp **x, mp *n) - { gctx_prime *g = (gctx_prime *)gg; *d = mpmont_expr(&g->mm, *d, *x, n); } +static void gexp(group *gg, ge_prime *d, ge_prime *x, mp *n) +{ + gctx_prime *g = (gctx_prime *)gg; + d->x = mpmont_expr(&g->mm, d->x, x->x, n); +} -static void gmexp(group *gg, mp **d, const group_expfactor *f, size_t n) { +static void gmexp(group *gg, ge_prime *d, const group_expfactor *f, size_t n) +{ gctx_prime *g = (gctx_prime *)gg; size_t i; mp_expfactor *ff = xmalloc(n * sizeof(mp_expfactor)); - for (i = 0; i < n; i++) { ff[i].base = *f[i].base; ff[i].exp = f[i].exp; } - *d = mpmont_mexpr(&g->mm, *d, ff, n); xfree(ff); + for (i = 0; i < n; i++) + { ff[i].base = f[i].base->x; ff[i].exp = f[i].exp; } + d->x = mpmont_mexpr(&g->mm, d->x, ff, n); xfree(ff); } -static int gread(group *gg, mp **d, const mptext_ops *ops, void *p) { +static int gread(group *gg, ge_prime *d, const mptext_ops *ops, void *p) { gctx_prime *g = (gctx_prime *)gg; mp *t; if ((t = mp_read(MP_NEW, 0, ops, p)) == 0) return (-1); - mp_drop(*d); *d = mpmont_mul(&g->mm, t, t, g->mm.r2); return (0); + mp_drop(d->x); d->x = mpmont_mul(&g->mm, t, t, g->mm.r2); return (0); } -static int gwrite(group *gg, mp **x, const mptext_ops *ops, void *p) { +static int gwrite(group *gg, ge_prime *x, const mptext_ops *ops, void *p) { gctx_prime *g = (gctx_prime *)gg; - mp *t = mpmont_reduce(&g->mm, MP_NEW, *x); + mp *t = mpmont_reduce(&g->mm, MP_NEW, x->x); int rc = mp_write(t, 10, ops, p); MP_DROP(t); return (rc); } -static mp *gtoint(group *gg, mp *d, mp **x) { +static mp *gtoint(group *gg, mp *d, ge_prime *x) { gctx_prime *g = (gctx_prime *)gg; - return (mpmont_reduce(&g->mm, d, *x)); + return (mpmont_reduce(&g->mm, d, x->x)); } -static int gfromint(group *gg, mp **d, mp *x) { - gctx_prime *g = (gctx_prime *)gg; mp_div(0, d, x, g->mm.m); - *d = mpmont_mul(&g->mm, *d, *d, g->mm.r2); return (0); +static int gfromint(group *gg, ge_prime *d, mp *x) { + gctx_prime *g = (gctx_prime *)gg; mp_div(0, &d->x, x, g->mm.m); + d->x = mpmont_mul(&g->mm, d->x, d->x, g->mm.r2); return (0); } -static int gtobuf(group *gg, buf *b, mp **x) { +static int gtobuf(group *gg, buf *b, ge_prime *x) { gctx_prime *g = (gctx_prime *)gg; - mp *t = mpmont_reduce(&g->mm, MP_NEW, *x); + mp *t = mpmont_reduce(&g->mm, MP_NEW, x->x); int rc = buf_putmp(b, t); MP_DROP(t); return (rc); } -static int gfrombuf(group *gg, buf *b, mp **d) { +static int gfrombuf(group *gg, buf *b, ge_prime *d) { gctx_prime * g = (gctx_prime *)gg; mp *x; if ((x = buf_getmp(b)) == 0) return (-1); - mp_div(0, &x, x, g->mm.m); mp_drop(*d); - *d = mpmont_mul(&g->mm, x, x, g->mm.r2); return(0); + mp_div(0, &x, x, g->mm.m); mp_drop(d->x); + d->x = mpmont_mul(&g->mm, x, x, g->mm.r2); return(0); } -static int gtoraw(group *gg, buf *b, mp **x) { +static int gtoraw(group *gg, buf *b, ge_prime *x) { gctx_prime *g = (gctx_prime *)gg; octet *q; - mp *t = mpmont_reduce(&g->mm, MP_NEW, *x); + mp *t = mpmont_reduce(&g->mm, MP_NEW, x->x); if ((q = buf_get(b, g->g.noctets)) == 0) { MP_DROP(t); return (-1); } mp_storeb(t, q, g->g.noctets); MP_DROP(t); return (0); } -static int gfromraw(group *gg, buf *b, mp **d) { +static int gfromraw(group *gg, buf *b, ge_prime *d) { gctx_prime * g = (gctx_prime *)gg; mp *x; octet *q; if ((q = buf_get(b, g->g.noctets)) == 0) return (-1); x = mp_loadb(MP_NEW, q, g->g.noctets); - mp_div(0, &x, x, g->mm.m); mp_drop(*d); - *d = mpmont_mul(&g->mm, x, x, g->mm.r2); return(0); + mp_div(0, &x, x, g->mm.m); mp_drop(d->x); + d->x = mpmont_mul(&g->mm, x, x, g->mm.r2); return(0); } /* --- @group_prime@ --- * @@ -176,8 +187,8 @@ group *group_prime(const gprime_param *gp) g->g.nbits = mp_bits(gp->p); g->g.noctets = (g->g.nbits + 7) >> 3; mpmont_create(&g->mm, gp->p); - g->g.i = &g->mm.r; - g->gen = mpmont_mul(&g->mm, MP_NEW, gp->g, g->mm.r2); + g->i.x = g->mm.r; g->g.i = &g->i; + g->gen.x = mpmont_mul(&g->mm, MP_NEW, gp->g, g->mm.r2); g->g.g = &g->gen; g->g.r = MP_COPY(gp->q); g->g.h = MP_NEW; mp_div(&g->g.h, 0, gp->p, gp->q); diff --git a/math/group-guts.h b/math/group-guts.h index c34d89c2..c9f28c49 100644 --- a/math/group-guts.h +++ b/math/group-guts.h @@ -50,6 +50,10 @@ # include "gfreduce.h" #endif +#define GROUP_GUTS_MPSTRUCT +typedef struct { mp *x; } ge_prime; +typedef struct { mp *x; } ge_bin; + #ifndef CATACOMB_GROUP_H # include "group.h" #endif @@ -57,21 +61,22 @@ /*----- Data structures ---------------------------------------------------*/ typedef struct gctx_prime { - group g; - mp *gen; + struct group_ g; + ge_prime gen; mpmont mm; + ge_prime i; } gctx_prime; typedef struct gctx_ec { - group g; + struct group_ g; ec id, gen; ec_info ei; } gctx_ec; typedef struct gctx_bin { - group g; - mp *gen; - mp *one; + struct group_ g; + ge_bin gen; + ge_bin one; gfreduce r; } gctx_bin; -- 2.11.0