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:   09-Feb-2008 16:41:53
  Branch: HEAD                             Handle: 2008020915415201

  Modified files:
    rpm                     CHANGES
    rpm/lib                 rpmchecksig.c
    rpm/rpmdb               signature.c signature.h

  Log:
    - rpm.org: Use rpmSigTag enum for signature tags everywhere, more or
    less..

  Summary:
    Revision    Changes     Path
    1.2164      +1  -0      rpm/CHANGES
    1.211       +2  -2      rpm/lib/rpmchecksig.c
    1.44        +9  -6      rpm/rpmdb/signature.c
    1.5         +1  -1      rpm/rpmdb/signature.h
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/CHANGES
  ============================================================================
  $ cvs diff -u -r1.2163 -r1.2164 CHANGES
  --- rpm/CHANGES	9 Feb 2008 15:28:03 -0000	1.2163
  +++ rpm/CHANGES	9 Feb 2008 15:41:52 -0000	1.2164
  @@ -1,4 +1,5 @@
   5.0.0 -> 5.1a1:
  +    - rpm.org: Use rpmSigTag enum for signature tags everywhere, more or less..
       - jbj: import a modified copy of testHTML.c from libxml2.
       - rpm.org: make gendiff sort the file list, so comparing the results is easier.
       - jbj: rpmio: test programs link only -lrpmio -lrpmmisc.
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/lib/rpmchecksig.c
  ============================================================================
  $ cvs diff -u -r1.210 -r1.211 rpmchecksig.c
  --- rpm/lib/rpmchecksig.c	18 Jan 2008 17:41:28 -0000	1.210
  +++ rpm/lib/rpmchecksig.c	9 Feb 2008 15:41:52 -0000	1.211
  @@ -139,7 +139,7 @@
    * @retval signid	signer fingerprint
    * @return		0 on success
    */
  -static int getSignid(Header sigh, int sigtag, unsigned char * signid)
  +static int getSignid(Header sigh, rpmSigTag sigtag, unsigned char * signid)
   	/*@globals fileSystem, internalState @*/
   	/*@modifies *signid, fileSystem, internalState @*/
   {
  @@ -147,7 +147,7 @@
       int rc = 1;
       int xx;
   
  -    he->tag = sigtag;
  +    he->tag = (rpmTag) sigtag;
       xx = headerGet(sigh, he, 0);
       if (xx && he->p.ptr != NULL) {
   	pgpDig dig = pgpDigNew(0);
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/signature.c
  ============================================================================
  $ cvs diff -u -r1.43 -r1.44 signature.c
  --- rpm/rpmdb/signature.c	8 Dec 2007 16:30:50 -0000	1.43
  +++ rpm/rpmdb/signature.c	9 Feb 2008 15:41:53 -0000	1.44
  @@ -143,7 +143,7 @@
    * @param passPhrase	private key pass phrase
    * @return		0 on success, 1 on failure
    */
  -static int makeGPGSignature(const char * file, uint32_t * sigTagp,
  +static int makeGPGSignature(const char * file, rpmSigTag * sigTagp,
   		/*@out@*/ uint8_t ** pktp, /*@out@*/ uint32_t * pktlenp,
   		/*@null@*/ const char * passPhrase)
   	/*@globals rpmGlobalMacroContext, h_errno,
  @@ -304,7 +304,7 @@
    * @return		0 on success, -1 on failure
    */
   /*@-mustmod@*/ /* sigh is modified */
  -static int makeHDRSignature(Header sigh, const char * file, uint32_t sigTag,
  +static int makeHDRSignature(Header sigh, const char * file, rpmSigTag sigTag,
   		/*@null@*/ const char * passPhrase)
   	/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
   	/*@modifies sigh, sigTag, rpmGlobalMacroContext, fileSystem, internalState @*/
  @@ -321,6 +321,9 @@
       int xx;
   
       switch (sigTag) {
  +    default:
  +assert(0);	/* XXX never happens. */
  +	/*@notreached@*/ break;
       case RPMSIGTAG_SIZE:
       case RPMSIGTAG_MD5:
       case RPMSIGTAG_PGP5:	/* XXX legacy */
  @@ -432,7 +435,7 @@
   }
   /*@=mustmod@*/
   
  -int rpmAddSignature(Header sigh, const char * file, uint32_t sigTag,
  +int rpmAddSignature(Header sigh, const char * file, rpmSigTag sigTag,
   		const char * passPhrase)
   {
       HE_t he = memset(alloca(sizeof(*he)), 0, sizeof(*he));
  @@ -742,7 +745,7 @@
   #ifdef	NOTYET
       uint32_t siglen = pgpGetSiglen(dig);
   #endif
  -    uint32_t sigtag = pgpGetSigtag(dig);
  +    rpmSigTag sigtag = pgpGetSigtag(dig);
       pgpDigParams sigp = pgpGetSignature(dig);
       rpmRC res = RPMRC_OK;
       int xx;
  @@ -868,7 +871,7 @@
   #ifdef	NOTYET
       uint32_t siglen = pgpGetSiglen(dig);
   #endif
  -    uint32_t sigtag = pgpGetSigtag(dig);
  +    rpmSigTag sigtag = pgpGetSigtag(dig);
       pgpDigParams sigp = pgpGetSignature(dig);
       rpmRC res;
       int xx;
  @@ -954,7 +957,7 @@
       pgpDig dig = _dig;
       const void * sig = pgpGetSig(dig);
       uint32_t siglen = pgpGetSiglen(dig);
  -    uint32_t sigtag = pgpGetSigtag(dig);
  +    rpmSigTag sigtag = pgpGetSigtag(dig);
       rpmRC res;
   
       if (dig == NULL || sig == NULL || siglen == 0) {
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/rpmdb/signature.h
  ============================================================================
  $ cvs diff -u -r1.4 -r1.5 signature.h
  --- rpm/rpmdb/signature.h	26 Nov 2007 05:16:52 -0000	1.4
  +++ rpm/rpmdb/signature.h	9 Feb 2008 15:41:53 -0000	1.5
  @@ -51,7 +51,7 @@
    * @return		0 on success, -1 on failure
    */
   int rpmAddSignature(Header sigh, const char * file,
  -		    uint32_t sigTag, /*@null@*/ const char * passPhrase)
  +		    rpmSigTag sigTag, /*@null@*/ const char * passPhrase)
   	/*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
   	/*@modifies sigh, sigTag, rpmGlobalMacroContext, fileSystem, internalState @*/;
   
  @@ .