* src/munged/cipher.c (HAVE_LIBGCRYPT:_cipher_final): Changed so

memcpy() of decrypted plaintext only occurs if data exists after PKCS #5 block padding has been removed.
dun · Nov 14, 2006 · a0b5fbd · a0b5fbd
1 parent 2b305fb
commit a0b5fbd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,9 @@
 2006-11-13  Chris Dunlap  <[email protected]>
 
+	* src/munged/cipher.c (HAVE_LIBGCRYPT:_cipher_final): Changed so
+	  memcpy() of decrypted plaintext only occurs if data exists after
+	  PKCS #5 block padding has been removed.
+
 	* src/munged/cipher.c, src/munged/mac.c, src/munged/md.c:
 	  Added log_msg()s at LOG_DEBUG to investigate infrequent "Unable to
 	  encrypt credential" errors when using the blowfish cipher with

diff --git a/src/munged/cipher.c b/src/munged/cipher.c
@@ -410,10 +410,12 @@ _cipher_final (cipher_ctx *x, void *dst, int *dstlen)
         /*  Copy decrypted plaintext to dst.
          */
         n = x->blklen - pad;
-        if (*dstlen < n) {
-            return (-1);
+        if (n > 0) {
+            if (*dstlen < n) {
+                return (-1);
+            }
+            memcpy (dst, x->buf, n);
         }
-        memcpy (dst, x->buf, n);
         *dstlen = n;
     }
     return (0);