cryptopp 0.0.4 → 0.0.5

data/ext/jhash.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 __JHASH_H__
@@ -17,38 +17,33 @@ using namespace CryptoPP;
 
 class JHash
 {
-	public:
-		JHash(string plaintext = "", bool hex = false);
-		virtual ~JHash();
+  public:
+    JHash(string plaintext = "", bool hex = false);
+    virtual ~JHash();
 
-		string getPlaintext(bool hex = false) const;
-		string getHashtext(bool hex = true) const;
-		unsigned int getDigestSize() const;
-		virtual enum HashEnum getHashType() const = 0;
+    string getPlaintext(bool hex = false) const;
+    string getHashtext(bool hex = true) const;
+    unsigned int getDigestSize() const;
+    virtual enum HashEnum getHashType() const = 0;
 
-		void setPlaintext(string plaintext, bool hex = false);
-		void setHashtext(string hashtext, bool hex = true);
+    void setPlaintext(string plaintext, bool hex = false);
+    void setHashtext(string hashtext, bool hex = true);
 
-		void updatePlaintext(string plaintext, bool hex = false);
+    void updatePlaintext(string plaintext, bool hex = false);
 
-		void clear();
+    void clear();
 
-		virtual bool hash() = 0;
-		virtual bool validate() = 0;
-		virtual bool validate(string plaintext, string hashtext) = 0;
+    virtual bool hash() = 0;
+    virtual bool validate() = 0;
+    virtual bool validate(string plaintext, string hashtext) = 0;
 
-		virtual string hashRubyIO(VALUE* in, bool hex = true) = 0;
+    virtual string hashRubyIO(VALUE* in, bool hex = true) = 0;
 
-		/* 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... */
-		//virtual string hashFile(const string filename, bool hex = true) = 0;
+  protected:
+    HashTransformation* itsHashModule;
 
-	protected:
-		HashTransformation* itsHashModule;
-
-		string itsPlaintext;
-		string itsHashtext;
+    string itsPlaintext;
+    string itsHashtext;
 };
 
 #endif

data/ext/jhash_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 __JHASH_T_H__
@@ -17,18 +17,18 @@ using namespace CryptoPP;
 template <typename HASH, enum HashEnum TYPE>
 class JHash_Template : public JHash
 {
-	public:
-		JHash_Template(string plaintext = "");
-		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 RubyIO. Use it
-		   if you're using this code in something other than the CryptoPP Ruby
-		   extension... */
-		//string hashFile(const string filename, bool hex = true);
+  public:
+    JHash_Template(string plaintext = "");
+    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 RubyIO. Use it
+       if you're using this code in something other than the CryptoPP Ruby
+       extension... */
+    //string hashFile(const string filename, bool hex = true);
 };
 
 #define HASH_TYPE TYPE
@@ -36,60 +36,60 @@ class JHash_Template : public JHash
 template <typename HASH, enum HashEnum TYPE>
 JHash_Template<HASH, TYPE>::JHash_Template(string plaintext) : JHash(plaintext)
 {
-	itsHashModule = new HASH;
+  itsHashModule = new HASH;
 }
 
 template <typename HASH, enum HashEnum TYPE>
 HashEnum JHash_Template<HASH, TYPE>::getHashType() const
 {
-	return TYPE;
+  return TYPE;
 }
 
 template <typename HASH, enum HashEnum TYPE>
 bool JHash_Template<HASH, TYPE>::hash()
 {
-	itsHashtext.erase();
+  itsHashtext.erase();
 
-	StringSource s(itsPlaintext, true, new HashFilter(*itsHashModule, new StringSink(itsHashtext)));
-	return true;
+  StringSource s(itsPlaintext, true, new HashFilter(*itsHashModule, new StringSink(itsHashtext)));
+  return true;
 }
 
 template <typename HASH, enum HashEnum TYPE>
 bool JHash_Template<HASH, TYPE>::validate()
 {
-	return validate(itsPlaintext, itsHashtext);
+  return validate(itsPlaintext, itsHashtext);
 }
 
 template <typename HASH, enum HashEnum TYPE>
 bool JHash_Template<HASH, TYPE>::validate(string plaintext, string hashtext)
 {
-	if (itsHashModule == NULL) {
-		throw;
-	}
+  if (itsHashModule == NULL) {
+    throw;
+  }
 
-	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 JHash_Template<HASH, TYPE>::hashRubyIO(VALUE* in, bool hex)
 {
-	if (itsHashModule == NULL) {
-		throw;
-	}
-
-	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;
+  }
+
+  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;
 }
 
 
@@ -99,23 +99,23 @@ string JHash_Template<HASH, TYPE>::hashRubyIO(VALUE* in, bool hex)
 /*template <typename HASH, enum HashEnum TYPE>
 string JHash_Template<HASH, TYPE>::hashFile(const string filename, bool hex)
 {
-	if (itsHashModule == NULL) {
-		throw;
-	}
-
-	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;
+  if (itsHashModule == NULL) {
+    throw;
+  }
+
+  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/jhaval.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 __JHAVAL_H__
@@ -23,40 +23,40 @@ using namespace CryptoPP;
 #if ENABLED_HAVAL_HASH
 class JHAVAL : public JHash_Template<HAVAL, HAVAL_HASH>
 {
-	public:
-		JHAVAL(string plaintext = "") : JHash_Template<HAVAL, HAVAL_HASH>(plaintext) { }
+  public:
+    JHAVAL(string plaintext = "") : JHash_Template<HAVAL, HAVAL_HASH>(plaintext) { }
 
-		static string getHashName() { return "HAVAL"; }
+    static string getHashName() { return "HAVAL"; }
 };
 #endif
 
 #if ENABLED_HAVAL3_HASH
 class JHAVAL3 : public JHash_Template<HAVAL3, HAVAL3_HASH>
 {
-	public:
-		JHAVAL3(string plaintext = "") : JHash_Template<HAVAL3, HAVAL3_HASH>(plaintext) { }
+  public:
+    JHAVAL3(string plaintext = "") : JHash_Template<HAVAL3, HAVAL3_HASH>(plaintext) { }
 
-		static string getHashName() { return "HAVAL3"; }
+    static string getHashName() { return "HAVAL3"; }
 };
 #endif
 
 #if ENABLED_HAVAL4_HASH
 class JHAVAL4 : public JHash_Template<HAVAL4, HAVAL4_HASH>
 {
-	public:
-		JHAVAL4(string plaintext = "") : JHash_Template<HAVAL4, HAVAL4_HASH>(plaintext) { }
+  public:
+    JHAVAL4(string plaintext = "") : JHash_Template<HAVAL4, HAVAL4_HASH>(plaintext) { }
 
-		static string getHashName() { return "HAVAL4"; }
+    static string getHashName() { return "HAVAL4"; }
 };
 #endif
 
 #if ENABLED_HAVAL5_HASH
 class JHAVAL5 : public JHash_Template<HAVAL5, HAVAL5_HASH>
 {
-	public:
-		JHAVAL5(string plaintext = "") : JHash_Template<HAVAL5, HAVAL5_HASH>(plaintext) { }
+  public:
+    JHAVAL5(string plaintext = "") : JHash_Template<HAVAL5, HAVAL5_HASH>(plaintext) { }
 
-		static string getHashName() { return "HAVAL5"; }
+    static string getHashName() { return "HAVAL5"; }
 };
 #endif
 

data/ext/jhelpers.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 "jhelpers.h"
@@ -11,80 +11,80 @@ using namespace CryptoPP;
 
 string bin2hex(const string bin, const bool uppercase)
 {
-	string retval;
-	StringSource(bin, true, new HexEncoder(new StringSink(retval), uppercase));
-	return retval;
+  string retval;
+  StringSource(bin, true, new HexEncoder(new StringSink(retval), uppercase));
+  return retval;
 }
 
 string hex2bin(const string hex)
 {
-	string retval;
-	StringSource(hex, true, new HexDecoder(new StringSink(retval)));
-	return retval;
+  string retval;
+  StringSource(hex, true, new HexDecoder(new StringSink(retval)));
+  return retval;
 }
 
 char* bin2hex(const char* bin, size_t length, const bool uppercase)
 {
-	char* retval = new char[length * 2 + 1];
-	StringSource(bin, true, new HexEncoder(new ArraySink((byte*) retval, length * 2), uppercase));
-	return retval;
+  char* retval = new char[length * 2 + 1];
+  StringSource(bin, true, new HexEncoder(new ArraySink((byte*) retval, length * 2), uppercase));
+  return retval;
 }
 
 char* hex2bin(const char* hex, size_t length)
 {
-	char* retval = new char[length / 2 + 1];
-	StringSource(hex, true, new HexDecoder(new ArraySink((byte*) retval, length / 2)));
-	return retval;
+  char* retval = new char[length / 2 + 1];
+  StringSource(hex, true, new HexDecoder(new ArraySink((byte*) retval, length / 2)));
+  return retval;
 }
 
 string generateIV(const unsigned int size, const enum RNGEnum rng)
 {
-	string retval;
-	RandomNumberGenerator* randPool = NULL;
+  string retval;
+  RandomNumberGenerator* randPool = NULL;
 
-	#ifdef NONBLOCKING_RNG_AVAILABLE
-	if (rng == NON_BLOCKING_RNG) {
-		randPool = new NonblockingRng;
-	}
-	#endif
+  #ifdef NONBLOCKING_RNG_AVAILABLE
+  if (rng == NON_BLOCKING_RNG) {
+    randPool = new NonblockingRng;
+  }
+  #endif
 
-	#if defined(NONBLOCKING_RNG_AVAILABLE) && defined(BLOCKING_RNG_AVAILABLE)
-	else
-	#endif
+  #if defined(NONBLOCKING_RNG_AVAILABLE) && defined(BLOCKING_RNG_AVAILABLE)
+  else
+  #endif
 
-	#ifdef BLOCKING_RNG_AVAILABLE
-	if (rng == BLOCKING_RNG) {
-		randPool = new BlockingRng;
-	}
-	#endif
+  #ifdef BLOCKING_RNG_AVAILABLE
+  if (rng == BLOCKING_RNG) {
+    randPool = new BlockingRng;
+  }
+  #endif
 
-	if (rng == RAND_RNG) {
-		for (unsigned int i = 0; i < size; i++) {
-			retval += (char)(255.0 * rand() / RAND_MAX);
-		}
-	}
-	else if (randPool != NULL) {
-		for (unsigned int i = 0; i < size; i++) {
-			retval += (char) randPool->GenerateByte();
-		}
-		delete randPool;
-	}
+  if (rng == RAND_RNG) {
+    for (unsigned int i = 0; i < size; i++) {
+      retval += (char)(255.0 * rand() / RAND_MAX);
+    }
+  }
+  else if (randPool != NULL) {
+    for (unsigned int i = 0; i < size; i++) {
+      retval += (char) randPool->GenerateByte();
+    }
+    delete randPool;
+  }
 
-	return retval;
+  return retval;
 }
 
 unsigned int checkBounds(unsigned int length, unsigned int min, unsigned int max, unsigned short int multiple)
 {
-	if (min == max) {
-		return min;
-	}
-	else if (length < min) {
-		return min;
-	}
-	else if (length > max) {
-		return max;
-	}
-	else {
-		return (length + multiple - 1) - ((length + multiple - 1) % multiple);
-	}
+  if (min == max) {
+    return min;
+  }
+  else if (length < min) {
+    return min;
+  }
+  else if (length > max) {
+    return max;
+  }
+  else {
+    return (length + multiple - 1) - ((length + multiple - 1) % multiple);
+  }
 }

data/ext/jhelpers.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 __JHELPERS_H__