2006-05-10 Bruno Haible <bruno@clisp.org>

	* des.c: Cast to avoid warnings.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index bc3eb6fe34df05e7b94369009719717481f02408..7125bc88b0e8931e41a66b9569e8a96f8fdefc42 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,13 @@
+2006-05-10  Bruno Haible  <bruno@clisp.org>
+
+       * des.c: Cast to avoid warnings.
+
+2006-05-10  Simon Josefsson  <jas@extundo.com>
+
+       * md4.c: Typo fix, update copyright years.
+       (K1, K2): Don't use L because it turn computations into 64-bit on
+       64-bit platforms.
+
 2006-05-09  Bruno Haible  <bruno@clisp.org>
 
        * xvasprintf.c: Include limits.h, string.h, xsize.h.

diff --git a/lib/des.c b/lib/des.c
index 1e128c55a339693cad2cd4439fa7156f3c51afce..8dc74514e126ceb0635e0c1d2daf372fc3257126 100644 (file)
--- a/lib/des.c
+++ b/lib/des.c
@@ -1,5 +1,5 @@
 /* des.c --- DES and Triple-DES encryption/decryption Algorithm
- * Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, 2005
+ * Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006
  *    Free Software Foundation, Inc.
  *
  * This file is free software; you can redistribute it and/or modify
@@ -447,7 +447,7 @@ des_is_weak_key (const char * key)
 static void
 des_key_schedule (const char * _rawkey, uint32_t * subkey)
 {
-  const unsigned char *rawkey = _rawkey;
+  const unsigned char *rawkey = (const unsigned char *) _rawkey;
   uint32_t left, right, work;
   int round;
 
@@ -559,8 +559,8 @@ des_makekey (des_ctx *ctx, const char * key, size_t keylen)
 void
 des_ecb_crypt (des_ctx *ctx, const char * _from, char * _to, int mode)
 {
-  const unsigned char *from = _from;
-  unsigned char *to = _to;
+  const unsigned char *from = (const unsigned char *) _from;
+  unsigned char *to = (unsigned char *) _to;
   uint32_t left, right, work;
   uint32_t *keys;
 
@@ -632,8 +632,8 @@ tripledes_ecb_crypt (tripledes_ctx *ctx,
                     const char * _from,
                     char * _to, int mode)
 {
-  const unsigned char *from = _from;
-  unsigned char *to = _to;
+  const unsigned char *from = (const unsigned char *) _from;
+  unsigned char *to = (unsigned char *) _to;
   uint32_t left, right, work;
   uint32_t *keys;