* rijndael-api-fst.c: Fix bugs in CBC mode for more than one

block.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index ac565678a1fbef32b5b3a785b21ad35f24d85ee1..08fd087793a65120515307ec2b07fab35281601a 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-21  Simon Josefsson  <jas@extundo.com>
+
+       * rijndael-api-fst.c: Fix bugs in CBC mode for more than one
+       block.
+
 2005-10-21  Simon Josefsson  <jas@extundo.com>
 
        * gc-gnulib.c: Support ARCTWO in CBC mode.

diff --git a/lib/rijndael-api-fst.c b/lib/rijndael-api-fst.c
index b7053a5b7cd9e8d322dc496331b14ecbe7bd0836..41f58a1632d41156951d33a4a7ef8afbffa87653 100644 (file)
--- a/lib/rijndael-api-fst.c
+++ b/lib/rijndael-api-fst.c
@@ -244,7 +244,7 @@ rijndaelBlockEncrypt (rijndaelCipherInstance *cipher,
          ((uint32_t *) block)[3] = ((uint32_t *) input)[3] ^
            ((uint32_t *) iv)[3];
          rijndaelEncrypt (key->rk, key->Nr, block, outBuffer);
-         iv = outBuffer;
+         memcpy (cipher->IV, outBuffer, 16);
          input += 16;
          outBuffer += 16;
        }
@@ -327,7 +327,7 @@ rijndaelPadEncrypt (rijndaelCipherInstance *cipher,
          ((uint32_t *) block)[3] = ((uint32_t *) input)[3] ^
            ((uint32_t *) iv)[3];
          rijndaelEncrypt (key->rk, key->Nr, block, outBuffer);
-         iv = outBuffer;
+         memcpy (cipher->IV, outBuffer, 16);
          input += 16;
          outBuffer += 16;
        }
@@ -342,6 +342,7 @@ rijndaelPadEncrypt (rijndaelCipherInstance *cipher,
          block[i] = (char) padLen ^ iv[i];
        }
       rijndaelEncrypt (key->rk, key->Nr, block, outBuffer);
+      memcpy (cipher->IV, outBuffer, 16);
       break;
 
     default: