* gc-gnulib.c: Support ARCTWO in CBC mode.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 5206f03a3ddf4e3566b4b20fed0884c39922b6af..ac565678a1fbef32b5b3a785b21ad35f24d85ee1 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-21  Simon Josefsson  <jas@extundo.com>
+
+       * gc-gnulib.c: Support ARCTWO in CBC mode.
+
 2005-10-21  Simon Josefsson  <jas@extundo.com>
 
        * hmac-md5.c (hmac_md5): Add comments, suggested by Bruno Haible

diff --git a/lib/gc-gnulib.c b/lib/gc-gnulib.c
index 9cac96049ec9d47e1c302868edfa374d8118e08c..0b70ccebc0a822e1494fc8577df955060d7c3fb9 100644 (file)
--- a/lib/gc-gnulib.c
+++ b/lib/gc-gnulib.c
@@ -166,6 +166,7 @@ typedef struct _gc_cipher_ctx {
   Gc_cipher_mode mode;
 #ifdef GC_USE_ARCTWO
   arctwo_context arctwoContext;
+  char arctwoIV[ARCTWO_BLOCK_SIZE];
 #endif
 #ifdef GC_USE_ARCFOUR
   arcfour_context arcfourContext;
@@ -199,6 +200,7 @@ gc_cipher_open (Gc_cipher alg, Gc_cipher_mode mode,
       switch (mode)
        {
        case GC_ECB:
+       case GC_CBC:
          break;
 
        default:
@@ -333,6 +335,14 @@ gc_cipher_setiv (gc_cipher_handle handle, size_t ivlen, const char *iv)
 
   switch (ctx->alg)
     {
+#ifdef GC_USE_ARCTWO
+    case GC_ARCTWO40:
+      if (ivlen != ARCTWO_BLOCK_SIZE)
+       return GC_INVALID_CIPHER;
+      memcpy (ctx->arctwoIV, iv, ivlen);
+      break;
+#endif
+
 #ifdef GC_USE_RIJNDAEL
     case GC_AES128:
     case GC_AES192:
@@ -381,7 +391,28 @@ gc_cipher_encrypt_inline (gc_cipher_handle handle, size_t len, char *data)
     {
 #ifdef GC_USE_ARCTWO
     case GC_ARCTWO40:
-      arctwo_encrypt (&ctx->arctwoContext, data, data, len);
+      switch (ctx->mode)
+       {
+       case GC_ECB:
+         arctwo_encrypt (&ctx->arctwoContext, data, data, len);
+         break;
+
+       case GC_CBC:
+         for (; len >= ARCTWO_BLOCK_SIZE; len -= ARCTWO_BLOCK_SIZE,
+                data += ARCTWO_BLOCK_SIZE)
+           {
+             size_t i;
+             for (i = 0; i < ARCTWO_BLOCK_SIZE; i++)
+               data[i] ^= ctx->arctwoIV[i];
+             arctwo_encrypt (&ctx->arctwoContext, data, data,
+                             ARCTWO_BLOCK_SIZE);
+             memcpy (ctx->arctwoIV, data, ARCTWO_BLOCK_SIZE);
+           }
+           break;
+
+       default:
+         return GC_INVALID_CIPHER;
+       }
       break;
 #endif
 
@@ -430,7 +461,30 @@ gc_cipher_decrypt_inline (gc_cipher_handle handle, size_t len, char *data)
     {
 #ifdef GC_USE_ARCTWO
     case GC_ARCTWO40:
-      arctwo_decrypt (&ctx->arctwoContext, data, data, len);
+      switch (ctx->mode)
+       {
+       case GC_ECB:
+         arctwo_decrypt (&ctx->arctwoContext, data, data, len);
+         break;
+
+       case GC_CBC:
+         for (; len >= ARCTWO_BLOCK_SIZE; len -= ARCTWO_BLOCK_SIZE,
+                data += ARCTWO_BLOCK_SIZE)
+           {
+             char tmpIV[ARCTWO_BLOCK_SIZE];
+             size_t i;
+             memcpy (tmpIV, data, ARCTWO_BLOCK_SIZE);
+             arctwo_decrypt (&ctx->arctwoContext, data, data,
+                             ARCTWO_BLOCK_SIZE);
+             for (i = 0; i < ARCTWO_BLOCK_SIZE; i++)
+               data[i] ^= ctx->arctwoIV[i];
+             memcpy (ctx->arctwoIV, tmpIV, ARCTWO_BLOCK_SIZE);
+           }
+         break;
+
+       default:
+         return GC_INVALID_CIPHER;
+       }
       break;
 #endif