4.0.4: AIX 4.3.2 patches

[Albert Chin <rpm-list thewrittenword com>]

1. beecrypt/base64.c
   beecrypt/base64.h
   The IBM xlc C compiler complains about data++ in b64crc()
   from beecrypt/base64.c because it doesn't allow arithmetic on
   a void pointer.
2. beecrypt/dsa.c
   No C++ comments in C code.
3. rpmio/rpmpgp.h
   lib/rpmlib.h
   Last element in an enum definition cannot have ','. Other compilers
   are lax about this but the Tru64 UNIX compiler and IBM compiler
   fail.
4. rpmio/rpmio_internal.h
   lib/rpmrc.c
   IBM compiler doesn't allow returning a const type from a function
   (is this even legal)? Affects fdGetIo() and lookupInCanonTable().

   rpmRebuildTargetVars prototype is 'static void' so function
   declaration should be the same (HP-UX C compiler complains
   otherwise).

-- 
albert chin (china@thewrittenword.com)

-- snip snip
--- beecrypt/base64.c.orig	Sun May 12 16:23:59 2002
+++ beecrypt/base64.c	Sun May 12 16:24:07 2002
@@ -343,7 +343,7 @@
 #define CRC24_INIT 0xb704ceL
 #define CRC24_POLY 0x1864cfbL
 
-char * b64crc (const void * data, int ns)
+char * b64crc (const unsigned char * data, int ns)
 {
     const unsigned char *s = data;
     uint32 crc = CRC24_INIT;
--- beecrypt/base64.h.orig	Sun May 12 16:23:34 2002
+++ beecrypt/base64.h	Sun May 12 16:23:42 2002
@@ -78,7 +78,7 @@
  * @return		(malloc'd) base64 string
  */
 BEECRYPTAPI /*@only@*/ /*@null@*/ /*@unused@*/
-char * b64crc (const void * data, int ns)
+char * b64crc (const unsigned char * data, int ns)
 	/*@*/;
 
 /**
--- beecrypt/dsa.c.orig	Sun May 12 17:54:46 2002
+++ beecrypt/dsa.c	Sun May 12 17:55:22 2002
@@ -58,8 +58,8 @@
 {
 	register uint32  psize = p->size;
 	register uint32  qsize = q->size;
-	// k + inv(k) = 2 * qsize
-	// g^k mod p = psize+4*psize+2
+	/* k + inv(k) = 2 * qsize */
+	/* g^k mod p = psize+4*psize+2 */
 
 	register uint32* ptemp;
 	register uint32* qtemp;
@@ -78,11 +78,11 @@
 		register uint32* pwksp = ptemp+psize;
 		register uint32* qwksp = qtemp+3*qsize;
 
-		// allocate r
+		/* allocate r */
 		mp32nfree(r);
 		mp32nsize(r, qsize);
 
-		// get a random k, invertible modulo q
+		/* get a random k, invertible modulo q */
 		mp32brndinv_w(q, rgc, qtemp, qtemp+qsize, qwksp);
 
 #if 0
@@ -96,24 +96,24 @@
 		mp32binv_w(q, qsize, qtemp, qtemp+qsize, qwksp);
 #endif
 
-		// g^k mod p
+		/* g^k mod p */
 		mp32bpowmod_w(p, g->size, g->data, qsize, qtemp, ptemp, pwksp);
 
-		// (g^k mod p) mod q - simple modulo
+		/* (g^k mod p) mod q - simple modulo */
 		mp32nmod(qtemp+2*qsize, psize, ptemp, qsize, q->modl, pwksp);
 		mp32copy(qsize, r->data, qtemp+psize+qsize);
 
-		// allocate s
+		/* allocate s */
 		mp32nfree(s);
 		mp32nsize(s, qsize);
 
-		// x*r mod q
+		/* x*r mod q */
 		mp32bmulmod_w(q, x->size, x->data, r->size, r->data, qtemp, qwksp);
 
-		// add h(m) mod q
+		/* add h(m) mod q */
 		mp32baddmod_w(q, qsize, qtemp, hm->size, hm->data, qtemp+2*qsize, qwksp);
 
-		// multiply inv(k) mod q
+		/* multiply inv(k) mod q */
 		mp32bmulmod_w(q, qsize, qtemp+qsize, qsize, qtemp+2*qsize, s->data, qwksp);
 		rc = 0;
 
@@ -158,25 +158,25 @@
 		register uint32* pwksp = ptemp+2*psize;
 		register uint32* qwksp = qtemp+2*qsize;
 
-		// compute w = inv(s) mod q
+		/* compute w = inv(s) mod q */
 		if (mp32binv_w(q, s->size, s->data, qtemp, qwksp))
 		{
-			// compute u1 = h(m)*w mod q
+			/* compute u1 = h(m)*w mod q */
 			mp32bmulmod_w(q, hm->size, hm->data, qsize, qtemp, qtemp+qsize, qwksp);
 
-			// compute u2 = r*w mod q
+			/* compute u2 = r*w mod q */
 			mp32bmulmod_w(q, r->size, r->data, qsize, qtemp, qtemp, qwksp);
 
-			// compute g^u1 mod p
+			/* compute g^u1 mod p */
 			mp32bpowmod_w(p, g->size, g->data, qsize, qtemp+qsize, ptemp, pwksp);
 
-			// compute y^u2 mod p
+			/* compute y^u2 mod p */
 			mp32bpowmod_w(p, y->size, y->data, qsize, qtemp, ptemp+psize, pwksp);
 
-			// multiply mod p
+			/* multiply mod p */
 			mp32bmulmod_w(p, psize, ptemp, psize, ptemp+psize, ptemp, pwksp);
 
-			// modulo q
+			/* modulo q */
 			mp32nmod(ptemp+psize, psize, ptemp, qsize, q->modl, pwksp);
 
 			rc = mp32eqx(r->size, r->data, psize, ptemp+psize);
--- rpmio/rpmpgp.h.orig	Sun May 12 19:53:51 2002
+++ rpmio/rpmpgp.h	Sun May 12 19:54:38 2002
@@ -61,7 +61,7 @@
     PGPTAG_PRIVATE_60		= 60, /*!< Private or Experimental Values */
     PGPTAG_COMMENT		= 61, /*!< Comment */
     PGPTAG_PRIVATE_62		= 62, /*!< Private or Experimental Values */
-    PGPTAG_CONTROL		= 63, /*!< Control (GPG) */
+    PGPTAG_CONTROL		= 63 /*!< Control (GPG) */
 } pgpTag;
 
 /**
@@ -176,7 +176,7 @@
     PGPPUBKEYALGO_EC		= 18,	/*!< Elliptic Curve */
     PGPPUBKEYALGO_ECDSA		= 19,	/*!< ECDSA */
     PGPPUBKEYALGO_ELGAMAL	= 20,	/*!< Elgamal */
-    PGPPUBKEYALGO_DH		= 21,	/*!< Diffie-Hellman (X9.42) */
+    PGPPUBKEYALGO_DH		= 21	/*!< Diffie-Hellman (X9.42) */
 } pgpPubkeyAlgo;
 /*@=typeuse@*/
 
@@ -453,7 +453,7 @@
     PGPSUBTYPE_INTERNAL_107	= 107, /*!< internal or user-defined */
     PGPSUBTYPE_INTERNAL_108	= 108, /*!< internal or user-defined */
     PGPSUBTYPE_INTERNAL_109	= 109, /*!< internal or user-defined */
-    PGPSUBTYPE_INTERNAL_110	= 110, /*!< internal or user-defined */
+    PGPSUBTYPE_INTERNAL_110	= 110 /*!< internal or user-defined */
 } pgpSubType;
 /*@=typeuse@*/
 
@@ -923,7 +923,7 @@
     PGPARMOR_SIGNED_MESSAGE	=  4, /*!< SIGNED MESSAGE */
     PGPARMOR_FILE		=  5, /*!< ARMORED FILE */
     PGPARMOR_PRIVKEY		=  6, /*!< PRIVATE KEY BLOCK */
-    PGPARMOR_SECKEY		=  7, /*!< SECRET KEY BLOCK */
+    PGPARMOR_SECKEY		=  7 /*!< SECRET KEY BLOCK */
 } pgpArmor;
 /*@=typeuse@*/
 
@@ -940,7 +940,7 @@
     PGPARMORKEY_COMMENT		= 2, /*!< Comment: */
     PGPARMORKEY_MESSAGEID	= 3, /*!< MessageID: */
     PGPARMORKEY_HASH		= 4, /*!< Hash: */
-    PGPARMORKEY_CHARSET		= 5, /*!< Charset: */
+    PGPARMORKEY_CHARSET		= 5 /*!< Charset: */
 } pgpArmorKey;
 /*@=typeuse@*/
 
--- lib/rpmlib.h.orig	Sun May 12 20:30:13 2002
+++ lib/rpmlib.h	Sun May 12 20:31:13 2002
@@ -1744,7 +1744,7 @@
     RPMSIGTAG_LEMD5_2	= 1003,	/*!< Broken MD5, take 2 */
     RPMSIGTAG_MD5	= 1004,	/*!< MD5 signature. */
     RPMSIGTAG_GPG	= 1005, /*!< GnuPG signature. */
-    RPMSIGTAG_PGP5	= 1006,	/*!< PGP5 signature @deprecated legacy. */
+    RPMSIGTAG_PGP5	= 1006	/*!< PGP5 signature @deprecated legacy. */
 };
 
 /**
--- rpmio/rpmio_internal.h.orig	Sun May 12 20:51:41 2002
+++ rpmio/rpmio_internal.h	Sun May 12 20:51:55 2002
@@ -193,7 +193,7 @@
 /** \ingroup rpmio
  */
 /*@unused@*/ static inline
-/*@null@*/ const FDIO_t fdGetIo(FD_t fd)
+/*@null@*/ FDIO_t fdGetIo(FD_t fd)
 	/*@*/
 {
     FDSANE(fd);
--- lib/rpmrc.c.orig	Sun May 12 21:41:15 2002
+++ lib/rpmrc.c	Mon May 13 12:09:12 2002
@@ -413,7 +413,7 @@
     return 0;
 }
 
-static /*@null@*/ const canonEntry lookupInCanonTable(const char * name,
+static /*@null@*/ canonEntry lookupInCanonTable(const char * name,
 		const canonEntry table, int tableLen)
 	/*@*/
 {
@@ -1400,7 +1400,7 @@
     getMachineInfo(OS, name, num);
 }
 
-void rpmRebuildTargetVars(const char ** target, const char ** canontarget)
+static void rpmRebuildTargetVars(const char ** target, const char ** canontarget)
 {
 
     char *ca = NULL, *co = NULL, *ct = NULL;