The cipher base class does nice buffering now based on the blocksize. This

means that you can write odd numbers of bytes or read odd numbers of bytes
from/to the ciphers and it'll just buffer until it gets a full block.

Next up is adding padding support.  Right now it doesn't flush the buffers with
padding if you don't fill the last block.  For that matter, it doesn't do any
padding at all.

2 files changed, 81 insertions, 32 deletions

diff --git a/src/experimental/cipher.h b/src/experimental/cipher.h
index 9e6f87d..6e1fa69 100644
--- a/src/experimental/cipher.h
+++ b/src/experimental/cipher.h
@@ -2,6 +2,7 @@
 #define BU_CIPHER_H
 
 #include "bu/filter.h"
+#include "bu/util.h"
 
 namespace Bu
 {
@@ -10,7 +11,10 @@ namespace Bu
         {
         public:
                 Cipher( Bu::Stream &rNext ) :
-                        Bu::Filter( rNext )
+                        Bu::Filter( rNext ),
+                        iReadBufFill( 0 ),
+                        iReadBufPos( 0 ),
+                        iWriteBufFill( 0 )
                 {
                 }
 
@@ -29,47 +33,59 @@ namespace Bu
 
                 virtual Bu::size read( void *pBuf, Bu::size iBytes )
                 {
-                        uint32_t i;
-
-                        if (iBytes%iBlockSize)
-                        {
-                                return 0;
-                        }
-
-                        iBytes /= iBlockSize;
-
-                        for (i=0;i<iBytes;i++)
+                        Bu::size iRead = 0;
+                        while( iRead < iBytes )
                         {
-                                void *pSeg = ((char *)pBuf)+(i*iBlockSize);
-                                int iRead = rNext.read( pSeg, iBlockSize );
-                                decipher( pSeg );
+                                if( iReadBufFill < iBlockSize )
+                                {
+                                        int iR = rNext.read(
+                                                aReadBuf+iReadBufFill,
+                                                iBlockSize-iReadBufFill
+                                                );
+                                        if( iR == 0 )
+                                                return iRead;
+
+                                        iReadBufFill += iR;
+
+                                        if( iReadBufFill == iBlockSize )
+                                                decipher( aReadBuf );
+                                }
+
+                                if( iReadBufFill == iBlockSize )
+                                {
+                                        int iCpy = Bu::min( (int)(iBytes-iRead), iBlockSize-iReadBufPos );
+                                        memcpy( ((char *)pBuf)+iRead, aReadBuf+iReadBufPos, iCpy );
+                                        iRead += iCpy;
+                                        iReadBufPos += iCpy;
+                                        if( iReadBufPos == iBlockSize )
+                                        {
+                                                iReadBufPos = iReadBufFill = 0;
+                                        }
+                                }
                         }
 
-                        return iBytes*iBlockSize;
+                        return iRead;
                 }
 
                 virtual Bu::size write( const void *pBuf, Bu::size iBytes )
                 {
-                        uint32_t i;
-
-                        if (iBytes%iBlockSize)
+                        Bu::size iPos = 0;
+                        
+                        while( iPos < iBytes )
                         {
-                                return 0;
+                                int iLeft = Bu::min((int)(iBytes-iPos),iBlockSize-iReadBufFill);
+                                memcpy( aReadBuf+iReadBufFill, (char *)pBuf+iPos, iLeft );
+                                iPos += iLeft;
+                                iReadBufFill += iLeft;
+                                if( iReadBufFill == iBlockSize )
+                                {
+                                        encipher( aReadBuf );
+                                        rNext.write( aReadBuf, iBlockSize );
+                                        iReadBufFill = 0;
+                                }
                         }
 
-                        iBytes /= iBlockSize;
-
-                        char buf[iBlockSize];
-
-                        for (i=0;i<iBytes;i++)
-                        {
-                                memcpy( buf, ((const char *)pBuf)+(i*iBlockSize), 8 );
-                                encipher( buf );
-                                rNext.write( buf, iBlockSize );
-                        }
-
-                        memset( &buf, 0, iBlockSize );
-                        return iBytes*iBlockSize;
+                        return iPos;
                 }
 
                 using Bu::Stream::read;
@@ -78,6 +94,13 @@ namespace Bu
         protected:
                 virtual void encipher( void *pData )=0;
                 virtual void decipher( void *pData )=0;
+
+        private:
+                char aReadBuf[iBlockSize];
+                char aWriteBuf[iBlockSize];
+                int iReadBufFill;
+                int iReadBufPos;
+                int iWriteBufFill;
         };
 };
 
diff --git a/src/tests/blowfish.cpp b/src/tests/blowfish.cpp
index 293539d..89183e4 100644
--- a/src/tests/blowfish.cpp
+++ b/src/tests/blowfish.cpp
@@ -48,6 +48,32 @@ static const char *testdat[34][3] ={
 
 int main( int argc, char *argv[] )
 {
+        MemBuf mb;
+        {
+                BlowfishEcb bf( mb );
+                bf.setPassword( "01234567" );
+                for( int j = 0; j < 4; j++ )
+                {
+                        bf.write("this is a test!!"+j, 1 );
+                }
+                bf.write("this is a test!!"+4, 12 );
+        }
+        mb.setPos( 0 );
+        BlowfishEcb bf( mb );
+        bf.setPassword( "01234567" );
+        for( int j = 0; j < 3; j++ )
+        {
+                char c;
+                bf.read( &c, 1 );
+                sio << "char: '" << c << "'" << sio.nl;
+        }
+
+        char buf[100];
+        int iR = bf.read( buf, 100 );
+        buf[iR] = '\0';
+        sio << "Got(" << iR << ") = '" << buf << "'" << sio.nl;
+
+        return 0;
 
         for( int j = 0; j < 34; j++ )
         {