cryptopp 0.0.4 → 0.0.5

data/ext/jhmac.cpp

@@ -1,44 +1,44 @@
 
 /*
- * 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 "jhmac.h"
 
 unsigned int JHMAC::getKeylength() const
 {
-	return itsKeylength;
+  return itsKeylength;
 }
 
 string JHMAC::getKey(const bool hex) const
 {
-	if (hex) {
-		return bin2hex(itsKey);
-	}
-	else {
-		return itsKey;
-	}
+  if (hex) {
+    return bin2hex(itsKey);
+  }
+  else {
+    return itsKey;
+  }
 }
 
 unsigned int JHMAC::setKeylength(const unsigned int keylength)
 {
-	itsKeylength = checkBounds(keylength, 0, UINT_MAX);
+  itsKeylength = checkBounds(keylength, 0, UINT_MAX);
 
-	return itsKeylength;
+  return itsKeylength;
 }
 
 unsigned int JHMAC::setKey(const string key, const bool hex)
 {
-	if (hex) {
-		itsKey = hex2bin(key);
-	}
-	else {
-		itsKey = key;
-	}
+  if (hex) {
+    itsKey = hex2bin(key);
+  }
+  else {
+    itsKey = key;
+  }
 
-	itsKey.resize(setKeylength(itsKey.length()));
+  itsKey.resize(setKeylength(itsKey.length()));
 
-	return itsKeylength;
+  return itsKeylength;
 }

data/ext/jhmac.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 __JHMAC_H__
@@ -14,21 +14,21 @@ using namespace CryptoPP;
 
 class JHMAC : public JHash
 {
-	public:
-		JHMAC(string plaintext = "") : JHash(plaintext)
-		{
-			itsKeylength = 16;
-		}
+  public:
+    JHMAC(string plaintext = "") : JHash(plaintext)
+    {
+      itsKeylength = 16;
+    }
 
-		unsigned int getKeylength() const;
-		string getKey(const bool hex = false) const;
+    unsigned int getKeylength() const;
+    string getKey(const bool hex = false) const;
 
-		unsigned int setKeylength(const unsigned int keylength);
-		unsigned int setKey(const string key, const bool hex = false);
+    unsigned int setKeylength(const unsigned int keylength);
+    unsigned int setKey(const string key, const bool hex = false);
 
-	protected:
-		string itsKey;
-		unsigned int itsKeylength;
+  protected:
+    string itsKey;
+    unsigned int itsKeylength;
 };
 
 #endif

data/ext/jhmac_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 __JHMAC_T_H__
@@ -19,107 +19,75 @@ using namespace CryptoPP;
 template <typename HASH, enum HashEnum TYPE>
 class JHMAC_Template : public JHMAC
 {
-	public:
-		JHMAC_Template(string plaintext = "");
-		inline enum HashEnum getHashType() const;
-		bool hash();
-		bool validate();
-		bool validate(string plaintext, string hashtext);
-		string hashRubyIO(VALUE* in, bool hex = true);
-
-		/* This is deprecated. It was used before using php_streams. Use it
-		   if you're using this code in something other than the cryptopp PHP
-		   extension...*/
-		//string hashFile(const string filename, bool hex = true);
+  public:
+    JHMAC_Template(string plaintext = "");
+    inline enum HashEnum getHashType() const;
+    bool hash();
+    bool validate();
+    bool validate(string plaintext, string hashtext);
+    string hashRubyIO(VALUE* in, bool hex = true);
 };
 
 template <typename HASH, enum HashEnum TYPE>
 JHMAC_Template<HASH, TYPE>::JHMAC_Template(string plaintext) : JHMAC(plaintext)
 {
-	itsHashModule = new HMAC<HASH>;
+  itsHashModule = new HMAC<HASH>;
 }
 
 template <typename HASH, enum HashEnum TYPE>
 HashEnum JHMAC_Template<HASH, TYPE>::getHashType() const
 {
-	return TYPE;
+  return TYPE;
 }
 
 template <typename HASH, enum HashEnum TYPE>
 bool JHMAC_Template<HASH, TYPE>::hash()
 {
-	((HMAC<HASH>*) itsHashModule)->SetKey((byte*) itsKey.data(), itsKeylength);
-	itsHashtext.erase();
-	StringSource s(itsPlaintext, true, new HashFilter(*itsHashModule, new StringSink(itsHashtext)));
-	return true;
+  ((HMAC<HASH>*) itsHashModule)->SetKey((byte*) itsKey.data(), itsKeylength);
+  itsHashtext.erase();
+  StringSource s(itsPlaintext, true, new HashFilter(*itsHashModule, new StringSink(itsHashtext)));
+  return true;
 }
 
 template <typename HASH, enum HashEnum TYPE>
 bool JHMAC_Template<HASH, TYPE>::validate()
 {
-	return validate(itsPlaintext, itsHashtext);
+  return validate(itsPlaintext, itsHashtext);
 }
 
 template <typename HASH, enum HashEnum TYPE>
 bool JHMAC_Template<HASH, TYPE>::validate(string plaintext, string hashtext)
 {
-	if (itsHashModule == NULL) {
-		throw;
-	}
+  if (itsHashModule == NULL) {
+    throw;
+  }
 
-	((HMAC<HASH>*) itsHashModule)->SetKey((byte*) itsKey.data(), itsKeylength);
+  ((HMAC<HASH>*) itsHashModule)->SetKey((byte*) itsKey.data(), itsKeylength);
 
-	return itsHashModule->VerifyDigest((const byte*) hashtext.data(), (const byte*) plaintext.data(), plaintext.length());
+  return itsHashModule->VerifyDigest((const byte*) hashtext.data(), (const byte*) plaintext.data(), plaintext.length());
 }
 
 template <typename HASH, enum HashEnum TYPE>
 string JHMAC_Template<HASH, TYPE>::hashRubyIO(VALUE* in, bool hex)
 {
-	if (itsHashModule == NULL) {
-		throw;
-	}
-
-	((HMAC<HASH>*) itsHashModule)->SetKey((byte*) itsKey.data(), itsKeylength);
-	string retval;
-	try {
-		if (hex) {
-			RubyIOSource f(&in, true, new HashFilter(*itsHashModule, new HexEncoder(new StringSink(retval), false)));
-		}
-		else {
-			RubyIOSource f(&in, true, new HashFilter(*itsHashModule, new StringSink(retval)));
-		}
-	}
-	catch (Exception e) {
-		throw e;
-	}
-	return retval;
+  if (itsHashModule == NULL) {
+    throw;
+  }
+
+  ((HMAC<HASH>*) itsHashModule)->SetKey((byte*) itsKey.data(), itsKeylength);
+  string retval;
+  try {
+    if (hex) {
+      RubyIOSource f(&in, true, new HashFilter(*itsHashModule, new HexEncoder(new StringSink(retval), false)));
+    }
+    else {
+      RubyIOSource f(&in, true, new HashFilter(*itsHashModule, new StringSink(retval)));
+    }
+  }
+  catch (Exception e) {
+    throw e;
+  }
+  return retval;
 }
 
-
-/* This is deprecated. It was used before using php_streams. Use it
-   if you're using this code in something other than the cryptopp PHP
-   extension... */
-/*template <typename HASH, enum HashEnum TYPE>
-string JHMAC_Template<HASH, TYPE>::hashFile(const string filename, bool hex)
-{
-	if (itsHashModule == NULL) {
-		throw;
-	}
-
-	((HMAC<HASH>*) itsHashModule)->SetKey((byte*) itsKey.data(), itsKeylength);
-	string retval;
-	try {
-		if (hex) {
-			FileSource f(filename.c_str(), true, new HashFilter(*itsHashModule, new HexEncoder(new StringSink(retval), false)));
-		}
-		else {
-			FileSource f(filename.c_str(), true, new HashFilter(*itsHashModule, new StringSink(retval)));
-		}
-	}
-	catch (FileStore::OpenErr e) {
-		throw e;
-	}
-	return retval;
-}*/
-
 #endif

data/ext/jidea.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 "jidea.h"
@@ -11,12 +11,12 @@
 
 BlockCipher* JIDEA::getEncryptionObject()
 {
-	return new IDEAEncryption((byte*) itsKey.data(), itsKeylength);
+  return new IDEAEncryption((byte*) itsKey.data(), itsKeylength);
 }
 
 BlockCipher* JIDEA::getDecryptionObject()
 {
-	return new IDEADecryption((byte*) itsKey.data(), itsKeylength);
+  return new IDEADecryption((byte*) itsKey.data(), itsKeylength);
 }
 
 #endif

data/ext/jidea.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 __JIDEA_H__
@@ -22,9 +22,9 @@ using namespace CryptoPP;
 
 class JIDEA : public JCipher_Template<IDEA_Info, IDEA_CIPHER>
 {
-	protected:
-		BlockCipher* getEncryptionObject();
-		BlockCipher* getDecryptionObject();
+  protected:
+    BlockCipher* getEncryptionObject();
+    BlockCipher* getDecryptionObject();
 };
 
 #endif

data/ext/jmarc4.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 "jmarc4.h"
@@ -11,12 +11,12 @@
 
 SymmetricCipher* JMARC4::getEncryptionObject()
 {
-	return new Weak::MARC4((byte*) itsKey.data(), itsKeylength);
+  return new Weak::MARC4((byte*) itsKey.data(), itsKeylength);
 }
 
 SymmetricCipher* JMARC4::getDecryptionObject()
 {
-	return getEncryptionObject();
+  return getEncryptionObject();
 }
 
 #endif

data/ext/jmarc4.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 __JMARC4_H__
@@ -26,9 +26,9 @@ using namespace CryptoPP;
 
 class JMARC4 : public JStream_Template<Weak::MARC4_Base, MARC4_CIPHER>
 {
-	protected:
-		SymmetricCipher* getEncryptionObject();
-		SymmetricCipher* getDecryptionObject();
+  protected:
+    SymmetricCipher* getEncryptionObject();
+    SymmetricCipher* getDecryptionObject();
 };
 
 #undef CRYPTOPP_ENABLE_NAMESPACE_WEAK

data/ext/jmars.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 "jmars.h"
@@ -11,12 +11,12 @@
 
 BlockCipher* JMARS::getEncryptionObject()
 {
-	return new MARSEncryption((byte*) itsKey.data(), itsKeylength);
+  return new MARSEncryption((byte*) itsKey.data(), itsKeylength);
 }
 
 BlockCipher* JMARS::getDecryptionObject()
 {
-	return new MARSDecryption((byte*) itsKey.data(), itsKeylength);
+  return new MARSDecryption((byte*) itsKey.data(), itsKeylength);
 }
 
 #endif

data/ext/jmars.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 __JMARS_H__
@@ -22,9 +22,9 @@ using namespace CryptoPP;
 
 class JMARS : public JCipher_Template<MARS_Info, MARS_CIPHER>
 {
-	protected:
-		BlockCipher* getEncryptionObject();
-		BlockCipher* getDecryptionObject();
+  protected:
+    BlockCipher* getEncryptionObject();
+    BlockCipher* getDecryptionObject();
 };
 
 #endif

data/ext/jmd2.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 __JMD2_H__
@@ -33,20 +33,20 @@ using namespace CryptoPP;
 #if ENABLED_MD2_HASH
 class JMD2 : public JHash_Template<Weak::MD2, MD2_HASH>
 {
-	public:
-		JMD2(string plaintext = "") : JHash_Template<Weak::MD2, MD2_HASH>(plaintext) { }
+  public:
+    JMD2(string plaintext = "") : JHash_Template<Weak::MD2, MD2_HASH>(plaintext) { }
 
-		static string getHashName() { return "MD2"; }
+    static string getHashName() { return "MD2"; }
 };
 #endif
 
 #if ENABLED_MD5_HMAC
 class JMD2_HMAC : public JHMAC_Template<Weak::MD2, MD2_HMAC>
 {
-	public:
-		JMD2_HMAC(string plaintext = "") : JHMAC_Template<Weak::MD2, MD2_HMAC>(plaintext) { }
+  public:
+    JMD2_HMAC(string plaintext = "") : JHMAC_Template<Weak::MD2, MD2_HMAC>(plaintext) { }
 
-		static string getHashName() { return "MD2-HMAC"; }
+    static string getHashName() { return "MD2-HMAC"; }
 };
 #endif