RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: beecrypt Date: 27-Jun-2013 14:28:59
Branch: rpm-5_4 Handle: 2013062712285801
Modified files: (Branch: rpm-5_4)
beecrypt Makefile.am blockpad.c
beecrypt/python mpw-py.c rng-py.c
Log:
- coverity fixes.
Summary:
Revision Changes Path
1.37.2.2 +19 -0 beecrypt/Makefile.am
1.18.4.1 +2 -1 beecrypt/blockpad.c
1.9.4.1 +14 -14 beecrypt/python/mpw-py.c
1.6.4.1 +2 -2 beecrypt/python/rng-py.c
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: beecrypt/Makefile.am
============================================================================
$ cvs diff -u -r1.37.2.1 -r1.37.2.2 Makefile.am
--- beecrypt/Makefile.am 25 Jun 2013 19:00:30 -0000 1.37.2.1
+++ beecrypt/Makefile.am 27 Jun 2013 12:28:58 -0000 1.37.2.2
@@ -74,3 +74,22 @@
bench:
(cd tests && $(MAKE) $(AM_MAKEFLAGS) bench)
+
+# --- scan.coverity.com manual submission in $(PACKAGE).tgz
+COVDIR = cov-int
+COVBUILD = cov-build --dir $(COVDIR)
+COVDESC = $(shell date -u "+%Y%m%d.%H%M%S")
+COVFILE = $(PACKAGE)-scan.tgz
+covscan::
+ rm -rf $(COVDIR) $(PACKAGE).tgz
+ make clean
+ $(COVBUILD) make
+ tar czf $(COVFILE) $(COVDIR)
+ curl --form project=BeeCrypt \
+ --form token=g12JESt0Ncrhoc5_2Afmfw \
+ --form email=n3...@mac.com \
+ --form file=@$(COVFILE) \
+ --form version=$(PACKAGE_VERSION) \
+ --form description=$(COVDESC) \
+ http://scan5.coverity.com/cgi-bin/upload.py
+
@@ .
patch -p0 <<'@@ .'
Index: beecrypt/blockpad.c
============================================================================
$ cvs diff -u -r1.18 -r1.18.4.1 blockpad.c
--- beecrypt/blockpad.c 29 Apr 2010 18:40:40 -0000 1.18
+++ beecrypt/blockpad.c 27 Jun 2013 12:28:59 -0000 1.18.4.1
@@ -73,10 +73,11 @@
memchunk* pkcs5PadCopy(size_t blockbytes, const memchunk* src)
{
memchunk* tmp;
- byte padvalue = blockbytes - (src->size % blockbytes);
+ byte padvalue;
if (src == (memchunk*) 0)
return (memchunk*) 0;
+ padvalue = blockbytes - (src->size % blockbytes);
tmp = memchunkAlloc(src->size + padvalue);
@@ .
patch -p0 <<'@@ .'
Index: beecrypt/python/mpw-py.c
============================================================================
$ cvs diff -u -r1.9 -r1.9.4.1 mpw-py.c
--- beecrypt/python/mpw-py.c 29 Apr 2010 18:41:40 -0000 1.9
+++ beecrypt/python/mpw-py.c 27 Jun 2013 12:28:59 -0000 1.9.4.1
@@ -332,7 +332,7 @@
/*@global stderr, fileSystem @*/
/*@modifies stderr, fileSystem @*/
{
-fprintf(stderr, "%5.5s %p[%d]:\t", msg, MPW_DATA(x), MPW_SIZE(x)),
mpfprintln(stderr, MPW_SIZE(x), MPW_DATA(x));
+fprintf(stderr, "%5.5s %p[%u]:\t", msg, MPW_DATA(x), (unsigned)MPW_SIZE(x)),
mpfprintln(stderr, MPW_SIZE(x), MPW_DATA(x));
}
static size_t
@@ -354,7 +354,7 @@
res = (nbits * mp_bases[base].chars_per_bit_exactly) + 1;
}
if (_mpw_debug < -1)
-fprintf(stderr, "*** mpsizeinbase(%p[%d], %d) res %u\n", xdata, xsize, base,
(unsigned)res);
+fprintf(stderr, "*** mpsizeinbase(%p[%u], %u) res %u\n", xdata,
(unsigned)xsize, (unsigned)base, (unsigned)res);
return res;
}
@@ -408,7 +408,7 @@
size_t result;
if (_mpw_debug < -1)
-fprintf(stderr, "*** mpstr(%p[%d], %p[%d], %d):\t", t, nt, data, size,
base), mpfprintln(stderr, size, data);
+fprintf(stderr, "*** mpstr(%p[%u], %p[%u], %u):\t", t, (unsigned)nt, data,
(unsigned)size, (unsigned)base), mpfprintln(stderr, size, data);
mpsetx(asize, adata, size, data);
@@ -418,8 +418,8 @@
mpndivmod(zdata, asize, adata, 1, &base, wksp);
if (_mpw_debug < -1) {
-fprintf(stderr, " a %p[%d]:\t", adata, asize), mpfprintln(stderr, asize,
adata);
-fprintf(stderr, " z %p[%d]:\t", zdata, asize+1), mpfprintln(stderr,
asize+1, zdata);
+fprintf(stderr, " a %p[%u]:\t", adata, (unsigned)asize),
mpfprintln(stderr, asize, adata);
+fprintf(stderr, " z %p[%u]:\t", zdata, (unsigned)asize+1),
mpfprintln(stderr, asize+1, zdata);
}
result = zdata[asize];
t[nt] = bchars[result];
@@ -461,7 +461,7 @@
}
if (_mpw_debug < -1)
-fprintf(stderr, "*** mpw_format(%p,%d,%d):\t", z, base, addL),
mpfprintln(stderr, zsize, zdata);
+fprintf(stderr, "*** mpw_format(%p,%u,%d):\t", z, (unsigned)base, addL),
mpfprintln(stderr, zsize, zdata);
assert(base >= 2 && base <= 36);
@@ -812,7 +812,7 @@
size = MP_ROUND_B2W(15 * xbits);
if (_mpw_debug < 0)
-fprintf(stderr, "*** pbits %d xbits %d nsize %d size %d\n", pbits, xbits,
nsize, size);
+fprintf(stderr, "*** pbits %u xbits %u nsize %u size %u\n", (unsigned)pbits,
(unsigned)xbits, (unsigned)nsize, (unsigned)size);
mpnsize(n, nsize);
/* 1. Precompute odd powers of x (up to 2**K). */
@@ -1667,7 +1667,7 @@
z = mpw_FromMPW(zsize, zdata, 1);
if (_mpw_debug < 0)
-fprintf(stderr, "*** mpw_%s %p[%d]\t", fname, MPW_DATA(z), MPW_SIZE(z)),
mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z));
+fprintf(stderr, "*** mpw_%s %p[%u]\t", fname, MPW_DATA(z),
(unsigned)MPW_SIZE(z)), mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z));
exit:
mpbfree(&b);
@@ -1949,9 +1949,9 @@
mpndivmod(zdata, asize, adata, bsize, bdata, wksp);
if (_mpw_debug < 0) {
-fprintf(stderr, " a %p[%d]:\t", adata, asize), mpfprintln(stderr, asize,
adata);
-fprintf(stderr, " b %p[%d]:\t", bdata, bsize), mpfprintln(stderr, bsize,
bdata);
-fprintf(stderr, " z %p[%d]:\t", zdata, zsize), mpfprintln(stderr, zsize,
zdata);
+fprintf(stderr, " a %p[%u]:\t", adata, (unsigned)asize),
mpfprintln(stderr, asize, adata);
+fprintf(stderr, " b %p[%u]:\t", bdata, (unsigned)bsize),
mpfprintln(stderr, bsize, bdata);
+fprintf(stderr, " z %p[%u]:\t", zdata, (unsigned)zsize),
mpfprintln(stderr, zsize, zdata);
}
zsize -= bsize;
@@ -2026,7 +2026,7 @@
}
if (z != NULL && _mpw_debug)
-fprintf(stderr, "*** mpw_neg %p[%d]\t", MPW_DATA(z), MPW_SIZE(z)),
mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z));
+fprintf(stderr, "*** mpw_neg %p[%u]\t", MPW_DATA(z), (unsigned)MPW_SIZE(z)),
mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z));
return (PyObject *)z;
}
@@ -2044,7 +2044,7 @@
z = mpw_Copy(a);
if (z != NULL && _mpw_debug)
-fprintf(stderr, "*** mpw_pos %p[%d]\t", MPW_DATA(z), MPW_SIZE(z)),
mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z));
+fprintf(stderr, "*** mpw_pos %p[%u]\t", MPW_DATA(z), (unsigned)MPW_SIZE(z)),
mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z));
return (PyObject *)z;
}
@@ -2061,7 +2061,7 @@
z = (mpwObject *)mpw_pos(a);
if (z != NULL && _mpw_debug)
-fprintf(stderr, "*** mpw_abs %p[%d]\t", MPW_DATA(z), MPW_SIZE(z)),
mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z));
+fprintf(stderr, "*** mpw_abs %p[%u]\t", MPW_DATA(z), (unsigned)MPW_SIZE(z)),
mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z));
return (PyObject *)z;
}
@@ .
patch -p0 <<'@@ .'
Index: beecrypt/python/rng-py.c
============================================================================
$ cvs diff -u -r1.6 -r1.6.4.1 rng-py.c
--- beecrypt/python/rng-py.c 29 Apr 2010 18:41:40 -0000 1.6
+++ beecrypt/python/rng-py.c 27 Jun 2013 12:28:59 -0000 1.6.4.1
@@ -199,7 +199,7 @@
}
if (_rng_debug)
-fprintf(stderr, "*** rng_Next(%p) %p[%d]\t", s, MPW_DATA(z), MPW_SIZE(z)),
mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z));
+fprintf(stderr, "*** rng_Next(%p) %p[%u]\t", s, MPW_DATA(z),
(unsigned)MPW_SIZE(z)), mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z));
return (PyObject *)z;
}
@@ -236,7 +236,7 @@
z = mpw_FromMPW(b->size, b->modl, 1);
if (z != NULL && _rng_debug)
-fprintf(stderr, "*** rng_Prime(%p) %p[%d]\t", s, MPW_DATA(z), MPW_SIZE(z)),
mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z));
+fprintf(stderr, "*** rng_Prime(%p) %p[%u]\t", s, MPW_DATA(z),
(unsigned)MPW_SIZE(z)), mpfprintln(stderr, MPW_SIZE(z), MPW_DATA(z));
return (PyObject *)z;
}
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
