RPM Package Manager, CVS Repository
  http://rpm5.org/cvs/
  ____________________________________________________________________________

  Server: rpm5.org                         Name:   Jeff Johnson
  Root:   /v/rpm/cvs                       Email:  jbj@rpm5.org
  Module: rpm                              Date:   05-Dec-2007 01:11:57
  Branch: HEAD                             Handle: 2007120500115600

  Modified files:
    rpm/rpmio               tkey.c

  Log:
    - blow the dust off the FIPS DSA test vectors in tkey.c.

  Summary:
    Revision    Changes     Path
    2.20        +33 -29     rpm/rpmio/tkey.c
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/rpmio/tkey.c
  ============================================================================
  $ cvs diff -u -r2.19 -r2.20 tkey.c
  --- rpm/rpmio/tkey.c	20 Nov 2007 17:37:04 -0000	2.19
  +++ rpm/rpmio/tkey.c	5 Dec 2007 00:11:56 -0000	2.20
  @@ -6,7 +6,9 @@
   static int _debug = 0;
   
   #include "system.h"
  -#include "rpmio_internal.h"
  +#define	_RPMBC_INTERNAL
  +#define	_RPMPGP_INTERNAL
  +#include <rpmbc.h>
   #include "debug.h"
   
   static int doit(const char *sig, pgpDig dig, int printing)
  @@ -103,32 +105,34 @@
   main(int argc, char *argv[])
   {
       pgpDig dig;
  +    rpmbc bc;
       int printing = 1;
       int rc;
   
       dig = pgpDigNew(0);
  +    bc = dig->impl;
   
  -    mpbzero(&dig->p);	mpbsethex(&dig->p, fips_p);
  -    mpbzero(&dig->q);	mpbsethex(&dig->q, fips_q);
  -    mpnzero(&dig->g);	mpnsethex(&dig->g, fips_g);
  -    mpnzero(&dig->y);	mpnsethex(&dig->y, fips_y);
  -    mpnzero(&dig->r);	mpnsethex(&dig->r, fips_r);
  -    mpnzero(&dig->s);	mpnsethex(&dig->s, fips_s);
  -    mpnzero(&dig->hm);	mpnsethex(&dig->hm, fips_hm);
  +    mpbzero(&bc->p);	mpbsethex(&bc->p, fips_p);
  +    mpbzero(&bc->q);	mpbsethex(&bc->q, fips_q);
  +    mpnzero(&bc->g);	mpnsethex(&bc->g, fips_g);
  +    mpnzero(&bc->y);	mpnsethex(&bc->y, fips_y);
  +    mpnzero(&bc->r);	mpnsethex(&bc->r, fips_r);
  +    mpnzero(&bc->s);	mpnsethex(&bc->s, fips_s);
  +    mpnzero(&bc->hm);	mpnsethex(&bc->hm, fips_hm);
   
  -    rc = dsavrfy(&dig->p, &dig->q, &dig->g, &dig->hm,
  -		&dig->y, &dig->r, &dig->s);
  +    rc = dsavrfy(&bc->p, &bc->q, &bc->g, &bc->hm,
  +		&bc->y, &bc->r, &bc->s);
   
   fprintf(stderr, "=============================== DSA FIPS-186-1: rc %d\n", rc);
   
  -    mpbfree(&dig->p);
  -    mpbfree(&dig->q);
  -    mpnfree(&dig->g);
  -    mpnfree(&dig->y);
  -
  -    mpnfree(&dig->hm);
  -    mpnfree(&dig->r);
  -    mpnfree(&dig->s);
  +    mpbfree(&bc->p);
  +    mpbfree(&bc->q);
  +    mpnfree(&bc->g);
  +    mpnfree(&bc->y);
  +
  +    mpnfree(&bc->hm);
  +    mpnfree(&bc->r);
  +    mpnfree(&bc->s);
   
   fprintf(stderr, "=============================== GPG Secret Key\n");
       if ((rc = doit(jbjSecretDSA, dig, printing)) != 0)
  @@ -152,7 +156,7 @@
   	rpmDigestUpdate(ctx, dsig->hash, dsig->hashlen);
   	rpmDigestFinal(ctx, (void **)&digest, &digestlen, 1);
   
  -	mpnzero(&dig->hm); mpnsethex(&dig->hm, digest);
  +	mpnzero(&bc->hm); mpnsethex(&bc->hm, digest);
   
   fprintf(stderr, "\n    hm = [ 160]: %s\n\n", digest);
   
  @@ -162,19 +166,19 @@
   	}
       }
   
  -    rc = dsavrfy(&dig->p, &dig->q, &dig->g, &dig->hm,
  -		&dig->y, &dig->r, &dig->s);
  +    rc = dsavrfy(&bc->p, &bc->q, &bc->g, &bc->hm,
  +		&bc->y, &bc->r, &bc->s);
   
   fprintf(stderr, "=============================== DSA verify: rc %d\n", rc);
   
  -    mpbfree(&dig->p);
  -    mpbfree(&dig->q);
  -    mpnfree(&dig->g);
  -    mpnfree(&dig->y);
  -
  -    mpnfree(&dig->hm);
  -    mpnfree(&dig->r);
  -    mpnfree(&dig->s);
  +    mpbfree(&bc->p);
  +    mpbfree(&bc->q);
  +    mpnfree(&bc->g);
  +    mpnfree(&bc->y);
  +
  +    mpnfree(&bc->hm);
  +    mpnfree(&bc->r);
  +    mpnfree(&bc->s);
   
       dig = pgpDigFree(dig);
   
  @@ .