From: Pekka Riikonen <priikone@silcnet.org>
Date: Tue, 8 May 2001 07:25:51 +0000 (+0000)
Subject: 	updates.
X-Git-Tag: SILC.0.2.4~9
X-Git-Url: http://git.silcnet.org/gitweb/?p=silc.git;a=commitdiff_plain;h=8a740fff96eac343bd8ae703b87984ef39341540

	updates.
---

diff --git a/CHANGES b/CHANGES
index b3316217..b738985d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@ Tue May  8 09:04:03 EEST 2001  Pekka Riikonen <priikone@poseidon.pspt.fi>
 
 	* Fixed a va_arg in silc/client_ops.c.
 
+	* Oops, RC5 routines were named AES and caused some problems
+	  when not using SIM's.  Affected file lib/silccrypt/rc5.c.
+
 Sun May  6 13:59:48 EEST 2001  Pekka Riikonen <priikone@poseidon.pspt.fi>
 
 	* Added new SilcIDIP structure into the lib/silccore/id.h and
diff --git a/lib/silccrypt/rc5.c b/lib/silccrypt/rc5.c
index f74dfd37..880d1f3f 100644
--- a/lib/silccrypt/rc5.c
+++ b/lib/silccrypt/rc5.c
@@ -47,7 +47,7 @@
 
 /* Sets the key for the cipher. */
 
-SILC_CIPHER_API_SET_KEY(aes)
+SILC_CIPHER_API_SET_KEY(rc5)
 {
   uint32 k[8];
 
@@ -60,7 +60,7 @@ SILC_CIPHER_API_SET_KEY(aes)
 /* Sets the string as a new key for the cipher. The string is first
    hashed and then used as a new key. */
 
-SILC_CIPHER_API_SET_KEY_WITH_STRING(aes)
+SILC_CIPHER_API_SET_KEY_WITH_STRING(rc5)
 {
   /*  unsigned char key[md5_hash_len];
   SilcMarsContext *ctx = (SilcMarsContext *)context;
@@ -75,7 +75,7 @@ SILC_CIPHER_API_SET_KEY_WITH_STRING(aes)
 
 /* Returns the size of the cipher context. */
 
-SILC_CIPHER_API_CONTEXT_LEN(aes)
+SILC_CIPHER_API_CONTEXT_LEN(rc5)
 {
   return sizeof(RC5Context);
 }
@@ -83,7 +83,7 @@ SILC_CIPHER_API_CONTEXT_LEN(aes)
 /* Encrypts with the cipher in CBC mode. Source and destination buffers
    maybe one and same. */
 
-SILC_CIPHER_API_ENCRYPT_CBC(aes)
+SILC_CIPHER_API_ENCRYPT_CBC(rc5)
 {
   uint32 tiv[4];
   int i;
@@ -108,7 +108,7 @@ SILC_CIPHER_API_ENCRYPT_CBC(aes)
 /* Decrypts with the cipher in CBC mode. Source and destination buffers
    maybe one and same. */
 
-SILC_CIPHER_API_DECRYPT_CBC(aes)
+SILC_CIPHER_API_DECRYPT_CBC(rc5)
 {
   uint32 tmp[4], tmp2[4], tiv[4];
   int i;