summaryrefslogtreecommitdiff
path: root/src/utils/crypto
diff options
context:
space:
mode:
authoriximeow <me@iximeow.net>2014-11-28 03:40:17 -0800
committeriximeow <me@iximeow.net>2014-11-28 03:40:17 -0800
commit6268e2c446d6d54b43668d859184d6f3a779fa3a (patch)
treec9333b6130f0032b33bdd54194e3e41be62cf6b4 /src/utils/crypto
parent409e8109d8076058e4f154272270a79b6844da18 (diff)
Fix challenge 10 specs
Diffstat (limited to 'src/utils/crypto')
-rw-r--r--src/utils/crypto/CBCCipher.scala8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/utils/crypto/CBCCipher.scala b/src/utils/crypto/CBCCipher.scala
index 3bd0784..227b635 100644
--- a/src/utils/crypto/CBCCipher.scala
+++ b/src/utils/crypto/CBCCipher.scala
@@ -30,8 +30,14 @@ class CBCCipher(private[this] val cipher: Cipher, private[this] val iv: Seq[Byte
// wouldn't hurt to invalidate this object afterward, but meh
// TODO: strip padding!
+ // to do it right really requires writing decryption as its own part
+ // it's already obvious that's necessary, but to do padding stripping
+ // properly, the last block must be withheld until an end() call is made
+ // which is much different stateful behavior from encryption.
+ //
+ // in cryptoUtils for now.
def end(): Seq[Byte] =
- if (mode == Cipher.DECRYPT_MODE)
+ if (mode == Cipher.DECRYPT_MODE) Seq()
else cipher.update((pkcs7pad(leftover, blockSize) xor state).toArray)
def blockized(data: Seq[Byte]): (Seq[Seq[Byte]], Seq[Byte]) =