cryptopp 0.0.4 → 0.0.5

data/ext/jconfig.h

@@ -1,23 +1,14 @@
 
 /*
- * 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 __JCONFIG_H__
 #define __JCONFIG_H__
 
-// to enable or disable specific cipher algorithms,
-// set these to either 1 or 0 -- 1 for enabled, 0 for
-// disabled, obviously.
-//
-// if we have config.h, rely on that, otherwise, below
-// are the defaults...
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#else
+#include "cryptlib.h"
 
 #define ENABLED_THREEWAY_CIPHER                       1
 #define ENABLED_AES_CIPHER                            1
@@ -71,6 +62,19 @@
 #define ENABLED_SHA256_HASH                           1
 #define ENABLED_SHA384_HASH                           1
 #define ENABLED_SHA512_HASH                           1
+#if CRYPTOPP_VERSION >= 562
+#define ENABLED_SHA3_HASH                             1
+#define ENABLED_SHA3_224_HASH                         1
+#define ENABLED_SHA3_256_HASH                         1
+#define ENABLED_SHA3_384_HASH                         1
+#define ENABLED_SHA3_512_HASH                         1
+#else
+#define ENABLED_SHA3_HASH                             0
+#define ENABLED_SHA3_224_HASH                         0
+#define ENABLED_SHA3_256_HASH                         0
+#define ENABLED_SHA3_384_HASH                         0
+#define ENABLED_SHA3_512_HASH                         0
+#endif
 #define ENABLED_TIGER_HASH                            1
 #define ENABLED_WHIRLPOOL_HASH                        1
 
@@ -85,6 +89,18 @@
 #define ENABLED_SHA256_HMAC                           1
 #define ENABLED_SHA384_HMAC                           1
 #define ENABLED_SHA512_HMAC                           1
+#if CRYPTOPP_VERSION >= 562
+#define ENABLED_SHA3_224_HMAC                         1
+#define ENABLED_SHA3_256_HMAC                         1
+#define ENABLED_SHA3_384_HMAC                         1
+#define ENABLED_SHA3_512_HMAC                         1
+#else
+#warning CRYPTOPP_VERSION
+#define ENABLED_SHA3_224_HMAC                         0
+#define ENABLED_SHA3_256_HMAC                         0
+#define ENABLED_SHA3_384_HMAC                         0
+#define ENABLED_SHA3_512_HMAC                         0
+#endif
 #define ENABLED_TIGER_HMAC                            1
 #define ENABLED_WHIRLPOOL_HMAC                        1
 
@@ -92,36 +108,3 @@
 #define ENABLED_CRC32_CHECKSUM                        1
 
 #endif
-
-// just to make sure SHARK and such are disabled if we don't
-// have WORD64 or some version thereof...
-
-// test if word64 is available for SHARK, SHA-384, SHA-512 and Tiger.
-
-#if defined(__GNUC__) || defined(__MWERKS__) || defined(_MSC_VER) || defined(__BCPLUSPLUS__)
-#define WORD64_AVAILABLE
-#else
-#undef ENABLED_CAMELLIA_CIPHER
-#undef ENABLED_SHARK_CIPHER
-#undef ENABLED_SHA384_HASH
-#undef ENABLED_SHA512_HASH
-#undef ENABLED_SHA384_HMAC
-#undef ENABLED_SHA512_HMAC
-#undef ENABLED_TIGER_HASH
-#undef ENABLED_TIGER_HMAC
-#undef ENABLED_WHIRLPOOL_HASH
-#undef ENABLED_WHIRLPOOL_HMAC
-
-#define ENABLED_CAMELLIA_CIPHER  0
-#define ENABLED_SHARK_CIPHER     0
-#define ENABLED_SHA384_HASH      0
-#define ENABLED_SHA512_HASH      0
-#define ENABLED_SHA384_HMAC      0
-#define ENABLED_SHA512_HMAC      0
-#define ENABLED_TIGER_HASH       0
-#define ENABLED_TIGER_HMAC       0
-#define ENABLED_WHIRLPOOL_HASH   0
-#define ENABLED_WHIRLPOOL_HMAC   0
-#endif
-
-#endif

data/ext/jconstants.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 __JCONSTANTS_H__
@@ -10,59 +10,52 @@
 
 using namespace CryptoPP;
 
-// test if word64 is available for SHARK, SHA-384, SHA-512 and Tiger.
-
-#if defined(__GNUC__) || defined(__MWERKS__) || defined(_MSC_VER) || defined(__BCPLUSPLUS__)
-#define WORD64_AVAILABLE
-#endif
-
-
 // Cipher types used in JCipher and JStream...
 
 enum CipherEnum {
-	UNKNOWN_CIPHER = -1,
-
-	// Stream ciphers...
-
-	ARC4_CIPHER,
-	PANAMA_LITTLE_ENDIAN_CIPHER,
-	PANAMA_BIG_ENDIAN_CIPHER,
-	MARC4_CIPHER,
-	SEAL_LITTLE_ENDIAN_CIPHER,
-	SEAL_BIG_ENDIAN_CIPHER,
-
-	// Block Ciphers...
-
-	THREEWAY_CIPHER,
-	AES_CIPHER,
-	BLOWFISH_CIPHER,
-	CAST128_CIPHER,
-	CAST256_CIPHER,
-	DES_CIPHER,
-	DES_EDE2_CIPHER,
-	DES_EDE3_CIPHER,
-	DES_XEX3_CIPHER,
-	DIAMOND2_CIPHER,
-	DIAMOND2_LITE_CIPHER,
-	GOST_CIPHER,
-	IDEA_CIPHER,
-	MARS_CIPHER,
-	RC2_CIPHER,
-	RC5_CIPHER,
-	RC6_CIPHER,
-	SAFER_K_CIPHER,
-	SAFER_SK_CIPHER,
-	SERPENT_CIPHER,
-	SKIPJACK_CIPHER,
-	SQUARE_CIPHER,
-	TEA_CIPHER,
-	TWOFISH_CIPHER,
-	SHARK_CIPHER,
-
-	// Ciphers from Crypto++ 5.2.1...
-
-	CAMELLIA_CIPHER,
-	SHACAL2_CIPHER
+  UNKNOWN_CIPHER = -1,
+
+  // Stream ciphers...
+
+  ARC4_CIPHER,
+  PANAMA_LITTLE_ENDIAN_CIPHER,
+  PANAMA_BIG_ENDIAN_CIPHER,
+  MARC4_CIPHER,
+  SEAL_LITTLE_ENDIAN_CIPHER,
+  SEAL_BIG_ENDIAN_CIPHER,
+
+  // Block Ciphers...
+
+  THREEWAY_CIPHER,
+  AES_CIPHER,
+  BLOWFISH_CIPHER,
+  CAST128_CIPHER,
+  CAST256_CIPHER,
+  DES_CIPHER,
+  DES_EDE2_CIPHER,
+  DES_EDE3_CIPHER,
+  DES_XEX3_CIPHER,
+  DIAMOND2_CIPHER,
+  DIAMOND2_LITE_CIPHER,
+  GOST_CIPHER,
+  IDEA_CIPHER,
+  MARS_CIPHER,
+  RC2_CIPHER,
+  RC5_CIPHER,
+  RC6_CIPHER,
+  SAFER_K_CIPHER,
+  SAFER_SK_CIPHER,
+  SERPENT_CIPHER,
+  SKIPJACK_CIPHER,
+  SQUARE_CIPHER,
+  TEA_CIPHER,
+  TWOFISH_CIPHER,
+  SHARK_CIPHER,
+
+  // Ciphers from Crypto++ 5.2.1...
+
+  CAMELLIA_CIPHER,
+  SHACAL2_CIPHER
 };
 
 #define PANAMA_CIPHER PANAMA_LITTLE_ENDIAN_CIPHER
@@ -81,10 +74,10 @@ enum CipherEnum {
 // Block cipher modes used in JCipher...
 
 enum ModeEnum {
-	UNKNOWN_MODE = -1,
-#	define BLOCK_MODE_X(c, s) \
-		c ## _MODE,
-#	include "defs/block_modes.def"
+  UNKNOWN_MODE = -1,
+#  define BLOCK_MODE_X(c, s) \
+    c ## _MODE,
+#  include "defs/block_modes.def"
 };
 
 #define VALID_MODE(x) (x > UNKNOWN_MODE && x <= OFB_MODE)
@@ -93,10 +86,10 @@ enum ModeEnum {
 // Block cipher padding used in JCipher...
 
 enum PaddingEnum {
-	UNKNOWN_PADDING = -1,
-#	define PADDING_X(c, s) \
-		c ## _PADDING = StreamTransformationFilter::c ## _PADDING,
-#	include "defs/paddings.def"
+  UNKNOWN_PADDING = -1,
+#  define PADDING_X(c, s) \
+    c ## _PADDING = StreamTransformationFilter::c ## _PADDING,
+#  include "defs/paddings.def"
 };
 
 #define VALID_PADDING(x) (x > UNKNOWN_PADDING && x <= DEFAULT_PADDING)
@@ -105,54 +98,65 @@ enum PaddingEnum {
 // Hashes... and HMAC stuff, too...
 
 enum HashEnum {
-	UNKNOWN_HASH = -1,
-
-	// These are checksums, not cryptographic hashes...
-
-	ADLER32_CHECKSUM,
-	CRC32_CHECKSUM,
-
-	// These are hashes. And message digests. ...
-
-	HAVAL_HASH,
-	HAVAL3_HASH,
-	HAVAL4_HASH,
-	HAVAL5_HASH,
-	MD2_HASH,
-	MD4_HASH,
-	MD5_HASH,
-	PANAMA_LITTLE_ENDIAN_HASH,
-	PANAMA_BIG_ENDIAN_HASH,
-	RIPEMD160_HASH,
-	SHA1_HASH,
-	SHA256_HASH,
-	SHA384_HASH,
-	SHA512_HASH,
-	TIGER_HASH,
-
-	// These are for HMAC hashes...
-
-	MD2_HMAC,
-	MD4_HMAC,
-	MD5_HMAC,
-	RIPEMD160_HMAC,
-	SHA1_HMAC,
-	SHA256_HMAC,
-	SHA384_HMAC,
-	SHA512_HMAC,
-	TIGER_HMAC,
-
-	// Newer hashes and HMACs from Crypto++ 5.2.1...
-
-	RIPEMD128_HASH,
-	RIPEMD256_HASH,
-	RIPEMD320_HASH,
-	WHIRLPOOL_HASH,
-
-	RIPEMD128_HMAC,
-	RIPEMD256_HMAC,
-	RIPEMD320_HMAC,
-	WHIRLPOOL_HMAC
+  UNKNOWN_HASH = -1,
+
+  // These are checksums, not cryptographic hashes...
+
+  ADLER32_CHECKSUM,
+  CRC32_CHECKSUM,
+
+  // These are hashes. And message digests. ...
+
+  HAVAL_HASH,
+  HAVAL3_HASH,
+  HAVAL4_HASH,
+  HAVAL5_HASH,
+  MD2_HASH,
+  MD4_HASH,
+  MD5_HASH,
+  PANAMA_LITTLE_ENDIAN_HASH,
+  PANAMA_BIG_ENDIAN_HASH,
+  RIPEMD160_HASH,
+  SHA1_HASH,
+  SHA256_HASH,
+  SHA384_HASH,
+  SHA512_HASH,
+  TIGER_HASH,
+
+  // These are for HMAC hashes...
+
+  MD2_HMAC,
+  MD4_HMAC,
+  MD5_HMAC,
+  RIPEMD160_HMAC,
+  SHA1_HMAC,
+  SHA256_HMAC,
+  SHA384_HMAC,
+  SHA512_HMAC,
+  TIGER_HMAC,
+
+  // Newer hashes and HMACs from Crypto++ 5.2.1...
+
+  RIPEMD128_HASH,
+  RIPEMD256_HASH,
+  RIPEMD320_HASH,
+  WHIRLPOOL_HASH,
+
+  RIPEMD128_HMAC,
+  RIPEMD256_HMAC,
+  RIPEMD320_HMAC,
+  WHIRLPOOL_HMAC,
+
+  // SHA3 from Crypto++ 5.6.2...
+  SHA3_224_HASH,
+  SHA3_256_HASH,
+  SHA3_384_HASH,
+  SHA3_512_HASH,
+
+  SHA3_224_HMAC,
+  SHA3_256_HMAC,
+  SHA3_384_HMAC,
+  SHA3_512_HMAC
 };
 
 #define PANAMA_HASH PANAMA_LITTLE_ENDIAN_HASH
@@ -161,29 +165,23 @@ enum HashEnum {
 // this is to figure out if we're dealing
 // with a HMAC or a regular hash...
 
-#define IS_HMAC(x) \
-	(((x > TIGER_HASH && x < RIPEMD128_HASH) || x >= RIPEMD128_HMAC))
-#define IS_NON_HMAC(x) \
-	((x <= TIGER_HASH || (x >= RIPEMD128_HASH && x <= WHIRLPOOL_HASH)))
-
-
 // random number generators...
 
 enum RNGEnum {
-	UNKNOWN_RNG = -1,
-#	define RNG_X(c, s) \
-		c ## _RNG,
-#	include "defs/rngs.def"
+  UNKNOWN_RNG = -1,
+#  define RNG_X(c, s) \
+    c ## _RNG,
+#  include "defs/rngs.def"
 };
 
 #define VALID_RNG(x) (x > UNKNOWN_RNG && x <= RAND_RNG)
 
 #ifdef NONBLOCKING_RNG_AVAILABLE
-	#define DEFAULT_RNG NON_BLOCKING_RNG
+  #define DEFAULT_RNG NON_BLOCKING_RNG
 #elif defined(BLOCKING_RNG_AVAILABLE)
-	#define DEFAULT_RNG BLOCKING_RNG
+  #define DEFAULT_RNG BLOCKING_RNG
 #else
-	#define DEFAULT_RNG RAND_RNG
+  #define DEFAULT_RNG RAND_RNG
 #endif
 
 #endif

data/ext/jcrc32.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 __JCRC32_H__
@@ -22,10 +22,10 @@ using namespace CryptoPP;
 
 class JCRC32 : public JHash_Template<CRC32, CRC32_CHECKSUM>
 {
-	public:
-		JCRC32(string plaintext = "") : JHash_Template<CRC32, CRC32_CHECKSUM>(plaintext) { }
+  public:
+    JCRC32(string plaintext = "") : JHash_Template<CRC32, CRC32_CHECKSUM>(plaintext) { }
 
-		static string getHashName() { return "CRC32"; }
+    static string getHashName() { return "CRC32"; }
 };
 
 #endif

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

data/ext/jdes.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 __JDES_H__
@@ -22,9 +22,9 @@ using namespace CryptoPP;
 
 class JDES : public JCipher_Template<DES_Info, DES_CIPHER>
 {
-	protected:
-		BlockCipher* getEncryptionObject();
-		BlockCipher* getDecryptionObject();
+  protected:
+    BlockCipher* getEncryptionObject();
+    BlockCipher* getDecryptionObject();
 };
 
 #endif