cryptopp 0.0.4 → 0.0.5

data/ext/jsafer.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 "jsafer.h"
@@ -10,23 +10,23 @@
 #if ENABLED_SAFER_K_CIPHER
 BlockCipher* JSAFER_K::getEncryptionObject()
 {
-	return new SAFER_K_Encryption((byte*) itsKey.data(), itsKeylength, itsRounds);
+  return new SAFER_K_Encryption((byte*) itsKey.data(), itsKeylength, itsRounds);
 }
 
 BlockCipher* JSAFER_K::getDecryptionObject()
 {
-	return new SAFER_K_Decryption((byte*) itsKey.data(), itsKeylength, itsRounds);
+  return new SAFER_K_Decryption((byte*) itsKey.data(), itsKeylength, itsRounds);
 }
 #endif
 
 #if ENABLED_SAFER_SK_CIPHER
 BlockCipher* JSAFER_SK::getEncryptionObject()
 {
-	return new SAFER_SK_Encryption((byte*) itsKey.data(), itsKeylength, itsRounds);
+  return new SAFER_SK_Encryption((byte*) itsKey.data(), itsKeylength, itsRounds);
 }
 
 BlockCipher* JSAFER_SK::getDecryptionObject()
 {
-	return new SAFER_SK_Decryption((byte*) itsKey.data(), itsKeylength, itsRounds);
+  return new SAFER_SK_Decryption((byte*) itsKey.data(), itsKeylength, itsRounds);
 }
 #endif

data/ext/jsafer.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 __JSAFER_H__
@@ -23,18 +23,18 @@ using namespace CryptoPP;
 #if ENABLED_SAFER_K_CIPHER
 class JSAFER_K : public JCipher_Template<SAFER_K_Info, SAFER_K_CIPHER, 6, 1, 13>
 {
-	protected:
-		BlockCipher* getEncryptionObject();
-		BlockCipher* getDecryptionObject();
+  protected:
+    BlockCipher* getEncryptionObject();
+    BlockCipher* getDecryptionObject();
 };
 #endif
 
 #if ENABLED_SAFER_SK_CIPHER
 class JSAFER_SK : public JCipher_Template<SAFER_SK_Info, SAFER_SK_CIPHER, 6, 1, 13>
 {
-	protected:
-		BlockCipher* getEncryptionObject();
-		BlockCipher* getDecryptionObject();
+  protected:
+    BlockCipher* getEncryptionObject();
+    BlockCipher* getDecryptionObject();
 };
 #endif
 

data/ext/jseal.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 "jseal.h"
@@ -10,23 +10,23 @@
 #if ENABLED_SEAL_LITTLE_ENDIAN_CIPHER
 SymmetricCipher* JSEAL_LE::getEncryptionObject()
 {
-	return new SEAL<LittleEndian>::Encryption((byte*) itsKey.data(), itsKeylength, (byte*) itsIV.data());
+  return new SEAL<LittleEndian>::Encryption((byte*) itsKey.data(), itsKeylength, (byte*) itsIV.data());
 }
 
 SymmetricCipher* JSEAL_LE::getDecryptionObject()
 {
-	return getEncryptionObject();
+  return getEncryptionObject();
 }
 #endif
 
 #if ENABLED_SEAL_BIG_ENDIAN_CIPHER
 SymmetricCipher* JSEAL_BE::getEncryptionObject()
 {
-	return new SEAL<BigEndian>::Encryption((byte*) itsKey.data(), itsKeylength, (byte*) itsIV.data());
+  return new SEAL<BigEndian>::Encryption((byte*) itsKey.data(), itsKeylength, (byte*) itsIV.data());
 }
 
 SymmetricCipher* JSEAL_BE::getDecryptionObject()
 {
-	return getEncryptionObject();
+  return getEncryptionObject();
 }
 #endif

data/ext/jseal.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 __JSEAL_H__
@@ -23,18 +23,18 @@ using namespace CryptoPP;
 #if ENABLED_SEAL_LITTLE_ENDIAN_CIPHER
 class JSEAL_LE : public JStream_Template<SEAL_Info<LittleEndian>, SEAL_LITTLE_ENDIAN_CIPHER>
 {
-	protected:
-		SymmetricCipher* getEncryptionObject();
-		SymmetricCipher* getDecryptionObject();
+  protected:
+    SymmetricCipher* getEncryptionObject();
+    SymmetricCipher* getDecryptionObject();
 };
 #endif
 
 #if ENABLED_SEAL_BIG_ENDIAN_CIPHER
 class JSEAL_BE : public JStream_Template<SEAL_Info<BigEndian>, SEAL_BIG_ENDIAN_CIPHER>
 {
-	protected:
-		SymmetricCipher* getEncryptionObject();
-		SymmetricCipher* getDecryptionObject();
+  protected:
+    SymmetricCipher* getEncryptionObject();
+    SymmetricCipher* getDecryptionObject();
 };
 #endif
 

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

data/ext/jserpent.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 __JSERPENT_H__
@@ -22,9 +22,9 @@ using namespace CryptoPP;
 
 class JSerpent : public JCipher_Template<Serpent_Info, SERPENT_CIPHER>
 {
-	protected:
-		BlockCipher* getEncryptionObject();
-		BlockCipher* getDecryptionObject();
+  protected:
+    BlockCipher* getEncryptionObject();
+    BlockCipher* getDecryptionObject();
 };
 
 #endif

data/ext/jsha.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 __JSHA_H__
@@ -10,14 +10,21 @@
 
 #include "jconfig.h"
 
-#if ENABLED_SHA1_HASH || ENABLED_SHA256_HASH || (defined(WORD64_AVAILABLE) && (ENABLED_SHA384_HASH || ENABLED_SHA512_HASH)) || \
-    ENABLED_SHA1_HMAC || ENABLED_SHA256_HMAC || (defined(WORD64_AVAILABLE) && (ENABLED_SHA384_HMAC || ENABLED_SHA512_HMAC))
+#define ANY_SHA_HASH_ENABLED \
+  ENABLED_SHA1_HASH || ENABLED_SHA_256_HASH || \
+  ENABLED_SHA_384_HASH || ENABLED_SHA_512_HASH
 
-#if ENABLED_SHA1_HASH || ENABLED_SHA256_HASH || (defined(WORD64_AVAILABLE) && (ENABLED_SHA384_HASH || ENABLED_SHA512_HASH))
+#define ANY_SHA_HMAC_ENABLED \
+  ENABLED_SHA1_HMAC || ENABLED_SHA_256_HMAC || \
+  ENABLED_SHA_384_HMAC || ENABLED_SHA_512_HMAC
+
+#if ANY_SHA_HASH_ENABLED || ANY_SHA_HMAC_ENABLED
+
+#if ANY_SHA_HASH_ENABLED
 #include "jhash_t.h"
 #endif
 
-#if ENABLED_SHA1_HMAC || ENABLED_SHA256_HMAC || (defined(WORD64_AVAILABLE) && (ENABLED_SHA384_HMAC || ENABLED_SHA512_HMAC))
+#if ANY_SHA_HMAC_ENABLED
 #include "jhmac_t.h"
 #endif
 
@@ -31,10 +38,10 @@ using namespace CryptoPP;
 #if ENABLED_SHA1_HASH
 class JSHA1 : public JHash_Template<SHA1, SHA1_HASH>
 {
-	public:
-		JSHA1(string plaintext = "") : JHash_Template<SHA1, SHA1_HASH>(plaintext) { }
+  public:
+    JSHA1(string plaintext = "") : JHash_Template<SHA1, SHA1_HASH>(plaintext) { }
 
-		static string getHashName() { return "SHA1"; }
+    static string getHashName() { return "SHA1"; }
 };
 
 typedef JSHA1 JSHA;
@@ -43,31 +50,30 @@ typedef JSHA1 JSHA;
 #if ENABLED_SHA256_HASH
 class JSHA256 : public JHash_Template<SHA256, SHA256_HASH>
 {
-	public:
-		JSHA256(string plaintext = "") : JHash_Template<SHA256, SHA256_HASH>(plaintext) { }
+  public:
+    JSHA256(string plaintext = "") : JHash_Template<SHA256, SHA256_HASH>(plaintext) { }
 
-		static string getHashName() { return "SHA-256"; }
+    static string getHashName() { return "SHA-256"; }
 };
 #endif
 
-#ifdef WORD64_AVAILABLE
 #if ENABLED_SHA384_HASH
 class JSHA384 : public JHash_Template<SHA384, SHA384_HASH>
 {
-	public:
-		JSHA384(string plaintext = "") : JHash_Template<SHA384, SHA384_HASH>(plaintext) { }
+  public:
+    JSHA384(string plaintext = "") : JHash_Template<SHA384, SHA384_HASH>(plaintext) { }
 
-		static string getHashName() { return "SHA-384"; }
+    static string getHashName() { return "SHA-384"; }
 };
 #endif
 
 #if ENABLED_SHA512_HASH
 class JSHA512 : public JHash_Template<SHA512, SHA512_HASH>
 {
-	public:
-		JSHA512(string plaintext = "") : JHash_Template<SHA512, SHA512_HASH>(plaintext) { }
+  public:
+    JSHA512(string plaintext = "") : JHash_Template<SHA512, SHA512_HASH>(plaintext) { }
 
-		static string getHashName() { return "SHA-512"; }
+    static string getHashName() { return "SHA-512"; }
 };
 #endif
 #endif
@@ -76,10 +82,10 @@ class JSHA512 : public JHash_Template<SHA512, SHA512_HASH>
 #if ENABLED_SHA1_HMAC
 class JSHA1_HMAC : public JHMAC_Template<SHA1, SHA1_HMAC>
 {
-	public:
-		JSHA1_HMAC(string plaintext = "") : JHMAC_Template<SHA1, SHA1_HMAC>(plaintext) { }
+  public:
+    JSHA1_HMAC(string plaintext = "") : JHMAC_Template<SHA1, SHA1_HMAC>(plaintext) { }
 
-		static string getHashName() { return "SHA1-HMAC"; }
+    static string getHashName() { return "SHA1-HMAC"; }
 };
 
 typedef JSHA1_HMAC JSHA_HMAC;
@@ -88,35 +94,30 @@ typedef JSHA1_HMAC JSHA_HMAC;
 #if ENABLED_SHA256_HMAC
 class JSHA256_HMAC : public JHMAC_Template<SHA256, SHA256_HMAC>
 {
-	public:
-		JSHA256_HMAC(string plaintext = "") : JHMAC_Template<SHA256, SHA256_HMAC>(plaintext) { }
+  public:
+    JSHA256_HMAC(string plaintext = "") : JHMAC_Template<SHA256, SHA256_HMAC>(plaintext) { }
 
-		static string getHashName() { return "SHA-256-HMAC"; }
+    static string getHashName() { return "SHA-256-HMAC"; }
 };
 #endif
 
-#ifdef WORD64_AVAILABLE
 #if ENABLED_SHA384_HMAC
 class JSHA384_HMAC : public JHMAC_Template<SHA384, SHA384_HMAC>
 {
-	public:
-		JSHA384_HMAC(string plaintext = "") : JHMAC_Template<SHA384, SHA384_HMAC>(plaintext) { }
+  public:
+    JSHA384_HMAC(string plaintext = "") : JHMAC_Template<SHA384, SHA384_HMAC>(plaintext) { }
 
-		static string getHashName() { return "SHA-384-HMAC"; }
+    static string getHashName() { return "SHA-384-HMAC"; }
 };
 #endif
 
 #if ENABLED_SHA512_HMAC
 class JSHA512_HMAC : public JHMAC_Template<SHA512, SHA512_HMAC>
 {
-	public:
-		JSHA512_HMAC(string plaintext = "") : JHMAC_Template<SHA512, SHA512_HMAC>(plaintext) { }
+  public:
+    JSHA512_HMAC(string plaintext = "") : JHMAC_Template<SHA512, SHA512_HMAC>(plaintext) { }
 
-		static string getHashName() { return "SHA-512-HMAC"; }
+    static string getHashName() { return "SHA-512-HMAC"; }
 };
 #endif
 #endif
-
-
-#endif
-#endif

data/ext/jsha3.h

@@ -0,0 +1,130 @@
+
+/*
+ * 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 __JSHA3_H__
+#define __JSHA3_H__
+
+#include "jconfig.h"
+
+#define ANY_SHA3_HASH_ENABLED \
+  ENABLED_SHA3_HASH || ENABLED_SHA3_224_HASH || \
+  ENABLED_SHA3_256_HASH || ENABLED_SHA3_384_HASH || \
+  ENABLED_SHA3_512_HASH
+
+#define ANY_SHA3_HMAC_ENABLED\
+  ENABLED_SHA3_HMAC || ENABLED_SHA3_224_HMAC || \
+  ENABLED_SHA3_256_HMAC || ENABLED_SHA3_384_HMAC || \
+  ENABLED_SHA3_512_HMAC
+
+#if ANY_SHA3_HASH_ENABLED || ANY_SHA3_HMAC_ENABLED
+
+#if ANY_SHA3_HASH_ENABLED
+#include "jhash_t.h"
+#endif
+
+#if ANY_SHA3_HMAC_ENABLED
+#include "jhmac_t.h"
+#endif
+
+
+// Crypto++ headers...
+
+#ifdef HAVE_CRYPTOPP_SHA3_BLOCKSIZE
+#include "sha3.h"
+#else
+#include "jsha3_blocksizes.h"
+#endif
+
+using namespace CryptoPP;
+
+#if ENABLED_SHA3_224_HASH
+class JSHA3_224 : public JHash_Template<SHA3_224, SHA3_224_HASH>
+{
+  public:
+    JSHA3_224(string plaintext = "") : JHash_Template<SHA3_224, SHA3_224_HASH>(plaintext) { }
+
+    static string getHashName() { return "SHA3-224"; }
+};
+
+typedef JSHA3_224 JSHA3;
+#endif
+
+#if ENABLED_SHA3_256_HASH
+class JSHA3_256 : public JHash_Template<SHA3_256, SHA3_256_HASH>
+{
+  public:
+    JSHA3_256(string plaintext = "") : JHash_Template<SHA3_256, SHA3_256_HASH>(plaintext) { }
+
+    static string getHashName() { return "SHA-256"; }
+};
+#endif
+
+#if ENABLED_SHA3_384_HASH
+class JSHA3_384 : public JHash_Template<SHA3_384, SHA3_384_HASH>
+{
+  public:
+    JSHA3_384(string plaintext = "") : JHash_Template<SHA3_384, SHA3_384_HASH>(plaintext) { }
+
+    static string getHashName() { return "SHA-384"; }
+};
+#endif
+
+#if ENABLED_SHA3_512_HASH
+class JSHA3_512 : public JHash_Template<SHA3_512, SHA3_512_HASH>
+{
+  public:
+    JSHA3_512(string plaintext = "") : JHash_Template<SHA3_512, SHA3_512_HASH>(plaintext) { }
+
+    static string getHashName() { return "SHA-512"; }
+};
+#endif
+
+
+#if ENABLED_SHA3_224_HMAC
+class JSHA3_224_HMAC : public JHMAC_Template<SHA3_224, SHA3_224_HMAC>
+{
+  public:
+    JSHA3_224_HMAC(string plaintext = "") : JHMAC_Template<SHA3_224, SHA3_224_HMAC>(plaintext) { }
+
+    static string getHashName() { return "SHA-224-HMAC"; }
+};
+
+typedef JSHA3_224_HMAC JSHA3_HMAC;
+#endif
+
+#if ENABLED_SHA3_256_HMAC
+class JSHA3_256_HMAC : public JHMAC_Template<SHA3_256, SHA3_256_HMAC>
+{
+  public:
+    JSHA3_256_HMAC(string plaintext = "") : JHMAC_Template<SHA3_256, SHA3_256_HMAC>(plaintext) { }
+
+    static string getHashName() { return "SHA-256-HMAC"; }
+};
+#endif
+
+#if ENABLED_SHA3_384_HMAC
+class JSHA3_384_HMAC : public JHMAC_Template<SHA3_384, SHA3_384_HMAC>
+{
+  public:
+    JSHA3_384_HMAC(string plaintext = "") : JHMAC_Template<SHA3_384, SHA3_384_HMAC>(plaintext) { }
+
+    static string getHashName() { return "SHA-384-HMAC"; }
+};
+#endif
+
+#if ENABLED_SHA3_512_HMAC
+class JSHA3_512_HMAC : public JHMAC_Template<SHA3_512, SHA3_512_HMAC>
+{
+  public:
+    JSHA3_512_HMAC(string plaintext = "") : JHMAC_Template<SHA3_512, SHA3_512_HMAC>(plaintext) { }
+
+    static string getHashName() { return "SHA-512-HMAC"; }
+};
+#endif
+
+#endif
+#endif