[CVS] RPM: rpm-5_4: beecrypt/tests/ .cvsignore
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: 04-Aug-2013 23:50:49 Branch: rpm-5_4 Handle: 2013080421504900 Modified files: (Branch: rpm-5_4) beecrypt/tests .cvsignore Log: - ignore profileing cruft. Summary: RevisionChanges Path 1.12.2.2+2 -0 beecrypt/tests/.cvsignore patch -p0 <<'@@ .' Index: beecrypt/tests/.cvsignore $ cvs diff -u -r1.12.2.1 -r1.12.2.2 .cvsignore --- beecrypt/tests/.cvsignore 4 Jul 2013 00:22:13 - 1.12.2.1 +++ beecrypt/tests/.cvsignore 4 Aug 2013 21:50:49 - 1.12.2.2 @@ -23,5 +23,7 @@ testsha256 testsha384 testsha512 +*.gcda +*.gcno *.log *.trs @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/rpmio/ .cvsignore Makefile.am toid.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 04-Aug-2013 23:48:41 Branch: rpm-5_4 Handle: 2013080421484100 Added files: (Branch: rpm-5_4) rpm/rpmio toid.c Modified files: (Branch: rpm-5_4) rpm/rpmio .cvsignore Makefile.am Log: - rpmio: scrub out some bit rot. Summary: RevisionChanges Path 1.41.2.5+1 -0 rpm/rpmio/.cvsignore 1.293.2.20 +16 -9 rpm/rpmio/Makefile.am 1.1.2.1 +298 -0 rpm/rpmio/toid.c patch -p0 <<'@@ .' Index: rpm/rpmio/.cvsignore $ cvs diff -u -r1.41.2.4 -r1.41.2.5 .cvsignore --- rpm/rpmio/.cvsignore 4 Jul 2013 00:17:40 - 1.41.2.4 +++ rpm/rpmio/.cvsignore 4 Aug 2013 21:48:41 - 1.41.2.5 @@ -48,6 +48,7 @@ tmagic tmire todbc +toid tperl tput tpw @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/Makefile.am $ cvs diff -u -r1.293.2.19 -r1.293.2.20 Makefile.am --- rpm/rpmio/Makefile.am 8 Jul 2013 04:43:02 - 1.293.2.19 +++ rpm/rpmio/Makefile.am 4 Aug 2013 21:48:41 - 1.293.2.20 @@ -15,14 +15,18 @@ tmire.c todbc.c tput.c trpmio.c tsexp.c tsvn.c tsw.c lookup3.c tpw.c \ librpmio.vers testit.sh -EXTRA_PROGRAMS = bsdiff bspatch rpmborg rpmcpio rpmcurl rpmdpkg \ +EXTRA_PROGRAMS = rpmcpio rpmdpkg rpmtar rpmz +EXTRA_PROGRAMS += thtml tinv tkey tmacro tpw +noinst_PROGRAMS = + +EXTRA_PROGRAMS += bsdiff bspatch rpmborg rpmcurl \ rpmgenbasedir rpmgenpkglist rpmgensrclist rpmgpg \ - rpmpbzip2 rpmpigz rpmtar rpmz \ - tasn tdir tfts tget tglob thkp thtml tinv tkey tmacro tmagic \ - tmire todbc tperl tpython tput tpw trpmio tsexp tsvn tsw ttcl \ + rpmpbzip2 rpmpigz \ + tasn tdir tfts tget tglob thkp tmagic \ + tmire todbc toid tperl tpython tput trpmio tsexp tsvn tsw ttcl \ dumpasn1 lookup3 -noinst_PROGRAMS = tset +noinst_PROGRAMS += tset if WITH_LIBGIT2 noinst_PROGRAMS += tgit else @@ -448,6 +452,9 @@ todbc_SOURCES = todbc.c todbc_LDADD = $(RPMIO_LDADD_COMMON) +toid_SOURCES = toid.c +toid_LDADD = $(RPMIO_LDADD_COMMON) + tperl_SOURCES = tperl.c tperl_LDADD = $(RPMIO_LDADD_COMMON) @@ -458,7 +465,7 @@ tput_LDADD = $(RPMIO_LDADD_COMMON) tpw_SOURCES = tpw.c -tpw_LDFLAGS = $(RPM_LDADD_COMMON) $(RPMIO_LDADD_COMMON) +tpw_LDADD = $(RPM_LDADD_COMMON) $(RPMIO_LDADD_COMMON) trpmio_SOURCES = trpmio.c trpmio_LDADD = $(RPMIO_LDADD_COMMON) @@ -469,13 +476,13 @@ $(COMPILE) -DSELF_TEST --std=c99 -o $@ -c $< tsexp_SOURCES = tsexp.c -tsexp_LDFLAGS = $(RPMIO_LDADD_COMMON) +tsexp_LDADD = $(RPMIO_LDADD_COMMON) tsvn_SOURCES = tsvn.c tsvn_LDADD = $(RPMIO_LDADD_COMMON) tsw_SOURCES = tsw.c -tsw_LDFLAGS = $(RPMIO_LDADD_COMMON) +tsw_LDADD = $(RPMIO_LDADD_COMMON) ttcl_SOURCES = ttcl.c ttcl_LDADD = $(RPMIO_LDADD_COMMON) -ltcl @@ -486,7 +493,7 @@ endif dumpasn1_SOURCES = dumpasn1.c -dumpasn1_LDFLAGS = $(RPMIO_LDADD_COMMON) +dumpasn1_LDADD = $(RPMIO_LDADD_COMMON) lookup3_SOURCES = lookup3.c lookup3_CFLAGS = $(CFLAGS) -D_JLU3_SELFTEST @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/toid.c $ cvs diff -u -r0 -r1.1.2.1 toid.c --- /dev/null 2013-08-04 23:46:14.0 +0200 +++ toid.c2013-08-04 23:48:41.760332338 +0200 @@ -0,0 +1,298 @@ +#include "system.h" + +#include +#define _RPMGC_INTERNAL +#include + +#include "debug.h" + +/* Helper for openpgp_oid_from_str. */ +static size_t +make_flagged_int(unsigned long value, unsigned char * b, size_t nb) +{ +int more = 0; +int shift; + +/* fixme: figure out the number of bits in an ulong and start with + that value as shift (after making it a multiple of 7) a more + straigtforward implementation is to do it in reverse order using + a temporary buffer - saves a lot of compares */ +for (more = 0, shift = 28; shift > 0; shift -= 7) { + if (more || value >= (1UL << shift)) { + b[nb++] = 0x80 | (value >> shift); + value -= (value >> shift) << shift; + more = 1; + } +} +b[nb++] = value; +return nb; +} + +/* + * Convert the OID given in dotted decimal form in STRING to an DER + * encoding and store it
[CVS] RPM: rpm-5_4: rpm/lib/ .cvsignore Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 04-Aug-2013 23:46:04 Branch: rpm-5_4 Handle: 2013080421460400 Modified files: (Branch: rpm-5_4) rpm/lib .cvsignore Makefile.am Log: - lib: scrub out some bit rot. Summary: RevisionChanges Path 1.15.4.1+2 -0 rpm/lib/.cvsignore 2.203.2.7 +10 -4 rpm/lib/Makefile.am patch -p0 <<'@@ .' Index: rpm/lib/.cvsignore $ cvs diff -u -r1.15 -r1.15.4.1 .cvsignore --- rpm/lib/.cvsignore31 Dec 2009 18:38:41 - 1.15 +++ rpm/lib/.cvsignore4 Aug 2013 21:46:04 - 1.15.4.1 @@ -3,6 +3,8 @@ Makefile Makefile.in rpmversion.h +tevr +tgi tsbt .libs *.gcda @@ . patch -p0 <<'@@ .' Index: rpm/lib/Makefile.am $ cvs diff -u -r2.203.2.6 -r2.203.2.7 Makefile.am --- rpm/lib/Makefile.am 26 Apr 2012 18:36:19 - 2.203.2.6 +++ rpm/lib/Makefile.am 4 Aug 2013 21:46:04 - 2.203.2.7 @@ -46,7 +46,10 @@ EXTRA_DIST = librpm.vers -EXTRA_PROGRAMS = tevr tgi tsbt +EXTRA_PROGRAMS = +noinst_PROGRAMS = + +EXTRA_PROGRAMS += tevr tgi tsbt #XYZ: #mkdir -p $@ @@ -182,10 +185,13 @@ #rsync -rvz -e ssh --delete lcov/* ??? tevr_SOURCES = tevr.c -tevr_LDADD = $(RPMBUILD_LDADD) +tevr_DEPENDENCIES = librpm.la +tevr_LDADD = $(RPM_LDADD_COMMON) tgi_SOURCES = tgi.c -tgi_LDADD = $(RPMBUILD_LDADD) +tgi_DEPENDENCIES = librpm.la +tgi_LDADD = $(RPM_LDADD_COMMON) tsbt_SOURCES = tsbt.c -tsbt_LDADD = $(RPM_LDADD) +tsbt_DEPENDENCIES = librpm.la +tsbt_LDADD = $(RPM_LDADD_COMMON) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/tools/ .cvsignore Makefile.am roto.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 04-Aug-2013 23:44:28 Branch: rpm-5_4 Handle: 2013080421442700 Modified files: (Branch: rpm-5_4) rpm/tools .cvsignore Makefile.am roto.c Log: - tools: scrub out some bit root. Summary: RevisionChanges Path 1.50.2.2+1 -0 rpm/tools/.cvsignore 2.170.2.8 +10 -6 rpm/tools/Makefile.am 1.1.2.4 +2 -1 rpm/tools/roto.c patch -p0 <<'@@ .' Index: rpm/tools/.cvsignore $ cvs diff -u -r1.50.2.1 -r1.50.2.2 .cvsignore --- rpm/tools/.cvsignore 5 Sep 2011 12:43:10 - 1.50.2.1 +++ rpm/tools/.cvsignore 4 Aug 2013 21:44:27 - 1.50.2.2 @@ -48,5 +48,6 @@ txar wget xiu-echo +xiu-hash xiu-instantiate xiu-store @@ . patch -p0 <<'@@ .' Index: rpm/tools/Makefile.am $ cvs diff -u -r2.170.2.7 -r2.170.2.8 Makefile.am --- rpm/tools/Makefile.am 4 May 2012 15:58:08 - 2.170.2.7 +++ rpm/tools/Makefile.am 4 Aug 2013 21:44:27 - 2.170.2.8 @@ -24,11 +24,15 @@ EXTRA_DIST = hashtab.h bsdiff.1 bspatch.1 dotgraph.hh -EXTRA_PROGRAMS = augtool cudftool dbconvert debugedit \ - nix-build nix-channel nix-collect-garbage nix-copy-closure \ - nix-env nix-hash nix-install-package nix-instantiate \ - nix-log2xml nix-prefetch-url nix-pull nix-push nix-store nix-worker \ - xiu-echo xiu-hash xiu-instantiate xiu-store \ +EXTRA_PROGRAMS = nix-copy-closure nix-env nix-hash nix-install-package \ + nix-instantiate nix-store nix-worker \ + xiu-instantiate xiu-store +noinst_PROGRAMS = + +EXTRA_PROGRAMS += augtool cudftool dbconvert debugedit \ + nix-build nix-channel nix-collect-garbage \ + nix-log2xml nix-prefetch-url nix-pull nix-push \ + xiu-echo xiu-hash \ roto rpmkey sandbox semodule spooktool RPMMISC_LDADD_COMMON = \ @@ -64,7 +68,7 @@ endif dist_man_MANS = rpmgrep.1 -noinst_PROGRAMS =grep +noinst_PROGRAMS += grep augtool_SOURCES =augtool.c augtool_LDFLAGS =@LDFLAGS_STATIC@ $(LDFLAGS) @@ . patch -p0 <<'@@ .' Index: rpm/tools/roto.c $ cvs diff -u -r1.1.2.3 -r1.1.2.4 roto.c --- rpm/tools/roto.c 4 Jun 2012 15:10:41 - 1.1.2.3 +++ rpm/tools/roto.c 4 Aug 2013 21:44:27 - 1.1.2.4 @@ -1669,6 +1669,7 @@ fh.setFormatter(formatter) fh.setLevel(logging.NOTSET) log.addHandler(fh) +#endif /* REFERENCE */ rpmlog(RPMLOG_INFO, "Mock Version: %s\n", roto->version); /* finally: */ xx = uidManagerRestorePrivs(roto); @@ -3541,7 +3542,7 @@ #ifdef REFERENCE roto->chrootgid = grp.getgrnam("mock")[2] except KeyError: -# 'mock' group doesn't exist, must set in config file +# mock group doesn't exist, must set in config file pass #else {struct group * gr = getgrnam("mock"); @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmcurl.c tmagic.c tperl.c tput.c tpyth...
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 04-Aug-2013 23:40:22 Branch: rpm-5_4 Handle: 2013080421402200 Modified files: (Branch: rpm-5_4) rpm/rpmio rpmcurl.c tmagic.c tperl.c tput.c tpython.c ttcl.c Log: - rpmio: scrub out some bit rot in helper programs. Summary: RevisionChanges Path 1.2.6.1 +4 -4 rpm/rpmio/rpmcurl.c 1.8.8.1 +14 -27 rpm/rpmio/tmagic.c 2.1.6.1 +2 -3 rpm/rpmio/tperl.c 1.6.8.1 +13 -30 rpm/rpmio/tput.c 2.1.6.1 +2 -3 rpm/rpmio/tpython.c 2.3.6.1 +2 -3 rpm/rpmio/ttcl.c patch -p0 <<'@@ .' Index: rpm/rpmio/rpmcurl.c $ cvs diff -u -r1.2 -r1.2.6.1 rpmcurl.c --- rpm/rpmio/rpmcurl.c 11 Apr 2009 16:50:24 - 1.2 +++ rpm/rpmio/rpmcurl.c 4 Aug 2013 21:40:22 - 1.2.6.1 @@ -78,7 +78,7 @@ { "anyauth", '\0', POPT_ARG_VAL, &curlAuth, CURL_AUTH_ANY, N_("Pick \"any\" authentication method (H)"), NULL }, - { "append", 'a', POPT_BIT_TOGGLE, &curlFlags, CURL_FLAGS_APPEND, + { "append", 'a', POPT_ARGFLAG_TOGGLE, &curlFlags, CURL_FLAGS_APPEND, N_("Append to target file when uploading (F)"), NULL }, { "basic", '\0', POPT_ARG_VAL, &curlAuth, CURL_AUTH_BASIC, N_("Use HTTP Basic Authentication (H)"), NULL }, @@ -94,7 +94,7 @@ /* XXX ARGV */ { "ciphers", '\0', POPT_ARG_STRING,&_ciphers, 0, N_(" SSL ciphers to use (SSL)"), NULL }, - { "compressed", '\0', POPT_BIT_TOGGLE,&curlFlags, CURL_FLAGS_COMPRESSED, + { "compressed", '\0', POPT_ARGFLAG_TOGGLE,&curlFlags, CURL_FLAGS_COMPRESSED, N_("Request compressed response (using deflate or gzip)"), NULL }, { "config", 'K', POPT_ARG_NONE,NULL, 'K', N_("Specify which config file to read"), NULL }, @@ -108,7 +108,7 @@ N_("Cookie string or file to read cookies from (H)"), N_("") }, { "cookie-jar", 'c', POPT_ARG_STRING, &_cookie_jar, 0, N_("Write cookies to this file after operation (H)"), N_("") }, - { "create-dirs", '\0', POPT_BIT_TOGGLE,&curlFlags, CURL_FLAGS_CREATEDIRS, + { "create-dirs", '\0', POPT_ARGFLAG_TOGGLE,&curlFlags, CURL_FLAGS_CREATEDIRS, N_("Create necessary local directory hierarchy"), NULL }, { "crlf", '\0', POPT_BIT_SET, &curlFlags, CURL_FLAGS_CRLF, N_("Convert LF to CRLF in upload"), NULL }, @@ -322,7 +322,7 @@ N_("Transfer to remote site"), N_("") }, { "url", '\0', POPT_ARG_NONE, NULL, POPTCURL_XXX, N_("Set URL to work with"), N_("") }, - { "use-ascii", 'B', POPT_BIT_TOGGLE, &curlFlags, CURL_FLAGS_ASCII, + { "use-ascii", 'B', POPT_ARGFLAG_TOGGLE, &curlFlags, CURL_FLAGS_ASCII, N_("Use ASCII/text transfer"), NULL }, { "user", 'u', POPT_ARG_NONE, NULL, 'u', N_("Set server user and password"), N_("") }, @@ . patch -p0 <<'@@ .' Index: rpm/rpmio/tmagic.c $ cvs diff -u -r1.8 -r1.8.8.1 tmagic.c --- rpm/rpmio/tmagic.c2 Feb 2008 01:46:05 - 1.8 +++ rpm/rpmio/tmagic.c4 Aug 2013 21:40:22 - 1.8.8.1 @@ -1,13 +1,14 @@ #include "system.h" #include "magic.h" -#define _RPMMG_INTERNAL -#include -#include +#include #include #include -#include +#include + +#define _RPMMG_INTERNAL +#include #include "debug.h" @@ -35,14 +36,11 @@ } static struct poptOption optionsTable[] = { - { "debug", 'd', POPT_ARG_VAL, &_rpmmg_debug, -1, NULL, NULL }, - { "ftpdebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_ftp_debug, -1, - N_("debug protocol data stream"), NULL}, - { "rpmiodebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_rpmio_debug, -1, - N_("debug rpmio I/O"), NULL}, - { "urldebug", '\0', POPT_ARG_VAL|POPT_ARGFLAG_DOC_HIDDEN, &_url_debug, -1, - N_("debug URL cache handling"), NULL}, - { "verbose", 'v', 0, 0, 'v',NULL, NULL }, + + { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmioAllPoptTable, 0, +N_("Common options for all rpmio executables:"), +NULL }, + POPT_AUTOHELP POPT_TABLEEND }; @@ -50,20 +48,9 @@ int main(int argc, char *argv[]) { -poptContext optCon = poptGetContext(argv[0], argc, argv, optionsTable, 0); +poptContext optCon = rpmioInit(argc, argv, optionsTable);
[CVS] RPM: rpm-5_4: rpm/ devtool.conf
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 04-Aug-2013 23:35:02 Branch: rpm-5_4 Handle: 2013080421350100 Modified files: (Branch: rpm-5_4) rpm devtool.conf Log: - revert disabling GIT_SSL_NO_VERIFY: either export in env, or add the cert. - revert to perl-URPM svn repository: the ABF git repo is for packaging. Summary: RevisionChanges Path 2.365.2.81 +7 -7 rpm/devtool.conf patch -p0 <<'@@ .' Index: rpm/devtool.conf $ cvs diff -u -r2.365.2.80 -r2.365.2.81 devtool.conf --- rpm/devtool.conf 1 Aug 2013 14:31:13 - 2.365.2.80 +++ rpm/devtool.conf 4 Aug 2013 21:35:01 - 2.365.2.81 @@ -27,14 +27,14 @@ case "${name}" in libgit2) if [ -d ${DEVTOOL_SRCDIR}/${name}/.git ]; then - cmd="env GIT_SSL_NO_VERIFY=true git pull" +cmd="git pull" echo "===> ${name} (${cmd})" ( cd ${DEVTOOL_SRCDIR}/${name} && ${cmd} ) else - cmd="env GIT_SSL_NO_VERIFY=true git clone https://github.com/libgit2/libgit2.git"; +cmd="git clone git://github.com/libgit2/libgit2.git" echo "===> ${name} (${cmd})" ( cd ${DEVTOOL_SRCDIR} && ${cmd} ) - fi +fi ;; gpsee) if [ -d ${DEVTOOL_SRCDIR}/${name}/.hg ]; then @@ -51,21 +51,21 @@ fi ;; perl-URPM) -if [ -d ${DEVTOOL_SRCDIR}/${name}/.git ]; then - cmd="env GIT_SSL_NO_VERIFY=true git pull" +if [ -d ${DEVTOOL_SRCDIR}/${name}/.svn ]; then +cmd="svn up" echo "===> ${name} (${cmd})" ( cd ${DEVTOOL_SRCDIR}/${name} && ${cmd} && \ cp ../scripts/URPM-Makefile.am ./Makefile.am && \ cp ../scripts/URPM-Makefile.PL.in ./Makefile.PL.in \ ) else - cmd="env GIT_SSL_NO_VERIFY=true git clone https://abf.rosalinux.ru/openmandriva/perl-URPM.git"; +cmd="svn checkout http://svn.mandriva.com/svn/soft/rpm/perl-URPM/trunk perl-URPM" echo "===> ${name} (${cmd})" ( cd ${DEVTOOL_SRCDIR} && ${cmd} && \ cp scripts/URPM-Makefile.am ${name}/Makefile.am && \ cp scripts/URPM-Makefile.PL.in ${name}/Makefile.PL.in \ ) - fi +fi ;; *) release=MODULE_TAG_`echo ${name} | tr '[a-z/\-]' '[A-Z__]'` @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 04-Aug-2013 23:17:11 Branch: rpm-5_4 Handle: 2013080421171100 Modified files: (Branch: rpm-5_4) rpm Makefile.am Log: - parallel build for coverity scan Summary: RevisionChanges Path 2.263.2.21 +1 -1 rpm/Makefile.am patch -p0 <<'@@ .' Index: rpm/Makefile.am $ cvs diff -u -r2.263.2.20 -r2.263.2.21 Makefile.am --- rpm/Makefile.am 19 Jul 2013 00:58:54 - 2.263.2.20 +++ rpm/Makefile.am 4 Aug 2013 21:17:11 - 2.263.2.21 @@ -235,7 +235,7 @@ covscan: rm -rf $(COVDIR) $(PACKAGE).tgz make clean - $(COVBUILD) make + $(COVBUILD) make -j4 tar czf $(COVFILE) $(COVDIR) curl --form project=$(PACKAGE) \ --form token=9FhGnFpviyNVjN5kBmAqSQ \ @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: neon/test/ Makefile.in
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: neon Date: 04-Aug-2013 23:09:13 Branch: rpm-5_4 Handle: 2011090517442600 Removed files:(Branch: rpm-5_4) neon/test Makefile.in Log: - remove cruft Summary: RevisionChanges Path 1.9 +0 -232neon/test/Makefile.in rm -f neon/test/Makefile.in <<'@@ .' Index: neon/test/Makefile.in [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: neon/test/ .cvsignore
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: neon Date: 04-Aug-2013 23:08:20 Branch: rpm-5_4 Handle: 2013080421082000 Modified files: (Branch: rpm-5_4) neon/test .cvsignore Log: - ignore cruft Summary: RevisionChanges Path 1.4.4.2 +1 -0 neon/test/.cvsignore patch -p0 <<'@@ .' Index: neon/test/.cvsignore $ cvs diff -u -r1.4.4.1 -r1.4.4.2 .cvsignore --- neon/test/.cvsignore 5 Sep 2011 18:10:24 - 1.4.4.1 +++ neon/test/.cvsignore 4 Aug 2013 21:08:20 - 1.4.4.2 @@ -1,3 +1,4 @@ +.dirstamp .deps .libs *.la @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: neon/test/common/ .cvsignore
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: neon Date: 04-Aug-2013 23:07:14 Branch: rpm-5_4 Handle: 2013080421071400 Added files: (Branch: rpm-5_4) neon/test/common.cvsignore Log: - ignore cruft Summary: RevisionChanges Path 1.5.2.2 +5 -0 neon/test/common/.cvsignore patch -p0 <<'@@ .' Index: neon/test/common/.cvsignore $ cvs diff -u -r0 -r1.5.2.2 .cvsignore --- /dev/null 2013-08-04 23:06:30.0 +0200 +++ .cvsignore2013-08-04 23:07:14.143971763 +0200 @@ -0,0 +1,5 @@ +.dirstamp +.deps +.dirstamp +.libs +*.lo @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: neon/test/ Makefile.am
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: neon Date: 04-Aug-2013 23:05:06 Branch: HEAD Handle: 2013080421050600 Modified files: neon/test Makefile.am Log: - neon: remove cruft. Summary: RevisionChanges Path 1.3 +0 -2 neon/test/Makefile.am patch -p0 <<'@@ .' Index: neon/test/Makefile.am $ cvs diff -u -r1.2 -r1.3 Makefile.am --- neon/test/Makefile.am 31 Jul 2013 20:25:01 - 1.2 +++ neon/test/Makefile.am 4 Aug 2013 21:05:06 - 1.3 @@ -138,7 +138,6 @@ compress \ oldacl \ acl3744 \ - utils \ stubs \ props \ session \ @@ -171,7 +170,6 @@ compress_LDADD = $(LDADD) oldacl_LDADD = $(LDADD) acl3744_LDADD = $(LDADD) -utils_LDADD =$(LDADD) stubs_LDADD =$(LDADD) props_LDADD =$(LDADD) session_LDADD = $(LDADD) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: neon/po/ cs.gmo de.gmo fr.gmo ja.gmo nn.gmo pl.gmo...
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: neon Date: 04-Aug-2013 23:02:09 Branch: rpm-5_4 Handle: 2010050619191700 Removed files:(Branch: rpm-5_4) neon/po cs.gmo de.gmo fr.gmo ja.gmo nn.gmo pl.gmo ru.gmo tr.gmo zh_CN.gmo Log: - neon: remove cruft. Summary: RevisionChanges Path 1.1 +0 -13 neon/po/cs.gmo 1.1 +0 -14 neon/po/de.gmo 1.1 +0 -10 neon/po/fr.gmo 1.1 +0 -10 neon/po/ja.gmo 1.1 +0 -13 neon/po/nn.gmo 1.1 +0 -14 neon/po/pl.gmo 1.1 +0 -10 neon/po/ru.gmo 1.1 +0 -13 neon/po/tr.gmo 1.1 +0 -23 neon/po/zh_CN.gmo rm -f neon/po/cs.gmo <<'@@ .' Index: neon/po/cs.gmo [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . rm -f neon/po/de.gmo <<'@@ .' Index: neon/po/de.gmo [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . rm -f neon/po/fr.gmo <<'@@ .' Index: neon/po/fr.gmo [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . rm -f neon/po/ja.gmo <<'@@ .' Index: neon/po/ja.gmo [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . rm -f neon/po/nn.gmo <<'@@ .' Index: neon/po/nn.gmo [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . rm -f neon/po/pl.gmo <<'@@ .' Index: neon/po/pl.gmo [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . rm -f neon/po/ru.gmo <<'@@ .' Index: neon/po/ru.gmo [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . rm -f neon/po/tr.gmo <<'@@ .' Index: neon/po/tr.gmo [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . rm -f neon/po/zh_CN.gmo <<'@@ .' Index: neon/po/zh_CN.gmo [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/lib/ tevr.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 04-Aug-2013 21:49:28 Branch: rpm-5_4 Handle: 2013080419492800 Modified files: (Branch: rpm-5_4) rpm/lib tevr.c Log: - coverity #1060834. Summary: RevisionChanges Path 2.5.4.3 +0 -1 rpm/lib/tevr.c patch -p0 <<'@@ .' Index: rpm/lib/tevr.c $ cvs diff -u -r2.5.4.2 -r2.5.4.3 tevr.c --- rpm/lib/tevr.c4 Aug 2013 18:59:17 - 2.5.4.2 +++ rpm/lib/tevr.c4 Aug 2013 19:49:28 - 2.5.4.3 @@ -218,7 +218,6 @@ s.strnb += sizeof(*av) + 1; /* Compute size of dictionary store. */ -if (dict->av != NULL) for (i = 0; dict->av[i] != NULL; i++) { s.dictnb += sizeof(*dict->av) + strlen(dict->av[i]) + 1; } @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmpigz.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 04-Aug-2013 21:30:31 Branch: rpm-5_4 Handle: 2013080419303000 Modified files: (Branch: rpm-5_4) rpm/rpmio rpmpigz.c Log: - typo Summary: RevisionChanges Path 1.68.6.5+1 -1 rpm/rpmio/rpmpigz.c patch -p0 <<'@@ .' Index: rpm/rpmio/rpmpigz.c $ cvs diff -u -r1.68.6.4 -r1.68.6.5 rpmpigz.c --- rpm/rpmio/rpmpigz.c 4 Aug 2013 19:14:41 - 1.68.6.4 +++ rpm/rpmio/rpmpigz.c 4 Aug 2013 19:30:30 - 1.68.6.5 @@ -1979,7 +1979,7 @@ /* convert time stamp to text */ if (zh->stamp) { strncpy(mod, ctime(&zh->stamp), sizeof(mod)); - mod[sizepf(mod)-1] = '\0'; + mod[sizeof(mod)-1] = '\0'; now = time(NULL); /*@-aliasunique@*/ if (strcmp(mod + 20, ctime(&now) + 20) != 0) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmpigz.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 04-Aug-2013 21:14:42 Branch: rpm-5_4 Handle: 2013080419144100 Modified files: (Branch: rpm-5_4) rpm/rpmio rpmpigz.c Log: - coverity #1060692 Summary: RevisionChanges Path 1.68.6.4+3 -2 rpm/rpmio/rpmpigz.c patch -p0 <<'@@ .' Index: rpm/rpmio/rpmpigz.c $ cvs diff -u -r1.68.6.3 -r1.68.6.4 rpmpigz.c --- rpm/rpmio/rpmpigz.c 4 Aug 2013 19:11:40 - 1.68.6.3 +++ rpm/rpmio/rpmpigz.c 4 Aug 2013 19:14:41 - 1.68.6.4 @@ -1956,7 +1956,7 @@ size_t max; /* maximum name length for current verbosity */ size_t n; /* name length without suffix */ time_t now; /* for getting current year */ -char mod[26]; /* modification time in text */ +char mod[64+1]; /* modification time in text */ char name[NAMEMAX1+1]; /* header or file name, possibly truncated */ if (_debug) @@ -1978,7 +1978,8 @@ /* convert time stamp to text */ if (zh->stamp) { - strcpy(mod, ctime(&zh->stamp)); + strncpy(mod, ctime(&zh->stamp), sizeof(mod)); + mod[sizepf(mod)-1] = '\0'; now = time(NULL); /*@-aliasunique@*/ if (strcmp(mod + 20, ctime(&now) + 20) != 0) @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmpigz.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 04-Aug-2013 21:11:40 Branch: rpm-5_4 Handle: 2013080419114000 Modified files: (Branch: rpm-5_4) rpm/rpmio rpmpigz.c Log: - coverity #1060691 Summary: RevisionChanges Path 1.68.6.3+2 -1 rpm/rpmio/rpmpigz.c patch -p0 <<'@@ .' Index: rpm/rpmio/rpmpigz.c $ cvs diff -u -r1.68.6.2 -r1.68.6.3 rpmpigz.c --- rpm/rpmio/rpmpigz.c 4 Aug 2013 18:34:08 - 1.68.6.2 +++ rpm/rpmio/rpmpigz.c 4 Aug 2013 19:11:40 - 1.68.6.3 @@ -2848,7 +2848,8 @@ /* open input file with name in, descriptor zq->ifdno -- set name and mtime */ if (path == NULL) { - strcpy(z->_ifn, z->stdin_fn); + strncpy(z->_ifn, z->stdin_fn, sizeof(z->_ifn)); + z->_ifn[sizeof(z->_ifn)-1] = '\0'; zq->_zinp.fdno = STDIN_FILENO; /*@-mustfreeonly@*/ zh->name = NULL; @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/tests/ trsa.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 04-Aug-2013 21:05:38 Branch: rpm-5_4 Handle: 2013080419053800 Modified files: (Branch: rpm-5_4) rpm/tests trsa.c Log: - coverity #1060687 Summary: RevisionChanges Path 1.32.2.1+2 -2 rpm/tests/trsa.c patch -p0 <<'@@ .' Index: rpm/tests/trsa.c $ cvs diff -u -r1.32 -r1.32.2.1 trsa.c --- rpm/tests/trsa.c 11 Oct 2010 18:39:38 - 1.32 +++ rpm/tests/trsa.c 4 Aug 2013 19:05:38 - 1.32.2.1 @@ -3231,11 +3231,11 @@ die("[%i] get keygrip for public %s key failed\n", n, dig->pubkey_algoN); #endif /* _RPMGC_INTERNAL */ -if (memcmp(sgrip, pgrip, sizeof(grip))) { +if (memcmp(sgrip, pgrip, sizeof(sgrip))) { fail("[%i] keygrips for %s key don't match\n", n, dig->pubkey_algoN); rc = 1; } -if (memcmp(sgrip, grip, sizeof(grip))) { +if (memcmp(sgrip, grip, sizeof(sgrip))) { fail("wrong keygrip for %s key\n", dig->pubkey_algoN); rc = 1; } @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/lib/ tevr.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 04-Aug-2013 20:59:17 Branch: rpm-5_4 Handle: 2013080418591700 Modified files: (Branch: rpm-5_4) rpm/lib tevr.c Log: - coverity #1060669. Summary: RevisionChanges Path 2.5.4.2 +4 -1 rpm/lib/tevr.c patch -p0 <<'@@ .' Index: rpm/lib/tevr.c $ cvs diff -u -r2.5.4.1 -r2.5.4.2 tevr.c --- rpm/lib/tevr.c15 Apr 2012 21:20:58 - 2.5.4.1 +++ rpm/lib/tevr.c4 Aug 2013 18:59:17 - 2.5.4.2 @@ -1,4 +1,5 @@ #include "system.h" + #include #include #include @@ -206,9 +207,10 @@ evr->str = _free(evr->str); } -(void) argvSort(dict->av, rpmdictCmp); +(void) argvSort(dict->av,(int (*)(const char **, const char **))rpmdictCmp); /* Compute size of string & uuid store. */ +if (av != NULL) for (i = 0; av[i] != NULL; i++) { s.strnb += sizeof(*av) + strlen(av[i]) + 1; s.uuidnb += 64/8; @@ -216,6 +218,7 @@ s.strnb += sizeof(*av) + 1; /* Compute size of dictionary store. */ +if (dict->av != NULL) for (i = 0; dict->av[i] != NULL; i++) { s.dictnb += sizeof(*dict->av) + strlen(dict->av[i]) + 1; } @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmpbzip2.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 04-Aug-2013 20:38:40 Branch: rpm-5_4 Handle: 2013080418384000 Modified files: (Branch: rpm-5_4) rpm/rpmio rpmpbzip2.c Log: - coverity #1060678. Summary: RevisionChanges Path 1.9.6.1 +2 -1 rpm/rpmio/rpmpbzip2.c patch -p0 <<'@@ .' Index: rpm/rpmio/rpmpbzip2.c $ cvs diff -u -r1.9 -r1.9.6.1 rpmpbzip2.c --- rpm/rpmio/rpmpbzip2.c 16 Mar 2009 00:04:29 - 1.9 +++ rpm/rpmio/rpmpbzip2.c 4 Aug 2013 18:38:40 - 1.9.6.1 @@ -507,6 +507,7 @@ if (_nblocks <= 1) { if (zq->verbosity > 0) fprintf(stderr, "Switching to no threads mode: only 1 BZIP2 block found.\n"); + b = _free(b); goto exit; } @@ -1857,7 +1858,7 @@ /* XXX add POPT_ARG_TIMEOFDAY oneshot? */ xx = gettimeofday(&z->start, NULL); /* starting time for log entries */ #if defined(PBZIP_DEBUG) || defined(__LCLINT__) -zlog = rpmzLogInit(&z->start); /* initialize logging */ +zlog = rpmzLogNew(&z->start);/* initialize logging */ #endif hw_init(z); @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmpigz.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 04-Aug-2013 20:34:09 Branch: rpm-5_4 Handle: 2013080418340800 Modified files: (Branch: rpm-5_4) rpm/rpmio rpmpigz.c Log: - coverity #1060676 #1060677. Summary: RevisionChanges Path 1.68.6.2+2 -2 rpm/rpmio/rpmpigz.c patch -p0 <<'@@ .' Index: rpm/rpmio/rpmpigz.c $ cvs diff -u -r1.68.6.1 -r1.68.6.2 rpmpigz.c --- rpm/rpmio/rpmpigz.c 4 Aug 2013 18:25:58 - 1.68.6.1 +++ rpm/rpmio/rpmpigz.c 4 Aug 2013 18:34:08 - 1.68.6.2 @@ -533,12 +533,12 @@ if (job != NULL) { fprintf(stderr, "[%u]:", (unsigned)job->seq); if (job->in != NULL && job->in->buf != NULL) - fprintf(stderr, " %p[%u]", job->in->buf, job->in->len); + fprintf(stderr, " %p[%lu]", job->in->buf, (unsigned long)job->in->len); else fprintf(stderr, " %p", job->in); fprintf(stderr, " ->\t"); if (job->out != NULL && job->out->buf != NULL) - fprintf(stderr, " %p[%u]", job->out->buf, job->out->len); + fprintf(stderr, " %p[%lu]", job->out->buf, (unsigned long)job->out->len); else fprintf(stderr, " %p", job->out); } @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmpigz.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 04-Aug-2013 20:25:59 Branch: rpm-5_4 Handle: 2013080418255800 Modified files: (Branch: rpm-5_4) rpm/rpmio rpmpigz.c Log: - coverity #1060660 Summary: RevisionChanges Path 1.68.6.1+1 -0 rpm/rpmio/rpmpigz.c patch -p0 <<'@@ .' Index: rpm/rpmio/rpmpigz.c $ cvs diff -u -r1.68 -r1.68.6.1 rpmpigz.c --- rpm/rpmio/rpmpigz.c 16 Mar 2009 14:25:48 - 1.68 +++ rpm/rpmio/rpmpigz.c 4 Aug 2013 18:25:58 - 1.68.6.1 @@ -2861,6 +2861,7 @@ if (path != zq->_zinp.fn) { /*@-mayaliasunique@*/ strncpy(z->_ifn, path, sizeof(z->_ifn)); + z->_ifn[sizeof(z->_ifn)-1] = '\0'; /*@=mayaliasunique@*/ if (z->_ifn[sizeof(z->_ifn) - 1]) bail("name too long: ", path); @@ . __ RPM Package Managerhttp://rpm5.org CVS Sources Repositoryrpm-cvs@rpm5.org
[CVS] RPM: rpm-5_4: rpm/rpmio/ rpmnss.c
RPM Package Manager, CVS Repository http://rpm5.org/cvs/ Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: j...@rpm5.org Module: rpm Date: 04-Aug-2013 08:59:50 Branch: rpm-5_4 Handle: 2013080406595000 Modified files: (Branch: rpm-5_4) rpm/rpmio rpmnss.c Log: - nss: keygen: permit FIPS-180-3 and DSA2 parameter selection. todo++. Summary: RevisionChanges Path 1.40.2.6+106 -13rpm/rpmio/rpmnss.c patch -p0 <<'@@ .' Index: rpm/rpmio/rpmnss.c $ cvs diff -u -r1.40.2.5 -r1.40.2.6 rpmnss.c --- rpm/rpmio/rpmnss.c4 Aug 2013 04:33:45 - 1.40.2.5 +++ rpm/rpmio/rpmnss.c4 Aug 2013 06:59:50 - 1.40.2.6 @@ -572,11 +572,11 @@ if (nss->nbits == 0) nss->nbits = 1024; /* XXX FIXME */ assert(nss->nbits); -{CK_MECHANISM_TYPE _type = CKM_RSA_PKCS_KEY_PAIR_GEN; - PK11SlotInfo * _slot = PK11_GetBestSlot(_type, NULL); +{void * _cx = NULL; + CK_MECHANISM_TYPE _type = CKM_RSA_PKCS_KEY_PAIR_GEN; + PK11SlotInfo * _slot = PK11_GetBestSlot(_type, _cx); int _isPerm = PR_FALSE; int _isSensitive = PR_TRUE; - void * _cx = NULL; if (_slot) { static unsigned _pe = 0x10001; /* XXX FIXME: pass in e */ @@ -683,7 +683,6 @@ rc = (rc == SECSuccess); -exit: SPEW(!rc, rc, dig); return rc; } @@ -692,24 +691,88 @@ { rpmnss nss = (rpmnss) dig->impl; int rc = 0; /* assume failure */ +unsigned _L = 8; +unsigned _N = 0; +unsigned _seedBytes = 0; +int xx; if (nss->nbits == 0) nss->nbits = 1024; /* XXX FIXME */ assert(nss->nbits); +if (nss->qbits == 0) nss->qbits = 160; /* XXX FIXME */ +assert(nss->qbits); + +/* + * Generate PQGParams and PQGVerify structs. + * Length of P specified by L. + * if L is greater than 1024 then the resulting verify parameters will be + * DSA2. + * Length of Q specified by N. If zero, The PKCS #11 module will + * pick an appropriately sized Q for P. If N is specified and L = 1024, then + * the resulting verify parameters will be DSA2, Otherwise DSA1 parameters + * will be returned. + * Length of SEED in bytes specified in seedBytes. + * + * The underlying PKCS #11 module will check the values for L, N, + * and seedBytes. The rules for softoken are: + * + * If L <= 1024, then L must be between 512 and 1024 in increments of 64 bits. + * If L <= 1024, then N must be 0 or 160. + * If L >= 1024, then L and N must match the following table: + * L=1024 N=0 or 160 + * L=2048 N=0 or 224 + * L=2048 N=256 + * L=3072 N=0 or 256 + * if L <= 1024 + * seedBbytes must be in the range [20..256]. + * if L >= 1024 + * seedBbytes must be in the range [20..L/16]. + */ + +xx = PQG_PBITS_TO_INDEX(nss->nbits); +if (xx >= 0 && xx <= 8) {/* FIPS-186-1 */ + _L = nss->nbits; + _N = 0; /* XXX DSA1 */ + _seedBytes = 0; /* XXX DSA1 */ +} else { /* FIPS-186-3 */ + switch (nss->nbits) { + default:/* XXX sanity */ + case 1024: + _L = 1024; + _N = 160; /* XXX DSA2 */ + _seedBytes = 20; + break; + case 2048: + _L = 2048; + _N = (nss->qbits == 256) ? 256 : 0; /* 256 or 224 */ + _seedBytes = 20;/* XXX FIXME */ + break; + case 3072: + _L = 3072; + _N = (nss->qbits == 256) ? 256 : 0; /* always 256 */ + _seedBytes = 20;/* XXX FIXME */ + break; + } +} -{CK_MECHANISM_TYPE _type = CKM_DSA_KEY_PAIR_GEN; - PK11SlotInfo * _slot = PK11_GetBestSlot(_type, NULL); +{void * _cx = NULL; + CK_MECHANISM_TYPE _type = CKM_DSA_KEY_PAIR_GEN; + PK11SlotInfo * _slot = PK11_GetBestSlot(_type, _cx); int _isPerm = PR_FALSE; int _isSensitive = PR_TRUE; - void * _cx = NULL; if (_slot) { PQGParams *pqgParams = NULL; PQGVerify *pqgVfy = NULL; void * params = NULL; -int xx; +#ifndef NOTYET + xx = rpmnssErr(nss, "PK11_PQG_ParamGenV2", + PK11_PQG_ParamGenV2(_L, _N, _seedBytes, + &pqgParams, &pqgVfy)); +#else xx = rpmnssErr(nss, "PK11_PQG_ParamGen", - PK11_PQG_ParamGen(nss->nbits, &pqgParams, &pqgVfy)); + PK11_PQG_ParamGen(0, &pqgPar