Rearranged the Cipher system, and added four modes of operation. It's pretty

slick, really, and we actually support four of the most common modes.

Blowfish is still a template, but it doesn't really need to be anymore...

1 files changed, 54 insertions, 0 deletions

diff --git a/src/experimental/ciphermodecbc.h b/src/experimental/ciphermodecbc.h
new file mode 100644
index 0000000..8fbf9f6
--- /dev/null
+++ b/src/experimental/ciphermodecbc.h
@@ -0,0 +1,54 @@
+#ifndef BU_MODE_CBC_H
+#define BU_MODE_CBC_H
+
+#include "bu/filter.h"
+#include "bu/string.h"
+
+namespace Bu
+{
+        template<int iBlockSize, typename CipherType>
+        class CipherModeCbc : public CipherType
+        {
+        public:
+                CipherModeCbc(class Stream &rNext ) :
+                        CipherType( rNext ),
+                        bStart( true )
+                {
+                        memset( aVector, 0, iBlockSize );
+                }
+
+                virtual ~CipherModeCbc()
+                {
+                }
+
+                void setIv( const Bu::String &sIv )
+                {
+                        memcpy( aVector, sIv.getStr(), iBlockSize );
+                }
+
+        protected:
+                void decipher( void *pBuf )
+                {
+                        uint8_t aTmp[iBlockSize];
+                        memcpy( aTmp, pBuf, iBlockSize );
+                        CipherType::decipher( pBuf );
+                        for( int j = 0; j < iBlockSize; j++ )
+                                ((uint8_t *)pBuf)[j] ^= aVector[j];
+                        memcpy( aVector, aTmp, iBlockSize );
+                }
+
+                void encipher( void *pBuf )
+                {
+                        for( int j = 0; j < iBlockSize; j++ )
+                                ((uint8_t *)pBuf)[j] ^= aVector[j];
+                        CipherType::encipher( pBuf );
+                        memcpy( aVector, pBuf, iBlockSize );
+                }
+
+        private:
+                bool bStart;
+                uint8_t aVector[iBlockSize];
+        };
+};
+
+#endif