From 69eaee5148a660465f4cd7a4bca91305c1b76379 Mon Sep 17 00:00:00 2001 From: jbj Date: Fri, 2 May 2003 18:38:20 +0000 Subject: [PATCH] Spliddles. CVS patchset: 6806 CVS date: 2003/05/02 18:38:20 --- beecrypt/mp.c | 4 ---- beecrypt/mp.h | 6 ------ beecrypt/mpbarrett.c | 33 +++++++++++++-------------------- beecrypt/rsa.c | 2 -- beecrypt/rsakp.c | 2 +- 5 files changed, 14 insertions(+), 33 deletions(-) diff --git a/beecrypt/mp.c b/beecrypt/mp.c index 3f6d37d..f78118c 100644 --- a/beecrypt/mp.c +++ b/beecrypt/mp.c @@ -702,7 +702,6 @@ mpw mpaddmul(register size_t size, register mpw* result, register const mpw* dat #ifndef ASM_MPMUL void mpmul(mpw* result, size_t xsize, const mpw* xdata, size_t ysize, const mpw* ydata) { - /*@-mods@*/ /* preferred passing of parameters is x the larger of the two numbers */ if (xsize >= ysize) { @@ -736,7 +735,6 @@ void mpmul(mpw* result, size_t xsize, const mpw* xdata, size_t ysize, const mpw* *(--result) = rc; } } - /*@=mods@*/ } #endif @@ -809,7 +807,6 @@ void mpsqr(register mpw* result, register size_t size, register const mpw* data) register mpw rc; register size_t n = size-1; - /*@-mods@*/ result += size; result[n] = 0; @@ -829,7 +826,6 @@ void mpsqr(register mpw* result, register size_t size, register const mpw* data) (void) mpmultwo(size*2, result); (void) mpaddsqrtrc(size, result, data); - /*@=mods@*/ } #endif diff --git a/beecrypt/mp.h b/beecrypt/mp.h index 660a49c..cb0ee2d 100644 --- a/beecrypt/mp.h +++ b/beecrypt/mp.h @@ -27,12 +27,6 @@ #define _MP_H #include "beecrypt.h" - -#if HAVE_STRING_H -# include -#endif -#include - #include "mpopt.h" #define MP_HWBITS (MP_WBITS >> 1) diff --git a/beecrypt/mpbarrett.c b/beecrypt/mpbarrett.c index a4c0f6f..cf92c27 100644 --- a/beecrypt/mpbarrett.c +++ b/beecrypt/mpbarrett.c @@ -169,16 +169,15 @@ void mpbsethex(mpbarrett* b, const char* hex) { register mpw* temp = (mpw*) malloc((6*size+4) * sizeof(*temp)); + assert(temp != NULL); b->size = size; b->mu = b->modl+size; (void) hs2ip(b->modl, size, hex, len); - /*@-nullpass@*/ /* temp may be NULL */ mpbmu_w(b, temp); free(temp); - /*@=nullpass@*/ } else { @@ -533,7 +532,7 @@ void mpbpowmod_w(const mpbarrett* b, size_t xsize, const mpw* xdata, size_t psiz { mpw* slide = (mpw*) malloc((8*size)*sizeof(*slide)); - /*@-nullpass@*/ /* slide may be NULL */ + assert(slide != NULL); mpbslide_w(b, xsize, xdata, slide, wksp); /*@-internalglobs -mods@*/ /* noisy */ @@ -541,7 +540,6 @@ void mpbpowmod_w(const mpbarrett* b, size_t xsize, const mpw* xdata, size_t psiz /*@=internalglobs =mods@*/ free(slide); - /*@=nullpass@*/ } } @@ -1135,15 +1133,14 @@ void mpbnrnd(const mpbarrett* b, randomGeneratorContext* rc, mpnumber* result) register size_t size = b->size; register mpw* temp = (mpw*) malloc(size * sizeof(*temp)); + assert(temp != NULL); mpnfree(result); mpnsize(result, size); - /*@-nullpass@*/ /* temp may be NULL */ /*@-usedef@*/ /* result->data unallocated? */ mpbrnd_w(b, rc, result->data, temp); /*@=usedef@*/ free(temp); - /*@=nullpass@*/ } void mpbnmulmod(const mpbarrett* b, const mpnumber* x, const mpnumber* y, mpnumber* result) @@ -1153,9 +1150,10 @@ void mpbnmulmod(const mpbarrett* b, const mpnumber* x, const mpnumber* y, mpnumb /* xsize and ysize must be <= b->size */ register size_t fill = 2*size-x->size-y->size; - /*@-nullptrarith@*/ /* temp may be NULL */ - register mpw* opnd = temp+size*2+2; - /*@=nullptrarith@*/ + register mpw* opnd; + + assert(temp != NULL); + opnd = temp + size*2+2; mpnfree(result); mpnsize(result, size); @@ -1164,13 +1162,11 @@ void mpbnmulmod(const mpbarrett* b, const mpnumber* x, const mpnumber* y, mpnumb mpzero(fill, opnd); mpmul(opnd+fill, x->size, x->data, y->size, y->data); - /*@-nullpass@*/ /* temp may be NULL */ /*@-usedef -compdef @*/ /* result->data unallocated? */ mpbmod_w(b, opnd, result->data, temp); /*@=usedef =compdef @*/ free(temp); - /*@=nullpass@*/ } void mpbnsqrmod(const mpbarrett* b, const mpnumber* x, mpnumber* result) @@ -1180,22 +1176,21 @@ void mpbnsqrmod(const mpbarrett* b, const mpnumber* x, mpnumber* result) /* xsize must be <= b->size */ register size_t fill = 2*(size-x->size); - /*@-nullptrarith@*/ /* temp may be NULL */ - register mpw* opnd = temp + size*2+2; - /*@=nullptrarith@*/ + register mpw* opnd; + + assert(temp != NULL); + opnd = temp + size*2+2; if (fill) mpzero(fill, opnd); mpsqr(opnd+fill, x->size, x->data); mpnsize(result, size); - /*@-nullpass@*/ /* temp may be NULL */ /*@-usedef -compdef @*/ /* result->data unallocated? */ mpbmod_w(b, opnd, result->data, temp); /*@=usedef =compdef @*/ free(temp); - /*@=nullpass@*/ } void mpbnpowmod(const mpbarrett* b, const mpnumber* x, const mpnumber* pow, mpnumber* y) @@ -1203,14 +1198,13 @@ void mpbnpowmod(const mpbarrett* b, const mpnumber* x, const mpnumber* pow, mpnu register size_t size = b->size; register mpw* temp = (mpw*) malloc((4*size+2) * sizeof(*temp)); + assert(temp != NULL); mpnfree(y); mpnsize(y, size); - /*@-nullpass@*/ /* temp may be NULL */ mpbpowmod_w(b, x->size, x->data, pow->size, pow->data, y->data, temp); free(temp); - /*@=nullpass@*/ } void mpbnpowmodsld(const mpbarrett* b, const mpw* slide, const mpnumber* pow, mpnumber* y) @@ -1218,14 +1212,13 @@ void mpbnpowmodsld(const mpbarrett* b, const mpw* slide, const mpnumber* pow, mp register size_t size = b->size; register mpw* temp = (mpw*) malloc((4*size+2) * sizeof(*temp)); + assert(temp != NULL); mpnfree(y); mpnsize(y, size); - /*@-nullpass@*/ /* temp may be NULL */ /*@-internalglobs -mods@*/ /* noisy */ mpbpowmodsld_w(b, slide, pow->size, pow->data, y->data, temp); /*@=internalglobs =mods@*/ free(temp); - /*@=nullpass@*/ } diff --git a/beecrypt/rsa.c b/beecrypt/rsa.c index 4fed4bc..4a2bfc5 100644 --- a/beecrypt/rsa.c +++ b/beecrypt/rsa.c @@ -106,7 +106,6 @@ int rsapricrt(const rsakp* kp, const mpnumber* c, mpnumber* m) mpbmod_w(&kp->p, ptemp, ptemp+psize, ptemp+2*psize); /* compute j1 = c^d1 mod p, store @ ptemp */ -/*@-compdef@*/ mpbpowmod_w(&kp->p, psize, ptemp+psize, kp->d1.size, kp->d1.data, ptemp, ptemp+2*psize); /* resize c for powmod p */ @@ -117,7 +116,6 @@ int rsapricrt(const rsakp* kp, const mpnumber* c, mpnumber* m) /* compute j2 = c^d2 mod q, store @ qtemp */ mpbpowmod_w(&kp->q, qsize, qtemp+qsize, kp->d2.size, kp->d2.data, qtemp, qtemp+2*qsize); -/*@=compdef@*/ /* compute j1-j2 mod p, store @ ptemp */ mpbsubmod_w(&kp->p, psize, ptemp, qsize, qtemp, ptemp, ptemp+2*psize); diff --git a/beecrypt/rsakp.c b/beecrypt/rsakp.c index eeaaa91..b53fdab 100644 --- a/beecrypt/rsakp.c +++ b/beecrypt/rsakp.c @@ -56,7 +56,7 @@ int rsakpMake(rsakp* kp, randomGeneratorContext* rgc, size_t nsize) /*@-globs@*/ mpprnd_w(&kp->p, rgc, pqsize, mpptrials(MP_WORDS_TO_BITS(pqsize)), &kp->e, temp); mpprnd_w(&kp->q, rgc, pqsize, mpptrials(MP_WORDS_TO_BITS(pqsize)), &kp->e, temp); - /*@-globs@*/ + /*@=globs@*/ /* if p <= q, perform a swap to make p larger than q */ if (mple(pqsize, kp->p.modl, kp->q.modl)) -- 2.7.4