cryptopp 0.0.4 → 0.0.5

data/ext/extconf.rb

@@ -1,39 +1,81 @@
 
 require 'mkmf'
+require 'rbconfig'
 
-Config::CONFIG['CC'] = 'g++'
-Config::CONFIG['CPP'] = 'g++ -E'
+if RbConfig::CONFIG["arch"] =~ /-darwin\d/
+  if $warnflags
+    $warnflags << ' -Wno-shorten-64-to-32'
+    $warnflags.gsub!('-Wdeclaration-after-statement', '')
+    $warnflags.gsub!('-Wimplicit-function-declaration', '')
+  end
 
-# hack to get C++ standard library properly linked into shared
-# object
-# $libs = append_library($libs, "supc++") # doesn't work
-if Config::CONFIG["arch"] =~ /-darwin\d/
-	Config::CONFIG['LDSHARED']="g++ -dynamic -bundle -undefined suppress -flat_namespace"
+  CONFIG["CXX"] = "clang++"
+elsif RbConfig::CONFIG["arch"] =~ /x86_64-freebsd/
+  $LDFLAGS << " -fPIC -shared"
 else
-	Config::CONFIG['LDSHARED'] = "g++ -shared"
+  $LDFLAGS << " -shared"
 end
 
-$CFLAGS << " -DNDEBUG -DCRYPTOPP_DISABLE_ASM"
+version = File.read(File.join(File.dirname(__FILE__), *%w{ .. VERSION })).strip
+ruby_version = RbConfig::CONFIG.values_at('MAJOR', 'MINOR', 'TEENY').join
+
+$defs.concat([
+  "-DNDEBUG",
+  "-DCRYPTOPP_DISABLE_ASM",
+  "-DRUBY_VERSION_CODE=#{ruby_version}",
+  "-DEXT_VERSION_CODE=#{version}"
+])
 
 def error msg
-	message msg + "\n"
-	abort
+  message msg + "\n"
+  abort
 end
 
-unless have_library('stdc++')
-	error "Can't find libstdc++"
+unless find_library('cryptopp', nil, *%w{
+  /usr/local/lib
+  /usr/local/lib/cryptopp
+  /opt/local/lib
+  /opt/local/lib/cryptopp
+  /usr/lib
+  /usr/lib/cryptopp
+})
+  error "Can't find cryptopp library"
 end
 
-unless have_library('cryptopp')
-	error "Can't find cryptopp library"
+# For the C++ headers, we need to compile using a C++ compiler since the header
+# files can't compile cleanly in C.
+puts "NOTE: The following warning is NORMAL due to an mkmf hack."
+
+if defined?(MakeMakefile)
+  MakeMakefile::CONFTEST_C = 'conftest.cc'
+else
+  CONFTEST_C = 'conftest.cc'
 end
 
 unless find_header('cryptlib.h', *%w{
-	/usr/local/include/cryptopp
-	/usr/include/cryptopp
-	/opt/local/include/cryptopp
+  /usr/local/include
+  /usr/local/include/cryptopp
+  /opt/local/include
+  /opt/local/include/cryptopp
+  /usr/include
+  /usr/include/cryptopp
 })
-	error "Can't find cryptlib.h"
+  error "Can't find cryptlib.h"
+end
+
+have_blocksize = try_link(<<SRC)
+#include "cryptlib.h"
+#include "sha3.h"
+
+int main() {
+  CryptoPP::SHA3_224::BLOCKSIZE;
+  return 0;
+}
+SRC
+
+if have_blocksize
+  $defs << "-DHAVE_CRYPTOPP_SHA3_BLOCKSIZE"
 end
 
 create_makefile('cryptopp')
+

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

data/ext/j3way.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 __J3WAY_H__
@@ -20,9 +20,9 @@
 
 class J3Way : public JCipher_Template<ThreeWay_Info, THREEWAY_CIPHER, 11, 1, INT_MAX>
 {
-	protected:
-		BlockCipher* getEncryptionObject();
-		BlockCipher* getDecryptionObject();
+  protected:
+    BlockCipher* getEncryptionObject();
+    BlockCipher* getDecryptionObject();
 };
 
 #endif

data/ext/jadler32.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 __JADLER32_H__
@@ -22,10 +22,10 @@ using namespace CryptoPP;
 
 class JAdler32 : public JHash_Template<Adler32, ADLER32_CHECKSUM>
 {
-	public:
-		JAdler32(string plaintext = "") : JHash_Template<Adler32, ADLER32_CHECKSUM>(plaintext) { }
+  public:
+    JAdler32(string plaintext = "") : JHash_Template<Adler32, ADLER32_CHECKSUM>(plaintext) { }
 
-		static string getHashName() { return "Adler32"; }
+    static string getHashName() { return "Adler32"; }
 };
 
 #endif

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

data/ext/jaes.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 __JAES_H__
@@ -20,9 +20,9 @@
 
 class JAES : public JCipher_Template<Rijndael_Info, AES_CIPHER>
 {
-	protected:
-		BlockCipher* getEncryptionObject();
-		BlockCipher* getDecryptionObject();
+  protected:
+    BlockCipher* getEncryptionObject();
+    BlockCipher* getDecryptionObject();
 };
 
 typedef JAES JRijndael;

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

data/ext/jarc4.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 __JARC4_H__
@@ -26,9 +26,9 @@ using namespace CryptoPP;
 
 class JARC4 : public JStream_Template<Weak::ARC4_Base, ARC4_CIPHER>
 {
-	protected:
-		SymmetricCipher* getEncryptionObject();
-		SymmetricCipher* getDecryptionObject();
+  protected:
+    SymmetricCipher* getEncryptionObject();
+    SymmetricCipher* getDecryptionObject();
 };
 
 #undef CRYPTOPP_ENABLE_NAMESPACE_WEAK

data/ext/jbase.cpp

@@ -1,172 +1,172 @@
 
 /*
- * 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 "jbase.h"
 
 JBase::JBase()
 {
-	itsPlaintext = "";
-	itsIV = "";
-	itsRNG = DEFAULT_RNG;
+  itsPlaintext = "";
+  itsIV = "";
+  itsRNG = DEFAULT_RNG;
 }
 
 string JBase::getPlaintext(const bool hex) const
 {
-	if (hex) {
-		return bin2hex(itsPlaintext);
-	}
-	else {
-		return itsPlaintext;
-	}
+  if (hex) {
+    return bin2hex(itsPlaintext);
+  }
+  else {
+    return itsPlaintext;
+  }
 }
 
 string JBase::getCiphertext(const bool hex) const
 {
-	if (hex) {
-		return bin2hex(itsCiphertext);
-	}
-	else {
-		return itsCiphertext;
-	}
+  if (hex) {
+    return bin2hex(itsCiphertext);
+  }
+  else {
+    return itsCiphertext;
+  }
 }
 
 string JBase::getKey(const bool hex) const
 {
-	if (hex) {
-		return bin2hex(itsKey);
-	}
-	else {
-		return itsKey;
-	}
+  if (hex) {
+    return bin2hex(itsKey);
+  }
+  else {
+    return itsKey;
+  }
 }
 
 unsigned int JBase::getKeylength() const
 {
-	return itsKeylength;
+  return itsKeylength;
 }
 
 void JBase::setPlaintext(const string plaintext, const bool hex)
 {
-	if (hex) {
-		itsPlaintext = hex2bin(plaintext);
-	}
-	else {
-		itsPlaintext = plaintext;
-	}
+  if (hex) {
+    itsPlaintext = hex2bin(plaintext);
+  }
+  else {
+    itsPlaintext = plaintext;
+  }
 }
 
 void JBase::setCiphertext(const string ciphertext, const bool hex)
 {
-	if (hex) {
-		itsCiphertext = hex2bin(ciphertext);
-	}
-	else {
-		itsCiphertext = ciphertext;
-	}
+  if (hex) {
+    itsCiphertext = hex2bin(ciphertext);
+  }
+  else {
+    itsCiphertext = ciphertext;
+  }
 }
 
 unsigned int JBase::setKey(const string key, const bool hex)
 {
-	if (hex) {
-		itsKey = hex2bin(key);
-	}
-	else {
-		itsKey = key;
-	}
+  if (hex) {
+    itsKey = hex2bin(key);
+  }
+  else {
+    itsKey = key;
+  }
 
-	setKeylength(itsKey.length());
+  setKeylength(itsKey.length());
 
-	return itsKeylength;
+  return itsKeylength;
 }
 
 unsigned int JBase::setKeylength(const unsigned int keylength)
 {
-	itsKeylength = getValidKeylength(keylength);
-	itsKey.resize(itsKeylength);
+  itsKeylength = getValidKeylength(keylength);
+  itsKey.resize(itsKeylength);
 
-	return itsKeylength;
+  return itsKeylength;
 }
 
 string JBase::getRNGName() const
 {
-	return getRNGName(itsRNG);
+  return getRNGName(itsRNG);
 }
 
 string JBase::getRNGName(const enum RNGEnum rng)
 {
-	switch (rng) {
-		#ifdef NONBLOCKING_RNG_AVAILABLE
-		case NON_BLOCKING_RNG:
-			#if defined(CRYPTOPP_WIN32_AVAILABLE) && defined(USE_MS_CRYPTOAPI)
-			return "Non-blocking (Microsoft CryptoAPI)";
-			#else
-			return "Non-blocking (/dev/urandom, etc.)";
-			#endif
-		#endif
+  switch (rng) {
+    #ifdef NONBLOCKING_RNG_AVAILABLE
+    case NON_BLOCKING_RNG:
+      #if defined(CRYPTOPP_WIN32_AVAILABLE) && defined(USE_MS_CRYPTOAPI)
+      return "Non-blocking (Microsoft CryptoAPI)";
+      #else
+      return "Non-blocking (/dev/urandom, etc.)";
+      #endif
+    #endif
 
-		#ifdef BLOCKING_RNG_AVAILABLE
-		case BLOCKING_RNG:
-			return "Blocking (/dev/random, etc.)";
-		#endif
+    #ifdef BLOCKING_RNG_AVAILABLE
+    case BLOCKING_RNG:
+      return "Blocking (/dev/random, etc.)";
+    #endif
 
-		case RAND_RNG:
-			return "System rand() function";
-	}
+    case RAND_RNG:
+      return "System rand() function";
+  }
 
-	return "Unknown";
+  return "Unknown";
 }
 
 enum RNGEnum JBase::getRNG() const
 {
-	return itsRNG;
+  return itsRNG;
 }
 
 enum RNGEnum JBase::setRNG(const enum RNGEnum rng)
 {
-	#ifdef NONBLOCKING_RNG_AVAILABLE
-	if (rng == NON_BLOCKING_RNG) {
-		itsRNG = rng;
-	}
-	#endif
+  #ifdef NONBLOCKING_RNG_AVAILABLE
+  if (rng == NON_BLOCKING_RNG) {
+    itsRNG = rng;
+  }
+  #endif
 
-	#ifdef BLOCKING_RNG_AVAILABLE
-	if (rng == BLOCKING_RNG) {
-		itsRNG = rng;
-	}
-	#endif
+  #ifdef BLOCKING_RNG_AVAILABLE
+  if (rng == BLOCKING_RNG) {
+    itsRNG = rng;
+  }
+  #endif
 
-	if (rng == RAND_RNG) {
-		itsRNG = rng;
-	}
+  if (rng == RAND_RNG) {
+    itsRNG = rng;
+  }
 
-	return itsRNG;
+  return itsRNG;
 }
 
 string JBase::getIV(bool hex) const
 {
-	if (hex) {
-		return bin2hex(itsIV);
-	}
-	else {
-		return itsIV;
-	}
+  if (hex) {
+    return bin2hex(itsIV);
+  }
+  else {
+    return itsIV;
+  }
 }
 
 void JBase::setIV(string iv, bool hex)
 {
-	if (hex) {
-		itsIV = hex2bin(iv);
-	}
-	else {
-		itsIV = iv;
-	}
+  if (hex) {
+    itsIV = hex2bin(iv);
+  }
+  else {
+    itsIV = iv;
+  }
 }
 
 void JBase::setRandIV(const unsigned int size)
 {
-	itsIV = generateIV(size, itsRNG);
+  itsIV = generateIV(size, itsRNG);
 }