cryptopp 0.0.4 → 0.0.5

data/ext/jbase.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 __JBASE_H__
@@ -23,58 +23,52 @@ using namespace CryptoPP;
 
 class JBase
 {
-	public:
-		JBase();
-		virtual ~JBase() {};
-
-		string getPlaintext(const bool hex = false) const;
-		string getCiphertext(const bool hex = false) const;
-		string getKey(const bool hex = false) const;
-		unsigned int getKeylength() const;
-
-		void setPlaintext(const string plaintext, const bool hex = false);
-		void setCiphertext(const string ciphertext, const bool hex = false);
-		unsigned int setKey(const string key, bool hex = false);
-		unsigned int setKeylength(const unsigned int keylength);
-
-		string getRNGName() const;
-		static string getRNGName(const enum RNGEnum rng);
-		enum RNGEnum getRNG() const;
-		enum RNGEnum setRNG(const enum RNGEnum rng);
-
-		string getIV(bool hex = false) const;
-		void setIV(string iv, bool hex = false);
-		void setRandIV(const unsigned int size);
-
-		virtual unsigned int getDefaultKeylength() const = 0;
-		virtual unsigned int getMaxKeylength() const = 0;
-		virtual unsigned int getMinKeylength() const = 0;
-		virtual unsigned int getMultKeylength() const = 0;
-		virtual unsigned int getValidKeylength(const unsigned int keylength) const = 0;
-		virtual unsigned int getBlockSize() const = 0;
-		virtual enum CipherEnum getCipherType() const = 0;
-		virtual string getCipherName() const = 0;
-
-		virtual bool encrypt() = 0;
-		virtual bool decrypt() = 0;
-
-		virtual bool encryptRubyIO(VALUE* in, VALUE* out) = 0;
-		virtual bool decryptRubyIO(VALUE* in, VALUE* out) = 0;
-
-		/* These are deprecated. They were used before using php_streams. Use them
-		   if you're using this code in something other than the cryptopp PHP
-		   extension... */
-// 		virtual bool encryptFile(const string in, const string out) = 0;
-// 		virtual bool decryptFile(const string in, const string out) = 0;
-
-	protected:
-		string itsPlaintext;
-		string itsCiphertext;
-		string itsKey;
-		string itsIV;
-
-		unsigned int itsKeylength;
-		enum RNGEnum itsRNG;
+  public:
+    JBase();
+    virtual ~JBase() {};
+
+    string getPlaintext(const bool hex = false) const;
+    string getCiphertext(const bool hex = false) const;
+    string getKey(const bool hex = false) const;
+    unsigned int getKeylength() const;
+
+    void setPlaintext(const string plaintext, const bool hex = false);
+    void setCiphertext(const string ciphertext, const bool hex = false);
+    unsigned int setKey(const string key, bool hex = false);
+    unsigned int setKeylength(const unsigned int keylength);
+
+    string getRNGName() const;
+    static string getRNGName(const enum RNGEnum rng);
+    enum RNGEnum getRNG() const;
+    enum RNGEnum setRNG(const enum RNGEnum rng);
+
+    string getIV(bool hex = false) const;
+    void setIV(string iv, bool hex = false);
+    void setRandIV(const unsigned int size);
+
+    virtual unsigned int getDefaultKeylength() const = 0;
+    virtual unsigned int getMaxKeylength() const = 0;
+    virtual unsigned int getMinKeylength() const = 0;
+    virtual unsigned int getMultKeylength() const = 0;
+    virtual unsigned int getValidKeylength(const unsigned int keylength) const = 0;
+    virtual unsigned int getBlockSize() const = 0;
+    virtual enum CipherEnum getCipherType() const = 0;
+    virtual string getCipherName() const = 0;
+
+    virtual bool encrypt() = 0;
+    virtual bool decrypt() = 0;
+
+    virtual bool encryptRubyIO(VALUE* in, VALUE* out) = 0;
+    virtual bool decryptRubyIO(VALUE* in, VALUE* out) = 0;
+
+  protected:
+    string itsPlaintext;
+    string itsCiphertext;
+    string itsKey;
+    string itsIV;
+
+    unsigned int itsKeylength;
+    enum RNGEnum itsRNG;
 };
 
 #define getKeyHex() getKey(true)

data/ext/jbasiccipherinfo.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 __JBASICCIPHERINFO_H__
@@ -14,61 +14,61 @@
 template <typename INFO, typename BASE>
 class JBasicCipherInfo : public BASE
 {
-	public:
-		unsigned int getValidKeylength(const unsigned int length) const;
-		unsigned int getDefaultKeylength() const;
-		unsigned int getMaxKeylength() const;
-		unsigned int getMinKeylength() const;
-		unsigned int getMultKeylength() const;
-		string getCipherName() const;
-		static string getStaticCipherName();
+  public:
+    unsigned int getValidKeylength(const unsigned int length) const;
+    unsigned int getDefaultKeylength() const;
+    unsigned int getMaxKeylength() const;
+    unsigned int getMinKeylength() const;
+    unsigned int getMultKeylength() const;
+    string getCipherName() const;
+    static string getStaticCipherName();
 };
 
 template <typename INFO, typename BASE>
 unsigned int JBasicCipherInfo<INFO, BASE>::getValidKeylength(const unsigned int keylength) const
 {
-	return INFO::StaticGetValidKeyLength(keylength);
+  return INFO::StaticGetValidKeyLength(keylength);
 }
 
 template <typename INFO, typename BASE>
 unsigned int JBasicCipherInfo<INFO, BASE>::getDefaultKeylength() const
 {
-	return INFO::DEFAULT_KEYLENGTH;
+  return INFO::DEFAULT_KEYLENGTH;
 }
 
 template <typename INFO, typename BASE>
 unsigned int JBasicCipherInfo<INFO, BASE>::getMaxKeylength() const
 {
-	return INFO::MAX_KEYLENGTH;
+  return INFO::MAX_KEYLENGTH;
 }
 
 template <typename INFO, typename BASE>
 unsigned int JBasicCipherInfo<INFO, BASE>::getMinKeylength() const
 {
-	return INFO::MIN_KEYLENGTH;
+  return INFO::MIN_KEYLENGTH;
 }
 
 template <typename INFO, typename BASE>
 unsigned int JBasicCipherInfo<INFO, BASE>::getMultKeylength() const
 {
-	if (INFO::MIN_KEYLENGTH == INFO::MAX_KEYLENGTH) {
-		return 0;
-	}
-	else {
-		return INFO::StaticGetValidKeyLength(INFO::MIN_KEYLENGTH + 1) - INFO::MIN_KEYLENGTH;
-	}
+  if (INFO::MIN_KEYLENGTH == INFO::MAX_KEYLENGTH) {
+    return 0;
+  }
+  else {
+    return INFO::StaticGetValidKeyLength(INFO::MIN_KEYLENGTH + 1) - INFO::MIN_KEYLENGTH;
+  }
 }
 
 template <typename INFO, typename BASE>
 string JBasicCipherInfo<INFO, BASE>::getCipherName() const
 {
-	return INFO::StaticAlgorithmName();
+  return INFO::StaticAlgorithmName();
 }
 
 template <typename INFO, typename BASE>
 string JBasicCipherInfo<INFO, BASE>::getStaticCipherName()
 {
-	return INFO::StaticAlgorithmName();
+  return INFO::StaticAlgorithmName();
 }
 
 #endif

data/ext/jblowfish.cpp

@@ -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
  */
 
 #include "jblowfish.h"
@@ -11,12 +11,12 @@
 
 BlockCipher* JBlowfish::getEncryptionObject()
 {
-	return new BlowfishEncryption((byte*) itsKey.data(), itsKeylength);
+  return new BlowfishEncryption((byte*) itsKey.data(), itsKeylength);
 }
 
 BlockCipher* JBlowfish::getDecryptionObject()
 {
-	return new BlowfishDecryption((byte*) itsKey.data(), itsKeylength);
+  return new BlowfishDecryption((byte*) itsKey.data(), itsKeylength);
 }
 
 #endif

data/ext/jblowfish.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 __JBLOWFISH_H__
@@ -20,9 +20,9 @@
 
 class JBlowfish : public JCipher_Template<Blowfish_Info, BLOWFISH_CIPHER>
 {
-	protected:
-		BlockCipher* getEncryptionObject();
-		BlockCipher* getDecryptionObject();
+  protected:
+    BlockCipher* getEncryptionObject();
+    BlockCipher* getDecryptionObject();
 };
 
 #endif

data/ext/jcamellia.cpp

@@ -1,24 +1,22 @@
 
 /*
- * 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
  */
 
 #include "jcamellia.h"
 
-#ifdef WORD64_AVAILABLE
 #if ENABLED_CAMELLIA_CIPHER
 
 BlockCipher* JCamellia::getEncryptionObject()
 {
-	return new CamelliaEncryption((byte*) itsKey.data(), itsKeylength);
+  return new CamelliaEncryption((byte*) itsKey.data(), itsKeylength);
 }
 
 BlockCipher* JCamellia::getDecryptionObject()
 {
-	return new CamelliaDecryption((byte*) itsKey.data(), itsKeylength);
+  return new CamelliaDecryption((byte*) itsKey.data(), itsKeylength);
 }
 
 #endif
-#endif

data/ext/jcamellia.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 __JCAMELLIA_H__
@@ -10,7 +10,6 @@
 
 #include "jconfig.h"
 
-#ifdef WORD64_AVAILABLE
 #if ENABLED_CAMELLIA_CIPHER
 
 #include "jcipher_t.h"
@@ -23,11 +22,10 @@ using namespace CryptoPP;
 
 class JCamellia : public JCipher_Template<Camellia_Info, CAMELLIA_CIPHER>
 {
-	protected:
-		BlockCipher* getEncryptionObject();
-		BlockCipher* getDecryptionObject();
+  protected:
+    BlockCipher* getEncryptionObject();
+    BlockCipher* getDecryptionObject();
 };
 
 #endif
 #endif
-#endif

data/ext/jcast128.cpp

@@ -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
  */
 
 #include "jcast128.h"
@@ -11,12 +11,12 @@
 
 BlockCipher* JCAST128::getEncryptionObject()
 {
-	return new CAST128Encryption((byte*) itsKey.data(), itsKeylength);
+  return new CAST128Encryption((byte*) itsKey.data(), itsKeylength);
 }
 
 BlockCipher* JCAST128::getDecryptionObject()
 {
-	return new CAST128Decryption((byte*) itsKey.data(), itsKeylength);
+  return new CAST128Decryption((byte*) itsKey.data(), itsKeylength);
 }
 
 #endif

data/ext/jcast128.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 __JCAST128_H__
@@ -22,9 +22,9 @@ using namespace CryptoPP;
 
 class JCAST128 : public JCipher_Template<CAST128_Info, CAST128_CIPHER>
 {
-	protected:
-		BlockCipher* getEncryptionObject();
-		BlockCipher* getDecryptionObject();
+  protected:
+    BlockCipher* getEncryptionObject();
+    BlockCipher* getDecryptionObject();
 };
 
 #endif

data/ext/jcast256.cpp

@@ -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
  */
 
 #include "jcast256.h"
@@ -11,12 +11,12 @@
 
 BlockCipher* JCAST256::getEncryptionObject()
 {
-	return new CAST256Encryption((byte*) itsKey.data(), itsKeylength);
+  return new CAST256Encryption((byte*) itsKey.data(), itsKeylength);
 }
 
 BlockCipher* JCAST256::getDecryptionObject()
 {
-	return new CAST256Decryption((byte*) itsKey.data(), itsKeylength);
+  return new CAST256Decryption((byte*) itsKey.data(), itsKeylength);
 }
 
 #endif

data/ext/jcast256.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 __JCAST256_H__
@@ -22,9 +22,9 @@ using namespace CryptoPP;
 
 class JCAST256 : public JCipher_Template<CAST256_Info, CAST256_CIPHER>
 {
-	protected:
-		BlockCipher* getEncryptionObject();
-		BlockCipher* getDecryptionObject();
+  protected:
+    BlockCipher* getEncryptionObject();
+    BlockCipher* getDecryptionObject();
 };
 
 #endif

data/ext/jcipher.cpp

@@ -1,112 +1,112 @@
 
 /*
- * 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
  */
 
 #include "jcipher.h"
 
 JCipher::JCipher()
 {
-	itsMode = ECB_MODE;
-	itsPadding = ZEROS_PADDING;
+  itsMode = ECB_MODE;
+  itsPadding = ZEROS_PADDING;
 }
 
 string JCipher::getModeName() const
 {
-	return getModeName(itsMode);
+  return getModeName(itsMode);
 }
 
 string JCipher::getModeName(const enum ModeEnum mode)
 {
-	switch (mode) {
-		case ECB_MODE:
-			return "ECB";
-		case CBC_MODE:
-			return "CBC";
-		case CBC_CTS_MODE:
-			return "CBC with CTS";
-		case CFB_MODE:
-			return "CFB";
-		case CTR_MODE:
-			return "CTR";
-		case OFB_MODE:
-			return "OFB";
-	}
-
-	return "Unknown";
+  switch (mode) {
+    case ECB_MODE:
+      return "ECB";
+    case CBC_MODE:
+      return "CBC";
+    case CBC_CTS_MODE:
+      return "CBC with CTS";
+    case CFB_MODE:
+      return "CFB";
+    case CTR_MODE:
+      return "CTR";
+    case OFB_MODE:
+      return "OFB";
+  }
+
+  return "Unknown";
 }
 
 enum ModeEnum JCipher::getMode() const
 {
-	return itsMode;
+  return itsMode;
 }
 
 void JCipher::setMode(const enum ModeEnum mode)
 {
-	itsMode = mode;
-	itsPadding = DEFAULT_PADDING;
+  itsMode = mode;
+  itsPadding = DEFAULT_PADDING;
 }
 
 string JCipher::getPaddingName() const
 {
-	if (itsPadding == DEFAULT_PADDING) {
-		if (itsMode == ECB_MODE || itsMode == CBC_MODE)
-			return "Default cipher padding (PKCS)";
-		else
-			return "Default cipher padding (none)";
-	}
-	else {
-		return getPaddingName(itsPadding);
-	}
+  if (itsPadding == DEFAULT_PADDING) {
+    if (itsMode == ECB_MODE || itsMode == CBC_MODE)
+      return "Default cipher padding (PKCS)";
+    else
+      return "Default cipher padding (none)";
+  }
+  else {
+    return getPaddingName(itsPadding);
+  }
 }
 
 string JCipher::getPaddingName(const enum PaddingEnum padding)
 {
-	switch (padding) {
-		case NO_PADDING:
-			return "None";
-		case ZEROS_PADDING:
-			return "Zeroes";
-		case PKCS_PADDING:
-			return "PKCS";
-		case ONE_AND_ZEROS_PADDING:
-			return "One and zeroes";
-		case DEFAULT_PADDING:
-			return "Default cipher padding";
-	}
-
-	return "Unknown";
+  switch (padding) {
+    case NO_PADDING:
+      return "None";
+    case ZEROS_PADDING:
+      return "Zeroes";
+    case PKCS_PADDING:
+      return "PKCS";
+    case ONE_AND_ZEROS_PADDING:
+      return "One and zeroes";
+    case DEFAULT_PADDING:
+      return "Default cipher padding";
+  }
+
+  return "Unknown";
 }
 
 enum PaddingEnum JCipher::getPadding() const
 {
-	return itsPadding;
+  return itsPadding;
 }
 
 enum PaddingEnum JCipher::setPadding(const enum PaddingEnum padding)
 {
-	if (padding == NO_PADDING && (itsMode == ECB_MODE || itsMode == CBC_MODE)) {
-		return itsPadding;
-	}
-	else if ((padding == PKCS_PADDING || padding == ONE_AND_ZEROS_PADDING) && (itsMode == CBC_CTS_MODE || itsMode == CTR_MODE || itsMode == OFB_MODE || itsMode == CFB_MODE)) {
-		return itsPadding;
-	}
-	else {
-		itsPadding = padding;
-		return itsPadding;
-	}
+  if (padding == NO_PADDING && (itsMode == ECB_MODE || itsMode == CBC_MODE)) {
+    return itsPadding;
+  }
+  else if ((padding == PKCS_PADDING || padding == ONE_AND_ZEROS_PADDING) && (itsMode == CBC_CTS_MODE || itsMode == CTR_MODE || itsMode == OFB_MODE || itsMode == CFB_MODE)) {
+    return itsPadding;
+  }
+  else {
+    itsPadding = padding;
+    return itsPadding;
+  }
 }
 
 unsigned int JCipher::getRounds() const
 {
-	return itsRounds;
+  return itsRounds;
 }
 
 unsigned int JCipher::setRounds(const unsigned int rounds)
 {
-	itsRounds = getValidRounds(rounds);
+  itsRounds = getValidRounds(rounds);
 
-	return itsRounds;
+  return itsRounds;
 }