cryptopp 0.0.4 → 0.0.5

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

data/ext/jskipjack.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 __JSKIPJACK_H__
@@ -22,9 +22,9 @@ using namespace CryptoPP;
 
 class JSKIPJACK : public JCipher_Template<SKIPJACK_Info, SKIPJACK_CIPHER>
 {
-	protected:
-		BlockCipher* getEncryptionObject();
-		BlockCipher* getDecryptionObject();
+  protected:
+    BlockCipher* getEncryptionObject();
+    BlockCipher* getDecryptionObject();
 };
 
 #endif

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

data/ext/jsquare.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 __JSQUARE_H__
@@ -22,9 +22,9 @@ using namespace CryptoPP;
 
 class JSquare : public JCipher_Template<Square_Info, SQUARE_CIPHER>
 {
-	protected:
-		BlockCipher* getEncryptionObject();
-		BlockCipher* getDecryptionObject();
+  protected:
+    BlockCipher* getEncryptionObject();
+    BlockCipher* getDecryptionObject();
 };
 
 #endif

data/ext/jstream.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 "jstream.h"

data/ext/jstream.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 __JSTREAM_H__

data/ext/jstream_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 __JSTREAM_T_H__
@@ -13,163 +13,111 @@
 template <typename INFO, enum CipherEnum TYPE>
 class JStream_Template : public JBasicCipherInfo<INFO, JStream>
 {
-	public:
-		JStream_Template();
+  public:
+    JStream_Template();
 
-		inline enum CipherEnum getCipherType() const;
-		inline unsigned int getBlockSize() const { return 0; }
+    inline enum CipherEnum getCipherType() const;
+    inline unsigned int getBlockSize() const { return 0; }
 
-		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 php_streams. Use them
-		   if you're using this code in something other than the cryptopp PHP
-		   extension...*/
-// 		bool encryptFile(const string in, const string out);
-// 		bool decryptFile(const string in, const string out);
-
-	protected:
-		virtual SymmetricCipher* getEncryptionObject() = 0;
-		virtual SymmetricCipher* getDecryptionObject() = 0;
+  protected:
+    virtual SymmetricCipher* getEncryptionObject() = 0;
+    virtual SymmetricCipher* getDecryptionObject() = 0;
 };
 
 template <typename INFO, enum CipherEnum TYPE>
 JStream_Template<INFO, TYPE>::JStream_Template()
 {
-	this->itsKeylength = INFO::DEFAULT_KEYLENGTH;
+  this->itsKeylength = INFO::DEFAULT_KEYLENGTH;
 }
 
 template <typename INFO, enum CipherEnum TYPE>
 CipherEnum JStream_Template<INFO, TYPE>::getCipherType() const
 {
-	return TYPE;
+  return TYPE;
 }
 
 template <typename INFO, enum CipherEnum TYPE>
 bool JStream_Template<INFO, TYPE>::encrypt()
 {
-	StreamTransformation* cipher = NULL;
-
-	cipher = getEncryptionObject();
-
-	if (cipher != NULL) {
-		this->itsCiphertext.erase();
-		StringSource(this->itsPlaintext, true, new StreamTransformationFilter(*cipher, new StringSink(this->itsCiphertext)));
-		delete cipher;
-		return true;
-	}
-	else {
-		return false;
-	}
+  StreamTransformation* cipher = NULL;
+
+  cipher = getEncryptionObject();
+
+  if (cipher != NULL) {
+    this->itsCiphertext.erase();
+    StringSource(this->itsPlaintext, true, new StreamTransformationFilter(*cipher, new StringSink(this->itsCiphertext)));
+    delete cipher;
+    return true;
+  }
+  else {
+    return false;
+  }
 }
 
 template <typename INFO, enum CipherEnum TYPE>
 bool JStream_Template<INFO, TYPE>::decrypt()
 {
-	StreamTransformation* cipher = NULL;
-
-	cipher = getDecryptionObject();
-
-	if (cipher != NULL) {
-		this->itsPlaintext.erase();
-		StringSource(this->itsCiphertext, true, new StreamTransformationFilter(*cipher, new StringSink(this->itsPlaintext)));
-		delete cipher;
-		return true;
-	}
-	else {
-		return false;
-	}
+  StreamTransformation* cipher = NULL;
+
+  cipher = getDecryptionObject();
+
+  if (cipher != NULL) {
+    this->itsPlaintext.erase();
+    StringSource(this->itsCiphertext, true, new StreamTransformationFilter(*cipher, new StringSink(this->itsPlaintext)));
+    delete cipher;
+    return true;
+  }
+  else {
+    return false;
+  }
 }
 
 template <typename INFO, enum CipherEnum TYPE>
 bool JStream_Template<INFO, TYPE>::encryptRubyIO(VALUE* in, VALUE* out)
 {
-	StreamTransformation* cipher = NULL;
-
-	cipher = getEncryptionObject();
-
-	if (cipher != NULL) {
-		try {
-			RubyIOSource(&in, true, new StreamTransformationFilter(*cipher, new RubyIOSink(&out)));
-		}
-		catch (RubyIOStore::OpenErr e) {
-			delete cipher;
-			throw e;
-		}
-		delete cipher;
-	}
-
-	return true;
+  StreamTransformation* cipher = NULL;
+
+  cipher = getEncryptionObject();
+
+  if (cipher != NULL) {
+    try {
+      RubyIOSource(&in, true, new StreamTransformationFilter(*cipher, new RubyIOSink(&out)));
+    }
+    catch (RubyIOStore::OpenErr e) {
+      delete cipher;
+      throw e;
+    }
+    delete cipher;
+  }
+
+  return true;
 }
 
 template <typename INFO, enum CipherEnum TYPE>
 bool JStream_Template<INFO, TYPE>::decryptRubyIO(VALUE* in, VALUE* out)
 {
-	StreamTransformation* cipher = NULL;
-
-	cipher = getDecryptionObject();
-
-	if (cipher != NULL) {
-		try {
-			RubyIOSource(&in, true, new StreamTransformationFilter(*cipher, new RubyIOSink(&out)));
-		}
-		catch (RubyIOStore::OpenErr e) {
-			delete cipher;
-			throw e;
-		}
-		delete cipher;
-	}
-
-	return true;
-}
-
-/* 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... */
-/*template <typename INFO, enum CipherEnum TYPE>
-bool JStream_Template<INFO, TYPE>::encryptFile(const string in, const string out)
-{
-	StreamTransformation* cipher = NULL;
-
-	cipher = getEncryptionObject();
-
-	if (cipher != NULL) {
-		try {
-			FileSource(in.c_str(), true, new StreamTransformationFilter(*cipher, new FileSink(out.c_str())));
-		}
-		catch (FileStore::OpenErr e) {
-			delete cipher;
-			throw e;
-		}
-		delete cipher;
-	}
-
-	return true;
-}
-
-template <typename INFO, enum CipherEnum TYPE>
-bool JStream_Template<INFO, TYPE>::decryptFile(const string in, const string out)
-{
-	StreamTransformation* cipher = NULL;
-
-	cipher = getDecryptionObject();
-
-	if (cipher != NULL) {
-		try {
-			FileSource(in.c_str(), true, new StreamTransformationFilter(*cipher, new FileSink(out.c_str())));
-		}
-		catch (FileStore::OpenErr e) {
-			delete cipher;
-			throw e;
-		}
-		delete cipher;
-	}
-
-	return true;
+  StreamTransformation* cipher = NULL;
+
+  cipher = getDecryptionObject();
+
+  if (cipher != NULL) {
+    try {
+      RubyIOSource(&in, true, new StreamTransformationFilter(*cipher, new RubyIOSink(&out)));
+    }
+    catch (RubyIOStore::OpenErr e) {
+      delete cipher;
+      throw e;
+    }
+    delete cipher;
+  }
+
+  return true;
 }
-*/
 
 #endif

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

data/ext/jtea.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 __JTEA_H__
@@ -22,9 +22,9 @@ using namespace CryptoPP;
 
 class JTEA : public JCipher_Template<TEA_Info, TEA_CIPHER>
 {
-	protected:
-		BlockCipher* getEncryptionObject();
-		BlockCipher* getDecryptionObject();
+  protected:
+    BlockCipher* getEncryptionObject();
+    BlockCipher* getDecryptionObject();
 };
 
 #endif

data/ext/jtiger.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 __JTIGER_H__
@@ -10,7 +10,6 @@
 
 #include "jconfig.h"
 
-#ifdef WORD64_AVAILABLE
 #if ENABLED_TIGER_HASH || ENABLED_TIGER_HMAC
 
 #if ENABLED_TIGER_HASH
@@ -30,23 +29,22 @@ using namespace CryptoPP;
 #if ENABLED_TIGER_HASH
 class JTiger : public JHash_Template<Tiger, TIGER_HASH>
 {
-	public:
-		JTiger(string plaintext = "") : JHash_Template<Tiger, TIGER_HASH>(plaintext) { }
+  public:
+    JTiger(string plaintext = "") : JHash_Template<Tiger, TIGER_HASH>(plaintext) { }
 
-		static string getHashName() { return "Tiger"; }
+    static string getHashName() { return "Tiger"; }
 };
 #endif
 
 #if ENABLED_TIGER_HMAC
 class JTiger_HMAC : public JHMAC_Template<Tiger, TIGER_HMAC>
 {
-	public:
-		JTiger_HMAC(string plaintext = "") : JHMAC_Template<Tiger, TIGER_HMAC>(plaintext) { }
+  public:
+    JTiger_HMAC(string plaintext = "") : JHMAC_Template<Tiger, TIGER_HMAC>(plaintext) { }
 
-		static string getHashName() { return "Tiger HMAC"; }
+    static string getHashName() { return "Tiger HMAC"; }
 };
 #endif
 
 #endif
 #endif
-#endif