From 1e9d8f7a92e43f61e4d9f478f6e8dd5ae206616e Mon Sep 17 00:00:00 2001
From: Mike Buland <eichlan@xagasoft.com>
Date: Mon, 9 Apr 2012 16:35:15 +0000
Subject: Halfway through crypto-template conversion.

---
 src/experimental/blowfish.cpp |  2 +-
 src/experimental/blowfish.h   |  2 +-
 src/experimental/cipher.cpp   | 62 ---------------------------------------
 src/experimental/cipher.h     | 67 +++++++++++++++++++++++++++++++++++++++----
 4 files changed, 63 insertions(+), 70 deletions(-)

(limited to 'src/experimental')

diff --git a/src/experimental/blowfish.cpp b/src/experimental/blowfish.cpp
index 797ec73..7f89f0f 100644
--- a/src/experimental/blowfish.cpp
+++ b/src/experimental/blowfish.cpp
@@ -9,7 +9,7 @@ using Bu::sio;
 	 SB[3][x.byte.three])
 
 Bu::Blowfish::Blowfish( Bu::Stream &rNext ) :
-	Bu::Cipher( rNext )
+	Bu::Cipher<8>( rNext )
 {
 }
 
diff --git a/src/experimental/blowfish.h b/src/experimental/blowfish.h
index 4dbd637..c043b12 100644
--- a/src/experimental/blowfish.h
+++ b/src/experimental/blowfish.h
@@ -12,7 +12,7 @@
 
 namespace Bu
 {
-	class Blowfish : public Bu::Cipher
+	class Blowfish : public Bu::Cipher<8>
 	{
 	public:
 		Blowfish( Bu::Stream &rNext );
diff --git a/src/experimental/cipher.cpp b/src/experimental/cipher.cpp
index 3430c08..d6d01c7 100644
--- a/src/experimental/cipher.cpp
+++ b/src/experimental/cipher.cpp
@@ -1,65 +1,3 @@
 #include "bu/cipher.h"
 
-Bu::Cipher::Cipher( Bu::Stream &rNext ) :
-	Bu::Filter( rNext )
-{
-}
-
-Bu::Cipher::~Cipher()
-{
-}
-
-void Bu::Cipher::start()
-{
-}
-
-Bu::size Bu::Cipher::stop()
-{
-	return 0;
-}
-
-Bu::size Bu::Cipher::read( void *pBuf, Bu::size iBytes )
-{
-	uint32_t i;
-
-	if (iBytes%8)
-	{
-		return 0;
-	}
-
-	iBytes /= 8;
-
-	for (i=0;i<iBytes;i++)
-	{
-		void *pSeg = ((char *)pBuf)+(i*8);
-		int iRead = rNext.read( pSeg, 8 );
-		decipher( pSeg );
-	}
-
-	return iBytes*8;
-}
-
-Bu::size Bu::Cipher::write( const void *pBuf, Bu::size iBytes )
-{
-	uint32_t i;
-
-	if (iBytes%8)
-	{
-		return 0;
-	}
-
-	iBytes /= 8;
-
-	char buf[8];
-
-	for (i=0;i<iBytes;i++)
-	{
-		memcpy( buf, ((const char *)pBuf)+(i*8), 8 );
-		encipher( buf );
-		rNext.write( buf, 8 );
-	}
-
-	memset( &buf, 0, 8 );
-	return iBytes*8;
-}
 
diff --git a/src/experimental/cipher.h b/src/experimental/cipher.h
index 2327aa6..613bc88 100644
--- a/src/experimental/cipher.h
+++ b/src/experimental/cipher.h
@@ -5,17 +5,72 @@
 
 namespace Bu
 {
+	template<int iBlockSize>
 	class Cipher : Bu::Filter
 	{
 	public:
-		Cipher( Bu::Stream &rNext );
-		virtual ~Cipher();
+		Cipher( Bu::Stream &rNext ) :
+			Bu::Filter( rNext )
+		{
+		}
 
-		virtual void start();
-		virtual Bu::size stop();
+		virtual ~Cipher()
+		{
+		}
 
-		virtual Bu::size read( void *pBuf, Bu::size iBytes );
-		virtual Bu::size write( const void *pBuf, Bu::size iBytes );
+		virtual void start()
+		{
+		}
+
+		virtual Bu::size stop()
+		{
+			return 0;
+		}
+
+		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++)
+			{
+				void *pSeg = ((char *)pBuf)+(i*iBlockSize);
+				int iRead = rNext.read( pSeg, iBlockSize );
+				decipher( pSeg );
+			}
+
+			return iBytes*iBlockSize;
+		}
+
+		virtual Bu::size write( const void *pBuf, Bu::size iBytes )
+		{
+			uint32_t i;
+
+			if (iBytes%iBlockSize)
+			{
+				return 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;
+		}
 
 		using Bu::Stream::read;
 		using Bu::Stream::write;
-- 
cgit v1.2.3