cryptopp 0.0.4 → 0.0.5

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

data/ext/jtwofish.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 __JTWOFISH_H__
@@ -22,9 +22,9 @@ using namespace CryptoPP;
 
 class JTwofish : public JCipher_Template<Twofish_Info, TWOFISH_CIPHER>
 {
-	protected:
-		BlockCipher* getEncryptionObject();
-		BlockCipher* getDecryptionObject();
+  protected:
+    BlockCipher* getEncryptionObject();
+    BlockCipher* getDecryptionObject();
 };
 
 #endif

data/ext/jwhirlpool.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 __JWHIRLPOOL_H__
@@ -10,7 +10,6 @@
 
 #include "jconfig.h"
 
-#ifdef WORD64_AVAILABLE
 #if ENABLED_WHIRLPOOL_HASH || ENABLED_WHIRLPOOL_HMAC
 
 #if ENABLED_WHIRLPOOL_HASH
@@ -30,23 +29,22 @@ using namespace CryptoPP;
 #if ENABLED_WHIRLPOOL_HASH
 class JWhirlpool : public JHash_Template<Whirlpool, WHIRLPOOL_HASH>
 {
-	public:
-		JWhirlpool(string plaintext = "") : JHash_Template<Whirlpool, WHIRLPOOL_HASH>(plaintext) { }
+  public:
+    JWhirlpool(string plaintext = "") : JHash_Template<Whirlpool, WHIRLPOOL_HASH>(plaintext) { }
 
-		static string getHashName() { return "Whirlpool"; }
+    static string getHashName() { return "Whirlpool"; }
 };
 #endif
 
 #if ENABLED_WHIRLPOOL_HMAC
 class JWhirlpool_HMAC : public JHMAC_Template<Whirlpool, WHIRLPOOL_HMAC>
 {
-	public:
-		JWhirlpool_HMAC(string plaintext = "") : JHMAC_Template<Whirlpool, WHIRLPOOL_HMAC>(plaintext) { }
+  public:
+    JWhirlpool_HMAC(string plaintext = "") : JHMAC_Template<Whirlpool, WHIRLPOOL_HMAC>(plaintext) { }
 
-		static string getHashName() { return "Whirlpool-HMAC"; }
+    static string getHashName() { return "Whirlpool-HMAC"; }
 };
 #endif
 
 #endif
 #endif
-#endif

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

data/extras/parser_c.rb

@@ -1,114 +1,114 @@
 
 module RDoc
-	class CustomParser < C_Parser
-		extend ParserFactory
-		parse_files_matching(/\.(?:([CcHh])\1?|c([+xp])\2|y)\z/)
+  class CustomParser < C_Parser
+    extend ParserFactory
+    parse_files_matching(/\.(?:([CcHh])\1?|c([+xp])\2|y)\z/)
 
-		def mangle_comment(comment)
-			comment.sub!(%r{/\*+}) { " " * $&.length }
-			comment.sub!(%r{\*+/}) { " " * $&.length }
-			comment.gsub!(/^[ \t]*\*/m, '')
-			comment
-		end
+    def mangle_comment(comment)
+      comment.sub!(%r{/\*+}) { " " * $&.length }
+      comment.sub!(%r{\*+/}) { " " * $&.length }
+      comment.gsub!(/^[ \t]*\*/m, '')
+      comment
+    end
 
-		private
-			def do_constants
-				@body.scan(
-					%r{
-						CRYPTOPP_DEFINE_CONST\(
-							\s*(\w+)\s*,
-							\s*"([^"]+)"\s*,
-							\s*(\w+)\s*
-						\)\s*;
-					}xm
-				) do |klass, name, definition|
-					handle_constants('const', klass, name, definition)
-				end
-				super
-			end
+    private
+      def do_constants
+        @body.scan(
+          %r{
+            CRYPTOPP_DEFINE_CONST\(
+              \s*(\w+)\s*,
+              \s*"([^"]+)"\s*,
+              \s*(\w+)\s*
+            \)\s*;
+          }xm
+        ) do |klass, name, definition|
+          handle_constants('const', klass, name, definition)
+        end
+        super
+      end
 
-			def do_methods
-				@body.scan(
-					%r{
-						CRYPTOPP_MODULE_METHOD\(
-							\s*(\w+)\s*,
-							\s*"([^"]+)"\s*,
-							\s*(\w+)\s*,
-							\s*(-?\w+)\s*
-						\)
-						(?:;\s*/[*/]\s+in\s+(\w+?\.cpp))?
-					}xm
-				) do |mod, name, body, params, source_file|
-					handle_method('module_function', mod, name, body, params, source_file)
-				end
+      def do_methods
+        @body.scan(
+          %r{
+            CRYPTOPP_MODULE_METHOD\(
+              \s*(\w+)\s*,
+              \s*"([^"]+)"\s*,
+              \s*(\w+)\s*,
+              \s*(-?\w+)\s*
+            \)
+            (?:;\s*/[*/]\s+in\s+(\w+?\.cpp))?
+          }xm
+        ) do |mod, name, body, params, source_file|
+          handle_method('module_function', mod, name, body, params, source_file)
+        end
 
-				@body.scan(
-					%r{
-						CRYPTOPP_CLASS_METHOD\(
-							\s*(\w+)\s*,
-							\s*"([^"]+)"\s*,
-							\s*(\w+)\s*,
-							\s*(-?\w+)\s*
-						\)
-						(?:;\s*/[*/]\s+in\s+(\w+?\.cpp))?
-					}xm
-				) do |klass, name, body, params, source_file|
-					handle_method('method', "rb_cCryptoPP_#{klass}", name, body, params, source_file)
-				end
+        @body.scan(
+          %r{
+            CRYPTOPP_CLASS_METHOD\(
+              \s*(\w+)\s*,
+              \s*"([^"]+)"\s*,
+              \s*(\w+)\s*,
+              \s*(-?\w+)\s*
+            \)
+            (?:;\s*/[*/]\s+in\s+(\w+?\.cpp))?
+          }xm
+        ) do |klass, name, body, params, source_file|
+          handle_method('method', "rb_cCryptoPP_#{klass}", name, body, params, source_file)
+        end
 
-				@body.scan(
-					%r{
-						rb_define_(
-							singleton_method |
-							method           |
-							module_function  |
-							private_method
-						)
-						\s*\(\s*([\w\.]+),
-						\s*"([^"]+)",
-						\s*(?:RUBY_METHOD_FUNC\(|VALUEFUNC\()?(\w+)\)?,
-						\s*(-?\w+)\s*\)
-						(?:;\s*/[*/]\s+in\s+(\w+?\.cpp))?
-					}xm
-				) do |type, var_name, meth_name, meth_body, param_count, source_file|
-					handle_method(type, var_name, meth_name, meth_body, param_count, source_file)
-				end
-			end
+        @body.scan(
+          %r{
+            rb_define_(
+              singleton_method |
+              method           |
+              module_function  |
+              private_method
+            )
+            \s*\(\s*([\w\.]+),
+            \s*"([^"]+)",
+            \s*(?:RUBY_METHOD_FUNC\(|VALUEFUNC\()?(\w+)\)?,
+            \s*(-?\w+)\s*\)
+            (?:;\s*/[*/]\s+in\s+(\w+?\.cpp))?
+          }xm
+        ) do |type, var_name, meth_name, meth_body, param_count, source_file|
+          handle_method(type, var_name, meth_name, meth_body, param_count, source_file)
+        end
+      end
 
-			def do_aliases
-				@body.scan(
-					%r{
-						CRYPTOPP_MODULE_METHOD_ALIAS\(
-							\s*(\w+)\s*,
-							\s*"([^"]+)"\s*,
-							\s*"([^"]+)"\s*
-						\)\s*;
-					}xm
-				) do |mod, new_name, old_name|
-					@stats.num_methods += 1
-					class_name = @known_classes[mod] || mod
-					class_obj  = find_class(mod, class_name)
+      def do_aliases
+        @body.scan(
+          %r{
+            CRYPTOPP_MODULE_METHOD_ALIAS\(
+              \s*(\w+)\s*,
+              \s*"([^"]+)"\s*,
+              \s*"([^"]+)"\s*
+            \)\s*;
+          }xm
+        ) do |mod, new_name, old_name|
+          @stats.num_methods += 1
+          class_name = @known_classes[mod] || mod
+          class_obj  = find_class(mod, class_name)
 
-					class_obj.add_alias(Alias.new("", old_name, new_name, ""))
-				end
+          class_obj.add_alias(Alias.new("", old_name, new_name, ""))
+        end
 
-				@body.scan(
-					%r{
-						CRYPTOPP_CLASS_METHOD_ALIAS\(
-							\s*(\w+)\s*,
-							\s*"([^"]+)"\s*,
-							\s*"([^"]+)"\s*
-						\)\s*;
-					}xm
-				) do |klass, new_name, old_name|
-					klass = "rb_cCryptoPP_#{klass}"
-					@stats.num_methods += 1
-					class_name = @known_classes[klass] || klass
-					class_obj  = find_class(klass, class_name)
+        @body.scan(
+          %r{
+            CRYPTOPP_CLASS_METHOD_ALIAS\(
+              \s*(\w+)\s*,
+              \s*"([^"]+)"\s*,
+              \s*"([^"]+)"\s*
+            \)\s*;
+          }xm
+        ) do |klass, new_name, old_name|
+          klass = "rb_cCryptoPP_#{klass}"
+          @stats.num_methods += 1
+          class_name = @known_classes[klass] || klass
+          class_obj  = find_class(klass, class_name)
 
-					class_obj.add_alias(Alias.new("", old_name, new_name, ""))
-				end
-				super
-			end
-	end
+          class_obj.add_alias(Alias.new("", old_name, new_name, ""))
+        end
+        super
+      end
+  end
 end

data/test/ciphers_test.rb

@@ -1,37 +1,31 @@
 
-require 'test/unit'
-require 'test/test_helper'
+$: << File.dirname(__FILE__)
+require 'test_helper'
 
-class CiphersTest < Test::Unit::TestCase
-	include TestHelper
+class CiphersTest < MiniTest::Unit::TestCase
+  extend TestHelper
 
-	Dir.glob('test/data/ciphers/*.dat').sort.each do |f|
-		test_name = File.basename(f).gsub(/.dat$/, '')
+  Dir.glob('test/data/ciphers/*.yml').sort.each do |f|
+    test_name = File.basename(f).gsub(/.yml$/, '')
 
-		class_eval(%{
-			def test_#{test_name}
-				run_cipher_test("#{f}")
-			end
-		})
-	end
+    readfile(f) do |options, i|
+      define_method("test_#{test_name}_#{i}") do
+        if CryptoPP.cipher_enabled? options[:algorithm]
+          encryption_factory_options = options.reject do |k, v|
+            [ :algorithm, :ciphertext, :ciphertext_hex ].include? k
+          end
+          encrypt = CryptoPP.cipher_factory options[:algorithm], encryption_factory_options
 
-	def run_cipher_test(file)
-		readfile(file) do |options|
-			if CryptoPP.cipher_enabled? options[:algorithm]
-				encryption_factory_options = options.reject do |k, v|
-					[ :algorithm, :ciphertext, :ciphertext_hex ].include? k
-				end
-				encrypt = CryptoPP.cipher_factory options[:algorithm], encryption_factory_options
+          decryption_factory_options = options.reject do |k, v|
+            [ :algorithm, :plaintext, :plaintext_hex ].include? k
+          end
+          decrypt = CryptoPP.cipher_factory options[:algorithm], decryption_factory_options
+          decrypt.decrypt
 
-				decryption_factory_options = options.reject do |k, v|
-					[ :algorithm, :plaintext, :plaintext_hex ].include? k
-				end
-				decrypt = CryptoPP.cipher_factory options[:algorithm], decryption_factory_options
-				decrypt.decrypt
-
-				assert_equal(decrypt.plaintext, encrypt.plaintext)
-				assert_equal(decrypt.ciphertext_hex, options[:ciphertext_hex])
-			end
-		end
-	end
+          assert_equal(decrypt.plaintext, encrypt.plaintext)
+          assert_equal(decrypt.ciphertext_hex, options[:ciphertext_hex])
+        end
+      end
+    end
+  end
 end

data/test/data/ciphers/3desval.yml

@@ -0,0 +1,13 @@
+---
+- :algorithm: :des_ede2
+  :key_hex: 0123456789abcdeffedcba9876543210
+  :plaintext_hex: 0123456789abcde7
+  :ciphertext_hex: 7f1d0a77826b8aff
+- :algorithm: :des_ede3
+  :key_hex: 0123456789abcdeffedcba987654321089abcdef01234567
+  :plaintext_hex: 0123456789abcde7
+  :ciphertext_hex: de0b7c06ae5e0ed5
+- :algorithm: :des_xex3
+  :key_hex: 0123456789abcdef01010101010101011011121314151617
+  :plaintext_hex: 94dbe082549a14ef
+  :ciphertext_hex: '9011121314151617'

data/test/data/ciphers/3wayval.yml

@@ -0,0 +1,17 @@
+---
+- :algorithm: :threeway
+  :key_hex: '000000000000000000000000'
+  :plaintext_hex: '000000010000000100000001'
+  :ciphertext_hex: 4059c76e83ae9dc4ad21ecf7
+- :algorithm: :threeway
+  :key_hex: '000000060000000500000004'
+  :plaintext_hex: '000000030000000200000001'
+  :ciphertext_hex: d2f05b5ed6144138cab920cd
+- :algorithm: :threeway
+  :key_hex: def01234456789abbcdef012
+  :plaintext_hex: 234567899abcdef001234567
+  :ciphertext_hex: 0aa55dbb9cdddb6d7cdb76b2
+- :algorithm: :threeway
+  :key_hex: d2f05b5ed6144138cab920cd
+  :plaintext_hex: 4059c76e83ae9dc4ad21ecf7
+  :ciphertext_hex: 478ea8716b13f17c15b155ed

data/test/data/ciphers/arc4.yml

@@ -0,0 +1,22 @@
+---
+- :algorithm: :arc4
+  :key_hex: 0123456789abcdef
+  :plaintext_hex: 0123456789abcdef
+  :ciphertext_hex: 75b7878099e0c596
+- :algorithm: :arc4
+  :key_hex: 0123456789abcdef
+  :plaintext_hex: '0000000000000000'
+  :ciphertext_hex: 7494c2e7104b0879
+- :algorithm: :arc4
+  :key_hex: '0000000000000000'
+  :plaintext_hex: '0000000000000000'
+  :ciphertext_hex: de188941a3375d3a
+- :algorithm: :arc4
+  :key_hex: ef012345
+  :plaintext_hex: '00000000000000000000'
+  :ciphertext_hex: d6a141a7ec3c38dfbd61
+- :algorithm: :arc4
+  :key_hex: 0123456789abcdef
+  :plaintext_hex: '01'
+  :plaintext_repeat: 512
+  :ciphertext_hex: '7595c3e6114a09780c4ad452338e1ffd9a1be9498f813d76533449b6778dcad8c78a8d2ba9ac66085d0e53d59c26c2d1c490c1ebbe0ce66d1b6b1b13b6b919b847c25a91447a95e75e4ef16779cde8bf0a95850e32af9689444fd377108f98fdcbd4e726567500990bcc7e0ca3c4aaa304a387d20f3b8fbbcd42a1bd311d7a4303dda5ab078896ae80c18b0af66dff319616eb784e495ad2ce90d7f772a81747b65f62093b1e0db9e5ba532fafec47508323e671327df9444432cb7367cec82f5d44c0d00b67d650a075cd4b70dedd77eb9b10231b6b5b741347396d62897421d43df9b42e446e358e9c11a9b2184ecbef0cd8e7a877ef968f1390ec9b3d35a5585cb009290e2fcde7b5ec66d9084be44055a619d9dd7fc3166f9487f7cb272912426445998514c15d53a18c864ce3a2b7555793988126520eacf2e3066e230c91bee4dd5304f5fd0405b35bd99c73135d3d9bc335ee049ef69b3867bf2d7bd1eaa595d8bfc0066ff8d31509eb0c6caa006c807a623ef84c3d33c195d23ee320c40de0558157c822d4b8c569d849aed59d4e0fd7f379586b4b7ff684ed6a189f7486d49b9c4bad9ba24b96abf924372c8a8fffb10d55354900a77a3db5f205e1b99fcd8660863a159ad4abe40fa48934163ddde542a6585540fd683cbfd8c00f12129a284deacc4cdefe58be7137541c047126c8d49e2755ab181ab7e940b0c0'