* cipher.c (setup_cipher_table): #ifdef IDEA.

* random.c (fast_random_poll): Only use times() if we HAVE_TIMES.

* sha512.c, tiger.c: Use the U64_C() macro to specify 64-bit constants.
U64_C is defined in include/types.h and uses the correct suffix depending
on the underlying type of u64.

* idea-stub.c (load_module): Catch an error if the idea module file is
unloadable for some reason (unreadable, bad permissions, etc.)

* md.c (string_to_digest_algo): Give a warning about TIGER192 not being
part of OpenPGP.

cipher/ChangeLog

@@ -1,3 +1,20 @@
+2003-05-15  David Shaw  <dshaw@jabberwocky.com>
+
+	* cipher.c (setup_cipher_table): #ifdef IDEA.
+
+	* random.c (fast_random_poll): Only use times() if we HAVE_TIMES.
+
+	* sha512.c, tiger.c: Use the U64_C() macro to specify 64-bit
+	constants.  U64_C is defined in include/types.h and uses the
+	correct suffix depending on the underlying type of u64.
+
+	* idea-stub.c (load_module): Catch an error if the idea module
+	file is unloadable for some reason (unreadable, bad permissions,
+	etc.)
+
+	* md.c (string_to_digest_algo): Give a warning about TIGER192 not
+	being part of OpenPGP.
+
 2003-04-15  Werner Koch  <wk@gnupg.org>
 
 	* md.c (md_start_debug): Need to open the file in binary mode.

cipher/cipher.c

@@ -176,16 +176,20 @@ setup_cipher_table(void)
     if( !cipher_table[i].name )
 	BUG();
     i++;
+
+#ifdef USE_IDEA
     cipher_table[i].algo = CIPHER_ALGO_IDEA;
     cipher_table[i].name = idea_get_info( cipher_table[i].algo,
-					 &cipher_table[i].keylen,
+					  &cipher_table[i].keylen,
-					 &cipher_table[i].blocksize,
+					  &cipher_table[i].blocksize,
-					 &cipher_table[i].contextsize,
+					  &cipher_table[i].contextsize,
-					 &cipher_table[i].setkey,
+					  &cipher_table[i].setkey,
-					 &cipher_table[i].encrypt,
+					  &cipher_table[i].encrypt,
-					 &cipher_table[i].decrypt     );
+					  &cipher_table[i].decrypt     );
     if (cipher_table[i].name)
-      i++;  /* Note that IDEA is usually not available. */
+      i++;  /* Note that the loadable IDEA module may not be
+	       available. */
+#endif
 
 #ifdef ALLOW_DUMMY
     cipher_table[i].algo = CIPHER_ALGO_DUMMY;

cipher/idea-stub.c

@@ -124,9 +124,9 @@ load_module (const char *name)
 #endif
 
   handle = dlopen (name, RTLD_NOW);
-  if (!name)
+  if (!handle)
     {
-      /*log_error ("error loading module `%s': %s\n", name, dlerror());*/
+      err=dlerror();
       goto failure;
     }
 
@@ -134,14 +134,12 @@ load_module (const char *name)
   if (dlerror ())
     sym = dlsym (handle, "_idea_get_info");
   if ((err=dlerror())) 
-    {
+    goto failure;
-      log_info ("invalid module `%s': %s\n", name, err);
-      goto failure;
-    }
 
   return sym;
   
  failure:
+  log_info ("invalid module `%s': %s\n", name?name:"???", err?err:"???");
   if (handle)
       dlclose (handle);
 #endif /*USE_DYNAMIC_LINKING*/

cipher/md.c

@@ -144,6 +144,12 @@ string_to_digest_algo( const char *string )
 	return 0;
       }
 
+#ifdef USE_TIGER192
+    if(!ascii_strcasecmp("tiger192",string))
+      log_info(_("WARNING: digest `%s' is not part of OpenPGP.  "
+		 "Use at your own risk!\n"),string);
+#endif
+
     do {
 	for(r = digest_list; r; r = r->next )
 	    if( !ascii_strcasecmp( r->name, string ) )

cipher/random.c

@@ -38,12 +38,15 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
-#ifdef	HAVE_GETHRTIME
+#ifdef HAVE_GETHRTIME
   #include <sys/times.h>
 #endif
 #ifdef HAVE_GETTIMEOFDAY
   #include <sys/times.h>
 #endif
+#ifdef HAVE_TIMES
+  #include <sys/times.h>
+#endif
 #ifdef HAVE_GETRUSAGE
   #include <sys/resource.h>
 #endif
@@ -650,13 +653,12 @@ fast_random_poll()
 	add_randomness( &tv.tv_sec, sizeof(tv.tv_sec), 1 );
 	add_randomness( &tv.tv_nsec, sizeof(tv.tv_nsec), 1 );
     }
-  #else /* use times */
+  #elif defined (HAVE_TIMES)
-    #ifndef HAVE_DOSISH_SYSTEM
     {	struct tms buf;
-	times( &buf );
+        if( times( &buf ) == -1 )
+	    BUG();
 	add_randomness( &buf, sizeof buf, 1 );
     }
-    #endif
   #endif
   #ifdef HAVE_GETRUSAGE
     #ifndef RUSAGE_SELF

cipher/sha512.c

@@ -65,42 +65,42 @@ typedef struct {
 static void
 burn_stack (int bytes)
 {
-    char buf[128];
+  char buf[128];
 
-    wipememory(buf,sizeof buf);
+  wipememory(buf,sizeof buf);
-    bytes -= sizeof buf;
+  bytes -= sizeof buf;
-    if (bytes > 0)
+  if (bytes > 0)
-        burn_stack (bytes);
+    burn_stack (bytes);
 }
 
 
 void
 sha512_init( SHA512_CONTEXT *hd )
 {
-    hd->h0 = 0x6a09e667f3bcc908;
+  hd->h0 = U64_C(0x6a09e667f3bcc908);
-    hd->h1 = 0xbb67ae8584caa73b;
+  hd->h1 = U64_C(0xbb67ae8584caa73b);
-    hd->h2 = 0x3c6ef372fe94f82b;
+  hd->h2 = U64_C(0x3c6ef372fe94f82b);
-    hd->h3 = 0xa54ff53a5f1d36f1;
+  hd->h3 = U64_C(0xa54ff53a5f1d36f1);
-    hd->h4 = 0x510e527fade682d1;
+  hd->h4 = U64_C(0x510e527fade682d1);
-    hd->h5 = 0x9b05688c2b3e6c1f;
+  hd->h5 = U64_C(0x9b05688c2b3e6c1f);
-    hd->h6 = 0x1f83d9abfb41bd6b;
+  hd->h6 = U64_C(0x1f83d9abfb41bd6b);
-    hd->h7 = 0x5be0cd19137e2179;
+  hd->h7 = U64_C(0x5be0cd19137e2179);
 
-    hd->nblocks = 0;
+  hd->nblocks = 0;
-    hd->count = 0;
+  hd->count = 0;
 }
 
 void
 sha384_init( SHA512_CONTEXT *hd )
 {
-  hd->h0 = 0xcbbb9d5dc1059ed8;
+  hd->h0 = U64_C(0xcbbb9d5dc1059ed8);
-  hd->h1 = 0x629a292a367cd507;
+  hd->h1 = U64_C(0x629a292a367cd507);
-  hd->h2 = 0x9159015a3070dd17;
+  hd->h2 = U64_C(0x9159015a3070dd17);
-  hd->h3 = 0x152fecd8f70e5939;
+  hd->h3 = U64_C(0x152fecd8f70e5939);
-  hd->h4 = 0x67332667ffc00b31;
+  hd->h4 = U64_C(0x67332667ffc00b31);
-  hd->h5 = 0x8eb44a8768581511;
+  hd->h5 = U64_C(0x8eb44a8768581511);
-  hd->h6 = 0xdb0c2e0d64f98fa7;
+  hd->h6 = U64_C(0xdb0c2e0d64f98fa7);
-  hd->h7 = 0x47b5481dbefa4fa4;
+  hd->h7 = U64_C(0x47b5481dbefa4fa4);
 
   hd->nblocks = 0;
   hd->count = 0;
@@ -118,33 +118,46 @@ transform( SHA512_CONTEXT *hd, byte *data )
   int t;
   static const u64 k[]=
     {
-      0x428a2f98d728ae22, 0x7137449123ef65cd, 0xb5c0fbcfec4d3b2f,
+      U64_C(0x428a2f98d728ae22), U64_C(0x7137449123ef65cd),
-      0xe9b5dba58189dbbc, 0x3956c25bf348b538, 0x59f111f1b605d019,
+      U64_C(0xb5c0fbcfec4d3b2f), U64_C(0xe9b5dba58189dbbc),
-      0x923f82a4af194f9b, 0xab1c5ed5da6d8118, 0xd807aa98a3030242,
+      U64_C(0x3956c25bf348b538), U64_C(0x59f111f1b605d019),
-      0x12835b0145706fbe, 0x243185be4ee4b28c, 0x550c7dc3d5ffb4e2,
+      U64_C(0x923f82a4af194f9b), U64_C(0xab1c5ed5da6d8118),
-      0x72be5d74f27b896f, 0x80deb1fe3b1696b1, 0x9bdc06a725c71235,
+      U64_C(0xd807aa98a3030242), U64_C(0x12835b0145706fbe),
-      0xc19bf174cf692694, 0xe49b69c19ef14ad2, 0xefbe4786384f25e3,
+      U64_C(0x243185be4ee4b28c), U64_C(0x550c7dc3d5ffb4e2),
-      0x0fc19dc68b8cd5b5, 0x240ca1cc77ac9c65, 0x2de92c6f592b0275,
+      U64_C(0x72be5d74f27b896f), U64_C(0x80deb1fe3b1696b1),
-      0x4a7484aa6ea6e483, 0x5cb0a9dcbd41fbd4, 0x76f988da831153b5,
+      U64_C(0x9bdc06a725c71235), U64_C(0xc19bf174cf692694),
-      0x983e5152ee66dfab, 0xa831c66d2db43210, 0xb00327c898fb213f,
+      U64_C(0xe49b69c19ef14ad2), U64_C(0xefbe4786384f25e3),
-      0xbf597fc7beef0ee4, 0xc6e00bf33da88fc2, 0xd5a79147930aa725,
+      U64_C(0x0fc19dc68b8cd5b5), U64_C(0x240ca1cc77ac9c65),
-      0x06ca6351e003826f, 0x142929670a0e6e70, 0x27b70a8546d22ffc,
+      U64_C(0x2de92c6f592b0275), U64_C(0x4a7484aa6ea6e483),
-      0x2e1b21385c26c926, 0x4d2c6dfc5ac42aed, 0x53380d139d95b3df,
+      U64_C(0x5cb0a9dcbd41fbd4), U64_C(0x76f988da831153b5),
-      0x650a73548baf63de, 0x766a0abb3c77b2a8, 0x81c2c92e47edaee6,
+      U64_C(0x983e5152ee66dfab), U64_C(0xa831c66d2db43210),
-      0x92722c851482353b, 0xa2bfe8a14cf10364, 0xa81a664bbc423001,
+      U64_C(0xb00327c898fb213f), U64_C(0xbf597fc7beef0ee4),
-      0xc24b8b70d0f89791, 0xc76c51a30654be30, 0xd192e819d6ef5218,
+      U64_C(0xc6e00bf33da88fc2), U64_C(0xd5a79147930aa725),
-      0xd69906245565a910, 0xf40e35855771202a, 0x106aa07032bbd1b8,
+      U64_C(0x06ca6351e003826f), U64_C(0x142929670a0e6e70),
-      0x19a4c116b8d2d0c8, 0x1e376c085141ab53, 0x2748774cdf8eeb99,
+      U64_C(0x27b70a8546d22ffc), U64_C(0x2e1b21385c26c926),
-      0x34b0bcb5e19b48a8, 0x391c0cb3c5c95a63, 0x4ed8aa4ae3418acb,
+      U64_C(0x4d2c6dfc5ac42aed), U64_C(0x53380d139d95b3df),
-      0x5b9cca4f7763e373, 0x682e6ff3d6b2b8a3, 0x748f82ee5defb2fc,
+      U64_C(0x650a73548baf63de), U64_C(0x766a0abb3c77b2a8),
-      0x78a5636f43172f60, 0x84c87814a1f0ab72, 0x8cc702081a6439ec,
+      U64_C(0x81c2c92e47edaee6), U64_C(0x92722c851482353b),
-      0x90befffa23631e28, 0xa4506cebde82bde9, 0xbef9a3f7b2c67915,
+      U64_C(0xa2bfe8a14cf10364), U64_C(0xa81a664bbc423001),
-      0xc67178f2e372532b, 0xca273eceea26619c, 0xd186b8c721c0c207,
+      U64_C(0xc24b8b70d0f89791), U64_C(0xc76c51a30654be30),
-      0xeada7dd6cde0eb1e, 0xf57d4f7fee6ed178, 0x06f067aa72176fba,
+      U64_C(0xd192e819d6ef5218), U64_C(0xd69906245565a910),
-      0x0a637dc5a2c898a6, 0x113f9804bef90dae, 0x1b710b35131c471b,
+      U64_C(0xf40e35855771202a), U64_C(0x106aa07032bbd1b8),
-      0x28db77f523047d84, 0x32caab7b40c72493, 0x3c9ebe0a15c9bebc,
+      U64_C(0x19a4c116b8d2d0c8), U64_C(0x1e376c085141ab53),
-      0x431d67c49c100d4c, 0x4cc5d4becb3e42b6, 0x597f299cfc657e2a,
+      U64_C(0x2748774cdf8eeb99), U64_C(0x34b0bcb5e19b48a8),
-      0x5fcb6fab3ad6faec, 0x6c44198c4a475817
+      U64_C(0x391c0cb3c5c95a63), U64_C(0x4ed8aa4ae3418acb),
+      U64_C(0x5b9cca4f7763e373), U64_C(0x682e6ff3d6b2b8a3),
+      U64_C(0x748f82ee5defb2fc), U64_C(0x78a5636f43172f60),
+      U64_C(0x84c87814a1f0ab72), U64_C(0x8cc702081a6439ec),
+      U64_C(0x90befffa23631e28), U64_C(0xa4506cebde82bde9),
+      U64_C(0xbef9a3f7b2c67915), U64_C(0xc67178f2e372532b),
+      U64_C(0xca273eceea26619c), U64_C(0xd186b8c721c0c207),
+      U64_C(0xeada7dd6cde0eb1e), U64_C(0xf57d4f7fee6ed178),
+      U64_C(0x06f067aa72176fba), U64_C(0x0a637dc5a2c898a6),
+      U64_C(0x113f9804bef90dae), U64_C(0x1b710b35131c471b),
+      U64_C(0x28db77f523047d84), U64_C(0x32caab7b40c72493),
+      U64_C(0x3c9ebe0a15c9bebc), U64_C(0x431d67c49c100d4c),
+      U64_C(0x4cc5d4becb3e42b6), U64_C(0x597f299cfc657e2a),
+      U64_C(0x5fcb6fab3ad6faec), U64_C(0x6c44198c4a475817)
     };
 
   /* get values from the chaining vars */
@@ -342,7 +355,7 @@ sha512_final(SHA512_CONTEXT *hd)
 static byte *
 sha512_read( SHA512_CONTEXT *hd )
 {
-    return hd->buf;
+  return hd->buf;
 }
 
 /****************