updates.

diff --git a/TODO b/TODO
index 4f6d695c92eebf188c32fb8e70787ae5abb8717e..6f1e6ca44fc1f4d7bfa3e7f2c358a5d7065ec372 100644 (file)
--- a/TODO
+++ b/TODO
@@ -75,6 +75,9 @@ TODO/bugs In SILC Libraries
    that needs to be commited (from Schneier's Yarrow-160 paper).  They 
    should make the RNG even better.
 
+ o Some of the ciphers in lib/silccrypt does not implement the SILC
+   Crypto API correctly.
+
  o SIM support for SILC PKCS API needs to made so that they could be
    used as SIM's.  At the same time some work is required on prime
    generation as the way it is done now sucks.  Read from code for

diff --git a/lib/silccrypt/ciphers_def.h b/lib/silccrypt/ciphers_def.h
index 499b7db89135ccc8344b8a2e81a80e26e2735991..12f455312dda90b78c70e5b8e6ac49cf55b76952 100644 (file)
--- a/lib/silccrypt/ciphers_def.h
+++ b/lib/silccrypt/ciphers_def.h
@@ -83,22 +83,22 @@ do {                                                \
   SILC_GET32_LSB(d[3], &s[12]);                        \
 } while(0);
 
-#define SILC_CBC_DEC_POST(s, d, p, t, iv)      \
+#define SILC_CBC_DEC_POST(s, d, p, t, siv)     \
 do {                                           \
-  s[0] ^= iv[0];                               \
-  s[1] ^= iv[1];                               \
-  s[2] ^= iv[2];                               \
-  s[3] ^= iv[3];                               \
+  s[0] ^= siv[0];                              \
+  s[1] ^= siv[1];                              \
+  s[2] ^= siv[2];                              \
+  s[3] ^= siv[3];                              \
                                                \
   SILC_PUT32_LSB(s[0], &d[0]);                 \
   SILC_PUT32_LSB(s[1], &d[4]);                 \
   SILC_PUT32_LSB(s[2], &d[8]);                 \
   SILC_PUT32_LSB(s[3], &d[12]);                        \
                                                \
-  iv[0] = t[0];                                        \
-  iv[1] = t[1];                                        \
-  iv[2] = t[2];                                        \
-  iv[3] = t[3];                                        \
+  siv[0] = t[0];                               \
+  siv[1] = t[1];                               \
+  siv[2] = t[2];                               \
+  siv[3] = t[3];                               \
                                                \
   d += 16;                                     \
   p += 16;                                     \