From 0af5a2e4ade0b032e1ec6d25c51de2ff95dd2799 Mon Sep 17 00:00:00 2001
From: iximeow <me@iximeow.net>
Date: Thu, 27 Nov 2014 02:06:03 -0800
Subject: Rough cut of challenge 10

---
 src/utils/crypto/CBCCipher.scala | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

(limited to 'src/utils/crypto/CBCCipher.scala')

diff --git a/src/utils/crypto/CBCCipher.scala b/src/utils/crypto/CBCCipher.scala
index e1ece8a..d6d99ff 100644
--- a/src/utils/crypto/CBCCipher.scala
+++ b/src/utils/crypto/CBCCipher.scala
@@ -1,21 +1,34 @@
 package ixee.cryptopals.utils.crypto
 
 import javax.crypto.Cipher
+import ixee.cryptopals.utils.ConversionUtils._
+import ixee.cryptopals.utils.FunctionUtils._
+import ixee.cryptopals.utils.CryptoUtils._
+import ixee.cryptopals.utils.TupleUtils._
+import ixee.cryptopals.utils.ByteUtils._
+
+class CBCEncrypter(cipher: Cipher, init: Seq[Byte]) {
+  val blockSize = 16
 
-class CBCCipher(cipher: Cipher, init: Seq[Byte]) {
   var state: Seq[Byte] = init
   var leftover: Seq[Byte] = Seq()
 
   def enc(data: Seq[Byte]): Seq[Byte] = {
-    (blocks, leftover) = blockized(leftover append data)
-    blocks.map(encBlock).reduce(_ append _)
+    val (blocks, newLeftover) = blockized(leftover ++ data)(blockSize)
+    leftover = newLeftover
+    blocks.map(encBlock _).foldLeft(Seq[Byte]())(_ ++ _)
   }
 
   def encBlock(data: Seq[Byte]): Seq[Byte] = {
-    state = cipher.doFinal((data xor state).toArray)
+    state = cipher.update((data xor state).toArray)
     state
   }
 
+  def end(): Seq[Byte] =
+    cipher.doFinal((pkcs7pad(leftover, blockSize) xor state).toArray)
+
   def blockized(data: Seq[Byte])(size: Int): (Seq[Seq[Byte]], Seq[Byte]) =
-    data.splitAt(data.length - (data.length % size))
+    groupBlocks <-: data.splitAt(data.length - (data.length % size))
+
+  def groupBlocks: Seq[Byte] => Seq[Seq[Byte]] = _.grouped(blockSize).toSeq
 }
-- 
cgit v1.1