cryptopp 0.0.4 → 0.0.5

data/ext/jcipher.h

@@ -1,8 +1,8 @@
 
 /*
- * Copyright (c) 2002-2010 J Smith <dark.panda@gmail.com>
- * Crypto++ copyright (c) 1995-2010 Wei Dai
- * See COPYING for the extact license
+ * Copyright (c) 2002-2014 J Smith <dark.panda@gmail.com>
+ * Crypto++ copyright (c) 1995-2013 Wei Dai
+ * See MIT-LICENSE for the extact license
  */
 
 #ifndef __JCIPHER_H__
@@ -16,27 +16,27 @@
 
 class JCipher : public JBase
 {
-	public:
-		JCipher();
-
-		string getModeName() const;
-		static string getModeName(const enum ModeEnum mode);
-		enum ModeEnum getMode() const;
-		void setMode(const enum ModeEnum mode);
-
-		string getPaddingName() const;
-		static string getPaddingName(const enum PaddingEnum padding);
-		enum PaddingEnum getPadding() const;
-		enum PaddingEnum setPadding(const enum PaddingEnum padding);
-
-		unsigned int getRounds() const;
-		unsigned int setRounds(const unsigned int rounds);
-		virtual unsigned int getValidRounds(const unsigned int rounds) const = 0;
-
-	protected:
-		enum ModeEnum itsMode;
-		enum PaddingEnum itsPadding;
-		unsigned int itsRounds;
+  public:
+    JCipher();
+
+    string getModeName() const;
+    static string getModeName(const enum ModeEnum mode);
+    enum ModeEnum getMode() const;
+    void setMode(const enum ModeEnum mode);
+
+    string getPaddingName() const;
+    static string getPaddingName(const enum PaddingEnum padding);
+    enum PaddingEnum getPadding() const;
+    enum PaddingEnum setPadding(const enum PaddingEnum padding);
+
+    unsigned int getRounds() const;
+    unsigned int setRounds(const unsigned int rounds);
+    virtual unsigned int getValidRounds(const unsigned int rounds) const = 0;
+
+  protected:
+    enum ModeEnum itsMode;
+    enum PaddingEnum itsPadding;
+    unsigned int itsRounds;
 };
 
 #endif

data/ext/jcipher_t.h

@@ -1,8 +1,8 @@
 
 /*
- * Copyright (c) 2002-2010 J Smith <dark.panda@gmail.com>
- * Crypto++ copyright (c) 1995-2010 Wei Dai
- * See COPYING for the extact license
+ * Copyright (c) 2002-2014 J Smith <dark.panda@gmail.com>
+ * Crypto++ copyright (c) 1995-2013 Wei Dai
+ * See MIT-LICENSE for the extact license
  */
 
 #ifndef __JCIPHER_T_H__
@@ -13,313 +13,313 @@
 template <typename INFO, enum CipherEnum TYPE, unsigned int DEFAULT_ROUNDS = 0, unsigned int MIN_ROUNDS = 0, unsigned int MAX_ROUNDS = 0>
 class JCipher_Template : public JBasicCipherInfo<INFO, JCipher>
 {
-	public:
-		JCipher_Template();
+  public:
+    JCipher_Template();
 
-		inline unsigned int getValidRounds(const unsigned int rounds) const;
-		inline enum CipherEnum getCipherType() const;
-		inline unsigned int getBlockSize() const;
+    inline unsigned int getValidRounds(const unsigned int rounds) const;
+    inline enum CipherEnum getCipherType() const;
+    inline unsigned int getBlockSize() const;
 
-		bool encrypt();
-		bool decrypt();
+    bool encrypt();
+    bool decrypt();
 
-		bool encryptRubyIO(VALUE* in, VALUE* out);
-		bool decryptRubyIO(VALUE* in, VALUE* out);
+    bool encryptRubyIO(VALUE* in, VALUE* out);
+    bool decryptRubyIO(VALUE* in, VALUE* out);
 
-		/* These are deprecated. They were used before using RubyIO. Use them
-		   if you're using this code in something other than the CryptoPP Ruby
-		   extension... */
-// 		bool encryptFile(const string in, const string out);
-// 		bool decryptFile(const string in, const string out);
+    /* These are deprecated. They were used before using RubyIO. Use them
+       if you're using this code in something other than the CryptoPP Ruby
+       extension... */
+//     bool encryptFile(const string in, const string out);
+//     bool decryptFile(const string in, const string out);
 
-	protected:
-		virtual BlockCipher* getEncryptionObject() = 0;
-		virtual BlockCipher* getDecryptionObject() = 0;
+  protected:
+    virtual BlockCipher* getEncryptionObject() = 0;
+    virtual BlockCipher* getDecryptionObject() = 0;
 };
 
 template <typename INFO, enum CipherEnum TYPE, unsigned int DEFAULT_ROUNDS, unsigned int MIN_ROUNDS, unsigned int MAX_ROUNDS>
 JCipher_Template<INFO, TYPE, DEFAULT_ROUNDS, MIN_ROUNDS, MAX_ROUNDS>::JCipher_Template()
 {
-	this->itsKeylength = INFO::DEFAULT_KEYLENGTH;
-	this->itsRounds = DEFAULT_ROUNDS;
+  this->itsKeylength = INFO::DEFAULT_KEYLENGTH;
+  this->itsRounds = DEFAULT_ROUNDS;
 }
 
 template <typename INFO, enum CipherEnum TYPE, unsigned int DEFAULT_ROUNDS, unsigned int MIN_ROUNDS, unsigned int MAX_ROUNDS>
 unsigned int JCipher_Template<INFO, TYPE, DEFAULT_ROUNDS, MIN_ROUNDS, MAX_ROUNDS>::getValidRounds(const unsigned int rounds) const
 {
-	return checkBounds(rounds, MIN_ROUNDS, MAX_ROUNDS);
+  return checkBounds(rounds, MIN_ROUNDS, MAX_ROUNDS);
 }
 
 template <typename INFO, enum CipherEnum TYPE, unsigned int DEFAULT_ROUNDS, unsigned int MIN_ROUNDS, unsigned int MAX_ROUNDS>
 CipherEnum JCipher_Template<INFO, TYPE, DEFAULT_ROUNDS, MIN_ROUNDS, MAX_ROUNDS>::getCipherType() const
 {
-	return TYPE;
+  return TYPE;
 }
 
 template <typename INFO, enum CipherEnum TYPE, unsigned int DEFAULT_ROUNDS, unsigned int MIN_ROUNDS, unsigned int MAX_ROUNDS>
 unsigned int JCipher_Template<INFO, TYPE, DEFAULT_ROUNDS, MIN_ROUNDS, MAX_ROUNDS>::getBlockSize() const
 {
-	return INFO::BLOCKSIZE;
+  return INFO::BLOCKSIZE;
 }
 
 template <typename INFO, enum CipherEnum TYPE, unsigned int DEFAULT_ROUNDS, unsigned int MIN_ROUNDS, unsigned int MAX_ROUNDS>
 bool JCipher_Template<INFO, TYPE, DEFAULT_ROUNDS, MIN_ROUNDS, MAX_ROUNDS>::encrypt()
 {
-	BlockCipher* bc = NULL;
-	CipherModeBase* cipher = NULL;
+  BlockCipher* bc = NULL;
+  CipherModeBase* cipher = NULL;
 
-	bc = getEncryptionObject();
+  bc = getEncryptionObject();
 
-	if (bc != NULL) {
-		switch (this->itsMode) {
-			case ECB_MODE:
-				cipher = new ECB_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
-			break;
+  if (bc != NULL) {
+    switch (this->itsMode) {
+      case ECB_MODE:
+        cipher = new ECB_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
+      break;
 
-			case CBC_MODE:
-				cipher = new CBC_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
-			break;
+      case CBC_MODE:
+        cipher = new CBC_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
+      break;
 
-			case CBC_CTS_MODE:
-				cipher = new CBC_CTS_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
-			break;
+      case CBC_CTS_MODE:
+        cipher = new CBC_CTS_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
+      break;
 
-			case CFB_MODE:
-				cipher = new CFB_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
-			break;
+      case CFB_MODE:
+        cipher = new CFB_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
+      break;
 
-			case CTR_MODE:
-				cipher = new CTR_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
-			break;
+      case CTR_MODE:
+        cipher = new CTR_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
+      break;
 
-			case OFB_MODE:
-				cipher = new OFB_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
-			break;
+      case OFB_MODE:
+        cipher = new OFB_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
+      break;
 
-			default:
-				return false;
-		}
+      default:
+        return false;
+    }
 
-		this->itsCiphertext.erase();
-		StringSource(this->itsPlaintext, true, new StreamTransformationFilter(*cipher, new StringSink(this->itsCiphertext), (StreamTransformationFilter::BlockPaddingScheme) this->itsPadding));
+    this->itsCiphertext.erase();
+    StringSource(this->itsPlaintext, true, new StreamTransformationFilter(*cipher, new StringSink(this->itsCiphertext), (StreamTransformationFilter::BlockPaddingScheme) this->itsPadding));
 
-		delete bc;
-	}
-	else {
-		return false;
-	}
+    delete bc;
+  }
+  else {
+    return false;
+  }
 
-	if (cipher != NULL) {
-		delete cipher;
-	}
+  if (cipher != NULL) {
+    delete cipher;
+  }
 
-	return true;
+  return true;
 }
 
 template <typename INFO, enum CipherEnum TYPE, unsigned int DEFAULT_ROUNDS, unsigned int MIN_ROUNDS, unsigned int MAX_ROUNDS>
 bool JCipher_Template<INFO, TYPE, DEFAULT_ROUNDS, MIN_ROUNDS, MAX_ROUNDS>::decrypt()
 {
-	BlockCipher* bc = NULL;
-	CipherModeBase* cipher = NULL;
-
-	switch (this->itsMode) {
-		case ECB_MODE:
-		case CBC_MODE:
-		case CBC_CTS_MODE:
-			bc = getDecryptionObject();
-		break;
-
-		case CFB_MODE:
-		case CTR_MODE:
-		case OFB_MODE:
-			bc = getEncryptionObject();
-		break;
-
-		default:
-			return false;
-	}
-
-	if (bc != NULL) {
-		switch (this->itsMode) {
-			case ECB_MODE:
-				cipher = new ECB_Mode_ExternalCipher::Decryption(*bc);
-			break;
-
-			case CBC_MODE:
-				cipher = new CBC_Mode_ExternalCipher::Decryption(*bc, (const byte*) this->itsIV.data());
-			break;
-
-			case CBC_CTS_MODE:
-				cipher = new CBC_CTS_Mode_ExternalCipher::Decryption(*bc, (const byte*) this->itsIV.data());
-			break;
-
-			case CFB_MODE:
-				cipher = new CFB_Mode_ExternalCipher::Decryption(*bc, (const byte*) this->itsIV.data());
-			break;
-
-			case CTR_MODE:
-				cipher = new CTR_Mode_ExternalCipher::Decryption(*bc, (const byte*) this->itsIV.data());
-			break;
-
-			case OFB_MODE:
-				cipher = new OFB_Mode_ExternalCipher::Decryption(*bc, (const byte*) this->itsIV.data());
-			break;
-
-			default:
-				return false;
-		}
-
-		this->itsPlaintext.erase();
-		StringSource(this->itsCiphertext, true, new StreamTransformationFilter(*cipher, new StringSink(this->itsPlaintext), (StreamTransformationFilter::BlockPaddingScheme) this->itsPadding));
-
-		delete bc;
-	}
-	else {
-		return false;
-	}
-
-	if (cipher != NULL) {
-		delete cipher;
-	}
-
-	return true;
+  BlockCipher* bc = NULL;
+  CipherModeBase* cipher = NULL;
+
+  switch (this->itsMode) {
+    case ECB_MODE:
+    case CBC_MODE:
+    case CBC_CTS_MODE:
+      bc = getDecryptionObject();
+    break;
+
+    case CFB_MODE:
+    case CTR_MODE:
+    case OFB_MODE:
+      bc = getEncryptionObject();
+    break;
+
+    default:
+      return false;
+  }
+
+  if (bc != NULL) {
+    switch (this->itsMode) {
+      case ECB_MODE:
+        cipher = new ECB_Mode_ExternalCipher::Decryption(*bc);
+      break;
+
+      case CBC_MODE:
+        cipher = new CBC_Mode_ExternalCipher::Decryption(*bc, (const byte*) this->itsIV.data());
+      break;
+
+      case CBC_CTS_MODE:
+        cipher = new CBC_CTS_Mode_ExternalCipher::Decryption(*bc, (const byte*) this->itsIV.data());
+      break;
+
+      case CFB_MODE:
+        cipher = new CFB_Mode_ExternalCipher::Decryption(*bc, (const byte*) this->itsIV.data());
+      break;
+
+      case CTR_MODE:
+        cipher = new CTR_Mode_ExternalCipher::Decryption(*bc, (const byte*) this->itsIV.data());
+      break;
+
+      case OFB_MODE:
+        cipher = new OFB_Mode_ExternalCipher::Decryption(*bc, (const byte*) this->itsIV.data());
+      break;
+
+      default:
+        return false;
+    }
+
+    this->itsPlaintext.erase();
+    StringSource(this->itsCiphertext, true, new StreamTransformationFilter(*cipher, new StringSink(this->itsPlaintext), (StreamTransformationFilter::BlockPaddingScheme) this->itsPadding));
+
+    delete bc;
+  }
+  else {
+    return false;
+  }
+
+  if (cipher != NULL) {
+    delete cipher;
+  }
+
+  return true;
 }
 
 template <typename INFO, enum CipherEnum TYPE, unsigned int DEFAULT_ROUNDS, unsigned int MIN_ROUNDS, unsigned int MAX_ROUNDS>
 bool JCipher_Template<INFO, TYPE, DEFAULT_ROUNDS, MIN_ROUNDS, MAX_ROUNDS>::encryptRubyIO(VALUE* in, VALUE* out)
 {
-	BlockCipher* bc = NULL;
-	CipherModeBase* cipher = NULL;
-
-	bc = getEncryptionObject();
-
-	if (bc != NULL) {
-		switch (this->itsMode) {
-			case ECB_MODE:
-				cipher = new ECB_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
-			break;
-
-			case CBC_MODE:
-				cipher = new CBC_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
-			break;
-
-			case CBC_CTS_MODE:
-				cipher = new CBC_CTS_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
-			break;
-
-			case CFB_MODE:
-				cipher = new CFB_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
-			break;
-
-			case CTR_MODE:
-				cipher = new CTR_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
-			break;
-
-			case OFB_MODE:
-				cipher = new OFB_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
-			break;
-
-			default:
-				return false;
-		}
-
-		try {
-			RubyIOSource(&in, true, new StreamTransformationFilter(*cipher, new RubyIOSink(&out), (StreamTransformationFilter::BlockPaddingScheme) this->itsPadding));
-		}
-		catch (RubyIOStore::OpenErr e) {
-			delete bc;
-			if (cipher != NULL)
-				delete cipher;
-			throw e;
-		}
-
-		delete bc;
-	}
-	else {
-		return false;
-	}
-
-	if (cipher != NULL) {
-		delete cipher;
-	}
-
-	return true;
+  BlockCipher* bc = NULL;
+  CipherModeBase* cipher = NULL;
+
+  bc = getEncryptionObject();
+
+  if (bc != NULL) {
+    switch (this->itsMode) {
+      case ECB_MODE:
+        cipher = new ECB_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
+      break;
+
+      case CBC_MODE:
+        cipher = new CBC_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
+      break;
+
+      case CBC_CTS_MODE:
+        cipher = new CBC_CTS_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
+      break;
+
+      case CFB_MODE:
+        cipher = new CFB_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
+      break;
+
+      case CTR_MODE:
+        cipher = new CTR_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
+      break;
+
+      case OFB_MODE:
+        cipher = new OFB_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
+      break;
+
+      default:
+        return false;
+    }
+
+    try {
+      RubyIOSource(&in, true, new StreamTransformationFilter(*cipher, new RubyIOSink(&out), (StreamTransformationFilter::BlockPaddingScheme) this->itsPadding));
+    }
+    catch (RubyIOStore::OpenErr e) {
+      delete bc;
+      if (cipher != NULL)
+        delete cipher;
+      throw e;
+    }
+
+    delete bc;
+  }
+  else {
+    return false;
+  }
+
+  if (cipher != NULL) {
+    delete cipher;
+  }
+
+  return true;
 }
 
 template <typename INFO, enum CipherEnum TYPE, unsigned int DEFAULT_ROUNDS, unsigned int MIN_ROUNDS, unsigned int MAX_ROUNDS>
 bool JCipher_Template<INFO, TYPE, DEFAULT_ROUNDS, MIN_ROUNDS, MAX_ROUNDS>::decryptRubyIO(VALUE* in, VALUE* out)
 {
-	BlockCipher* bc = NULL;
-	CipherModeBase* cipher = NULL;
-
-	switch (this->itsMode) {
-		case ECB_MODE:
-		case CBC_MODE:
-		case CBC_CTS_MODE:
-			bc = getDecryptionObject();
-		break;
-
-		case CFB_MODE:
-		case CTR_MODE:
-		case OFB_MODE:
-			bc = getEncryptionObject();
-		break;
-
-		default:
-			return false;
-	}
-
-	if (bc != NULL) {
-		switch (this->itsMode) {
-			case ECB_MODE:
-				cipher = new ECB_Mode_ExternalCipher::Decryption(*bc);
-			break;
-
-			case CBC_MODE:
-				cipher = new CBC_Mode_ExternalCipher::Decryption(*bc, (const byte*) this->itsIV.data());
-			break;
-
-			case CBC_CTS_MODE:
-				cipher = new CBC_CTS_Mode_ExternalCipher::Decryption(*bc, (const byte*) this->itsIV.data());
-			break;
-
-			case CFB_MODE:
-				cipher = new CFB_Mode_ExternalCipher::Decryption(*bc, (const byte*) this->itsIV.data());
-			break;
-
-			case CTR_MODE:
-				cipher = new CTR_Mode_ExternalCipher::Decryption(*bc, (const byte*) this->itsIV.data());
-			break;
-
-			case OFB_MODE:
-				cipher = new OFB_Mode_ExternalCipher::Decryption(*bc, (const byte*) this->itsIV.data());
-			break;
-
-			default:
-				return false;
-		}
-
-		try {
-			RubyIOSource(&in, true, new StreamTransformationFilter(*cipher, new RubyIOSink(&out), (StreamTransformationFilter::BlockPaddingScheme) this->itsPadding));
-		}
-		catch (RubyIOStore::OpenErr e) {
-			delete bc;
-			if (cipher != NULL)
-				delete cipher;
-			throw e;
-		}
-
-		delete bc;
-	}
-	else {
-		return false;
-	}
-
-	if (cipher != NULL) {
-		delete cipher;
-	}
-
-	return true;
+  BlockCipher* bc = NULL;
+  CipherModeBase* cipher = NULL;
+
+  switch (this->itsMode) {
+    case ECB_MODE:
+    case CBC_MODE:
+    case CBC_CTS_MODE:
+      bc = getDecryptionObject();
+    break;
+
+    case CFB_MODE:
+    case CTR_MODE:
+    case OFB_MODE:
+      bc = getEncryptionObject();
+    break;
+
+    default:
+      return false;
+  }
+
+  if (bc != NULL) {
+    switch (this->itsMode) {
+      case ECB_MODE:
+        cipher = new ECB_Mode_ExternalCipher::Decryption(*bc);
+      break;
+
+      case CBC_MODE:
+        cipher = new CBC_Mode_ExternalCipher::Decryption(*bc, (const byte*) this->itsIV.data());
+      break;
+
+      case CBC_CTS_MODE:
+        cipher = new CBC_CTS_Mode_ExternalCipher::Decryption(*bc, (const byte*) this->itsIV.data());
+      break;
+
+      case CFB_MODE:
+        cipher = new CFB_Mode_ExternalCipher::Decryption(*bc, (const byte*) this->itsIV.data());
+      break;
+
+      case CTR_MODE:
+        cipher = new CTR_Mode_ExternalCipher::Decryption(*bc, (const byte*) this->itsIV.data());
+      break;
+
+      case OFB_MODE:
+        cipher = new OFB_Mode_ExternalCipher::Decryption(*bc, (const byte*) this->itsIV.data());
+      break;
+
+      default:
+        return false;
+    }
+
+    try {
+      RubyIOSource(&in, true, new StreamTransformationFilter(*cipher, new RubyIOSink(&out), (StreamTransformationFilter::BlockPaddingScheme) this->itsPadding));
+    }
+    catch (RubyIOStore::OpenErr e) {
+      delete bc;
+      if (cipher != NULL)
+        delete cipher;
+      throw e;
+    }
+
+    delete bc;
+  }
+  else {
+    return false;
+  }
+
+  if (cipher != NULL) {
+    delete cipher;
+  }
+
+  return true;
 }
 
 /* These are deprecated. They were used before using RubyIO. Use them
@@ -328,141 +328,141 @@ bool JCipher_Template<INFO, TYPE, DEFAULT_ROUNDS, MIN_ROUNDS, MAX_ROUNDS>::decry
 /*template <typename INFO, enum CipherEnum TYPE, unsigned int DEFAULT_ROUNDS, unsigned int MIN_ROUNDS, unsigned int MAX_ROUNDS>
 bool JCipher_Template<INFO, TYPE, DEFAULT_ROUNDS, MIN_ROUNDS, MAX_ROUNDS>::encryptFile(const string in, const string out)
 {
-	BlockCipher* bc = NULL;
-	CipherModeBase* cipher = NULL;
-
-	bc = getEncryptionObject();
-
-	if (bc != NULL) {
-		switch (this->itsMode) {
-			case ECB_MODE:
-				cipher = new ECB_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
-			break;
-
-			case CBC_MODE:
-				cipher = new CBC_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
-			break;
-
-			case CBC_CTS_MODE:
-				cipher = new CBC_CTS_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
-			break;
-
-			case CFB_MODE:
-				cipher = new CFB_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
-			break;
-
-			case CTR_MODE:
-				cipher = new CTR_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
-			break;
-
-			case OFB_MODE:
-				cipher = new OFB_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
-			break;
-
-			default:
-				return false;
-		}
-
-		try {
-			FileSource(in.c_str(), true, new StreamTransformationFilter(*cipher, new FileSink(out.c_str()), (StreamTransformationFilter::BlockPaddingScheme) this->itsPadding));
-		}
-		catch (FileStore::OpenErr e) {
-			delete bc;
-			if (cipher != NULL) {
-				delete cipher;
-			}
-			throw e;
-		}
-
-		delete bc;
-	}
-	else {
-		return false;
-	}
-
-	if (cipher != NULL) {
-		delete cipher;
-	}
-
-	return true;
+  BlockCipher* bc = NULL;
+  CipherModeBase* cipher = NULL;
+
+  bc = getEncryptionObject();
+
+  if (bc != NULL) {
+    switch (this->itsMode) {
+      case ECB_MODE:
+        cipher = new ECB_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
+      break;
+
+      case CBC_MODE:
+        cipher = new CBC_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
+      break;
+
+      case CBC_CTS_MODE:
+        cipher = new CBC_CTS_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
+      break;
+
+      case CFB_MODE:
+        cipher = new CFB_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
+      break;
+
+      case CTR_MODE:
+        cipher = new CTR_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
+      break;
+
+      case OFB_MODE:
+        cipher = new OFB_Mode_ExternalCipher::Encryption(*bc, (const byte*) this->itsIV.data());
+      break;
+
+      default:
+        return false;
+    }
+
+    try {
+      FileSource(in.c_str(), true, new StreamTransformationFilter(*cipher, new FileSink(out.c_str()), (StreamTransformationFilter::BlockPaddingScheme) this->itsPadding));
+    }
+    catch (FileStore::OpenErr e) {
+      delete bc;
+      if (cipher != NULL) {
+        delete cipher;
+      }
+      throw e;
+    }
+
+    delete bc;
+  }
+  else {
+    return false;
+  }
+
+  if (cipher != NULL) {
+    delete cipher;
+  }
+
+  return true;
 }
 
 template <typename INFO, enum CipherEnum TYPE, unsigned int DEFAULT_ROUNDS, unsigned int MIN_ROUNDS, unsigned int MAX_ROUNDS>
 bool JCipher_Template<INFO, TYPE, DEFAULT_ROUNDS, MIN_ROUNDS, MAX_ROUNDS>::decryptFile(const string in, const string out)
 {
-	BlockCipher* bc = NULL;
-	CipherModeBase* cipher = NULL;
-
-	switch (this->itsMode) {
-		case ECB_MODE:
-		case CBC_MODE:
-		case CBC_CTS_MODE:
-			bc = getDecryptionObject();
-		break;
-
-		case CFB_MODE:
-		case CTR_MODE:
-		case OFB_MODE:
-			bc = getEncryptionObject();
-		break;
-
-		default:
-			return false;
-	}
-
-	if (bc != NULL) {
-		switch (this->itsMode) {
-			case ECB_MODE:
-				cipher = new ECB_Mode_ExternalCipher::Decryption(*bc);
-			break;
-
-			case CBC_MODE:
-				cipher = new CBC_Mode_ExternalCipher::Decryption(*bc, (const byte*) this->itsIV.data());
-			break;
-
-			case CBC_CTS_MODE:
-				cipher = new CBC_CTS_Mode_ExternalCipher::Decryption(*bc, (const byte*) this->itsIV.data());
-			break;
-
-			case CFB_MODE:
-				cipher = new CFB_Mode_ExternalCipher::Decryption(*bc, (const byte*) this->itsIV.data());
-			break;
-
-			case CTR_MODE:
-				cipher = new CTR_Mode_ExternalCipher::Decryption(*bc, (const byte*) this->itsIV.data());
-			break;
-
-			case OFB_MODE:
-				cipher = new OFB_Mode_ExternalCipher::Decryption(*bc, (const byte*) this->itsIV.data());
-			break;
-
-			default:
-				return false;
-		}
-
-		try {
-			FileSource(in.c_str(), true, new StreamTransformationFilter(*cipher, new FileSink(out.c_str()), (StreamTransformationFilter::BlockPaddingScheme) this->itsPadding));
-		}
-
-		catch (FileStore::OpenErr e) {
-			delete bc;
-			if (cipher != NULL) {
-				delete cipher;
-			}
-			throw e;
-		}
-
-		delete bc;
-	}
-	else {
-		return false;
-	}
-
-	if (cipher != NULL) {
-		delete cipher;
-	}
-
-	return true;
+  BlockCipher* bc = NULL;
+  CipherModeBase* cipher = NULL;
+
+  switch (this->itsMode) {
+    case ECB_MODE:
+    case CBC_MODE:
+    case CBC_CTS_MODE:
+      bc = getDecryptionObject();
+    break;
+
+    case CFB_MODE:
+    case CTR_MODE:
+    case OFB_MODE:
+      bc = getEncryptionObject();
+    break;
+
+    default:
+      return false;
+  }
+
+  if (bc != NULL) {
+    switch (this->itsMode) {
+      case ECB_MODE:
+        cipher = new ECB_Mode_ExternalCipher::Decryption(*bc);
+      break;
+
+      case CBC_MODE:
+        cipher = new CBC_Mode_ExternalCipher::Decryption(*bc, (const byte*) this->itsIV.data());
+      break;
+
+      case CBC_CTS_MODE:
+        cipher = new CBC_CTS_Mode_ExternalCipher::Decryption(*bc, (const byte*) this->itsIV.data());
+      break;
+
+      case CFB_MODE:
+        cipher = new CFB_Mode_ExternalCipher::Decryption(*bc, (const byte*) this->itsIV.data());
+      break;
+
+      case CTR_MODE:
+        cipher = new CTR_Mode_ExternalCipher::Decryption(*bc, (const byte*) this->itsIV.data());
+      break;
+
+      case OFB_MODE:
+        cipher = new OFB_Mode_ExternalCipher::Decryption(*bc, (const byte*) this->itsIV.data());
+      break;
+
+      default:
+        return false;
+    }
+
+    try {
+      FileSource(in.c_str(), true, new StreamTransformationFilter(*cipher, new FileSink(out.c_str()), (StreamTransformationFilter::BlockPaddingScheme) this->itsPadding));
+    }
+
+    catch (FileStore::OpenErr e) {
+      delete bc;
+      if (cipher != NULL) {
+        delete cipher;
+      }
+      throw e;
+    }
+
+    delete bc;
+  }
+  else {
+    return false;
+  }
+
+  if (cipher != NULL) {
+    delete cipher;
+  }
+
+  return true;
 }
 */