RubyGems - cryptopp - Versions diffs - 0.0.4 → 0.0.5 - Mend

cryptopp 0.0.4 → 0.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (195) hide show

checksums.yaml +7 -0
data/.gitignore +4 -0
data/Gemfile +14 -0
data/Guardfile +17 -0
data/MIT-LICENSE +1 -1
data/Rakefile +20 -27
data/VERSION +1 -0
data/cryptopp.gemspec +7 -182
data/ext/Rakefile +2 -2
data/ext/ciphers.cpp +619 -619
data/ext/cryptopp.cpp +220 -217
data/ext/cryptopp_ruby_api.h +7 -7
data/ext/defs/hashes.def +16 -0
data/ext/defs/hmacs.def +16 -0
data/ext/digests.cpp +635 -601
data/ext/extconf.rb +61 -19
data/ext/j3way.cpp +5 -5
data/ext/j3way.h +6 -6
data/ext/jadler32.h +6 -6
data/ext/jaes.cpp +5 -5
data/ext/jaes.h +6 -6
data/ext/jarc4.cpp +5 -5
data/ext/jarc4.h +6 -6
data/ext/jbase.cpp +94 -94
data/ext/jbase.h +49 -55
data/ext/jbasiccipherinfo.h +23 -23
data/ext/jblowfish.cpp +5 -5
data/ext/jblowfish.h +6 -6
data/ext/jcamellia.cpp +5 -7
data/ext/jcamellia.h +6 -8
data/ext/jcast128.cpp +5 -5
data/ext/jcast128.h +6 -6
data/ext/jcast256.cpp +5 -5
data/ext/jcast256.h +6 -6
data/ext/jcipher.cpp +62 -62
data/ext/jcipher.h +24 -24
data/ext/jcipher_t.h +383 -383
data/ext/jconfig.h +29 -46
data/ext/jconstants.h +120 -122
data/ext/jcrc32.h +6 -6
data/ext/jdes.cpp +5 -5
data/ext/jdes.h +6 -6
data/ext/jdes_ede2.cpp +5 -5
data/ext/jdes_ede2.h +6 -6
data/ext/jdes_ede3.cpp +5 -5
data/ext/jdes_ede3.h +6 -6
data/ext/jdes_xex3.cpp +5 -5
data/ext/jdes_xex3.h +6 -6
data/ext/jdiamond2.cpp +5 -5
data/ext/jdiamond2.h +6 -6
data/ext/jdiamond2lite.cpp +5 -5
data/ext/jdiamond2lite.h +6 -6
data/ext/jexception.h +5 -5
data/ext/jgost.cpp +5 -5
data/ext/jgost.h +6 -6
data/ext/jhash.cpp +51 -51
data/ext/jhash.h +22 -27
data/ext/jhash_t.h +59 -59
data/ext/jhaval.h +15 -15
data/ext/jhelpers.cpp +54 -54
data/ext/jhelpers.h +3 -3
data/ext/jhmac.cpp +20 -20
data/ext/jhmac.h +15 -15
data/ext/jhmac_t.h +40 -72
data/ext/jidea.cpp +5 -5
data/ext/jidea.h +6 -6
data/ext/jmarc4.cpp +5 -5
data/ext/jmarc4.h +6 -6
data/ext/jmars.cpp +5 -5
data/ext/jmars.h +6 -6
data/ext/jmd2.h +9 -9
data/ext/jmd4.h +9 -9
data/ext/jmd5.h +9 -9
data/ext/jpanamacipher.cpp +7 -7
data/ext/jpanamacipher.h +9 -9
data/ext/jpanamahash.h +9 -9
data/ext/jrc2.cpp +15 -15
data/ext/jrc2.h +11 -11
data/ext/jrc5.cpp +5 -5
data/ext/jrc5.h +6 -6
data/ext/jrc6.cpp +5 -5
data/ext/jrc6.h +6 -6
data/ext/jripemd160.h +28 -28
data/ext/jsafer.cpp +7 -7
data/ext/jsafer.h +9 -9
data/ext/jseal.cpp +7 -7
data/ext/jseal.h +9 -9
data/ext/jserpent.cpp +5 -5
data/ext/jserpent.h +6 -6
data/ext/jsha.h +38 -37
data/ext/jsha3.h +130 -0
data/ext/jsha3_blocksizes.h +73 -0
data/ext/jshacal2.cpp +5 -5
data/ext/jshacal2.h +6 -6
data/ext/jshark.cpp +5 -7
data/ext/jshark.h +6 -8
data/ext/jsink.cpp +57 -57
data/ext/jsink.h +127 -123
data/ext/jskipjack.cpp +5 -5
data/ext/jskipjack.h +6 -6
data/ext/jsquare.cpp +5 -5
data/ext/jsquare.h +6 -6
data/ext/jstream.cpp +3 -3
data/ext/jstream.h +3 -3
data/ext/jstream_t.h +74 -126
data/ext/jtea.cpp +5 -5
data/ext/jtea.h +6 -6
data/ext/jtiger.h +9 -11
data/ext/jtwofish.cpp +5 -5
data/ext/jtwofish.h +6 -6
data/ext/jwhirlpool.h +9 -11
data/ext/utils.cpp +3 -3
data/extras/parser_c.rb +102 -102
data/test/ciphers_test.rb +24 -30
data/test/data/ciphers/3desval.yml +13 -0
data/test/data/ciphers/3wayval.yml +17 -0
data/test/data/ciphers/arc4.yml +22 -0
data/test/data/ciphers/blowfish.yml +9 -0
data/test/data/ciphers/camellia.yml +21 -0
data/test/data/ciphers/cast128v.yml +13 -0
data/test/data/ciphers/cast256v.yml +13 -0
data/test/data/ciphers/descert.yml +723 -0
data/test/data/ciphers/diamond.yml +31 -0
data/test/data/ciphers/gostval.yml +33 -0
data/test/data/ciphers/ideaval.yml +45 -0
data/test/data/ciphers/marsval.yml +37 -0
data/test/data/ciphers/panamac.yml +11 -0
data/test/data/ciphers/rc2val.yml +49 -0
data/test/data/ciphers/rc5val.yml +26 -0
data/test/data/ciphers/rc6val.yml +25 -0
data/test/data/ciphers/rijndael.yml +37 -0
data/test/data/ciphers/saferval.yml +77 -0
data/test/data/ciphers/seal.yml +6 -0
data/test/data/ciphers/serpentv.yml +37 -0
data/test/data/ciphers/shacal2.yml +21 -0
data/test/data/ciphers/sharkval.yml +29 -0
data/test/data/ciphers/skipjack.yml +5 -0
data/test/data/ciphers/squareva.yml +33 -0
data/test/data/ciphers/twofishv.yml +37 -0
data/test/data/digests/adler32.yml +19 -0
data/test/data/digests/crc32.yml +25 -0
data/test/data/digests/haval.yml +7 -0
data/test/data/digests/havalcer.yml +1 -0
data/test/data/digests/md2.yml +22 -0
data/test/data/digests/md4.yml +22 -0
data/test/data/digests/md5.yml +22 -0
data/test/data/digests/panamah.yml +13 -0
data/test/data/digests/ripemd.yml +97 -0
data/test/data/digests/sha.yml +25 -0
data/test/data/digests/sha3.yml +23 -0
data/test/data/digests/tiger.yml +30 -0
data/test/data/digests/whirlpool.yml +25 -0
data/test/data/hmacs/hmac.yml +14 -0
data/test/digests_test.rb +17 -23
data/test/hmacs_test.rb +25 -31
data/test/test_helper.rb +31 -37
metadata +70 -82
data/test/data/ciphers/3desval.dat +0 -7
data/test/data/ciphers/3wayval.dat +0 -6
data/test/data/ciphers/arc4.dat +0 -8
data/test/data/ciphers/blowfish.dat +0 -5
data/test/data/ciphers/camellia.dat +0 -7
data/test/data/ciphers/cast128v.dat +0 -5
data/test/data/ciphers/cast256v.dat +0 -5
data/test/data/ciphers/descert.dat +0 -198
data/test/data/ciphers/diamond.dat +0 -9
data/test/data/ciphers/gostval.dat +0 -10
data/test/data/ciphers/ideaval.dat +0 -13
data/test/data/ciphers/marsval.dat +0 -11
data/test/data/ciphers/panamac.dat +0 -7
data/test/data/ciphers/rc2val.dat +0 -10
data/test/data/ciphers/rc5val.dat +0 -7
data/test/data/ciphers/rc6val.dat +0 -8
data/test/data/ciphers/rijndael.dat +0 -11
data/test/data/ciphers/saferval.dat +0 -27
data/test/data/ciphers/seal.dat +0 -3
data/test/data/ciphers/serpentv.dat +0 -11
data/test/data/ciphers/shacal2.dat +0 -7
data/test/data/ciphers/sharkval.dat +0 -9
data/test/data/ciphers/skipjack.dat +0 -3
data/test/data/ciphers/squareva.dat +0 -10
data/test/data/ciphers/twofishv.dat +0 -11
data/test/data/digests/adler32.dat +0 -8
data/test/data/digests/crc32.dat +0 -10
data/test/data/digests/haval.dat +0 -4
data/test/data/digests/havalcer.dat +0 -23
data/test/data/digests/md2.dat +0 -9
data/test/data/digests/md4.dat +0 -9
data/test/data/digests/md5.dat +0 -9
data/test/data/digests/panamah.dat +0 -8
data/test/data/digests/ripemd.dat +0 -43
data/test/data/digests/sha.dat +0 -19
data/test/data/digests/tiger.dat +0 -11
data/test/data/digests/whirlpool.dat +0 -13
data/test/data/hmacs/hmac.dat +0 -6

checksums.yaml ADDED

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 68d183271bac57caacfe1f66a50dad317c4de678
+  data.tar.gz: a87c4ec4a2469fcbc766435b7072e97106b2b2e3
+SHA512:
+  metadata.gz: 9a0845962d2279bc631f4212b7a5b2e5ed098216d9fc1af0eed42d47136500986e01baf70e0d1464e9afa889fd684ddc4f9e19487eb4e491abf2046a00691dc5
+  data.tar.gz: 236319c0bf9930ae7b7bb859d534fe55d3e42499adc21271f75cd14b064ea79223fbd2864f4ab223af992fa1fb5df9cd0e25eb87c1e1664f8feff3e632cd4a21

data/.gitignore CHANGED

@@ -1,8 +1,12 @@
 ext/*.bundle
 ext/*.o
+ext/extconf.h
 doc
 *.kpf
 *~
 .DS_Store
 *tmp*
 pkg/
+Gemfile.lock
+Gemfile.local
+*.orig

data/Gemfile ADDED

@@ -0,0 +1,14 @@
+source 'https://rubygems.org'
+gemspec
+gem "rdoc", "~> 3.12"
+gem "rake", "~> 10.0"
+gem "minitest"
+gem "minitest-reporters"
+gem "guard-minitest"
+if File.exists?('Gemfile.local')
+  instance_eval File.read('Gemfile.local')
+end

data/Guardfile ADDED

@@ -0,0 +1,17 @@
+guard 'minitest', :test_folders => 'test', :test_file_patterns => '*_test.rb' do
+  watch(%r|^test/(.+)_test\.rb|)
+  watch(%r{^lib/(.*/)?([^/]+)\.rb$}) do |m|
+    "test/#{m[2]}_test.rb"
+  end
+  watch(%r|^test/test_helper\.rb|) do
+    "test"
+  end
+end
+if File.exists?('Guardfile.local')
+  instance_eval File.read('Guardfile.local')
+end

data/MIT-LICENSE CHANGED

@@ -1,4 +1,4 @@
-Copyright (c) 2002-2010 J Smith <dark.panda@gmail.com>
+Copyright (c) 2002-2014 J Smith <dark.panda@gmail.com>
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/Rakefile CHANGED

@@ -1,42 +1,35 @@
+# -*- encoding: utf-8 -*-
 # -*- ruby -*-
 require 'rubygems'
-require 'rake/gempackagetask'
+require 'rubygems/package_task'
 require 'rake/testtask'
-require 'rake/rdoctask'
+require 'rdoc/task'
+require 'bundler/gem_tasks'
-$:.push 'lib'
+$:.push File.expand_path(File.dirname(__FILE__), 'lib')
-begin
-	require 'jeweler'
-	Jeweler::Tasks.new do |gem|
-		gem.name        = "cryptopp"
-		gem.version     = "0.0.4"
-		gem.summary     = "cryptopp is a cryptographic library for Ruby built on Wei Dai's Crypto++."
-		gem.description = gem.summary
-		gem.email       = "dark.panda@gmail.com"
-		gem.homepage    = "http://github.com/dark-panda/ruby-cryptopp"
-		gem.authors =    [ "J Smith" ]
-	end
-	Jeweler::GemcutterTasks.new
-rescue LoadError
-	puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
+version = File.read(File.expand_path('VERSION', File.dirname(__FILE__)))
-desc 'Test cryptopp interface'
+desc 'Test CryptoPP interface'
 Rake::TestTask.new(:test) do |t|
-	t.libs << 'lib'
-	t.pattern = 'test/**/*_test.rb'
-	t.verbose = false
+  t.test_files = FileList['test/**/*_test.rb']
+  t.verbose = !!ENV['VERBOSE_TESTS']
+  t.warning = !!ENV['WARNINGS']
 end
 desc 'Build docs'
 Rake::RDocTask.new do |t|
-	require 'rdoc/rdoc'
-	require 'extras/parser_c.rb'
-	t.main = 'README'
-	t.rdoc_dir = 'doc'
-	t.rdoc_files.include('README', 'ext/cryptopp.cpp', 'ext/ciphers.cpp', 'ext/digests.cpp')
+  t.title = "CryptoPP #{version}"
+  t.main = 'README'
+  t.rdoc_dir = 'doc'
+  t.rdoc_files.include(
+    'README',
+    'MIT-LICENSE',
+    'ext/cryptopp.cpp',
+    'ext/ciphers.cpp',
+    'ext/digests.cpp'
+  )
 end

data/VERSION ADDED

	@@ -0,0 +1 @@
1	+ 0.0.5

data/cryptopp.gemspec CHANGED

@@ -1,199 +1,24 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+version = File.read(File.expand_path('VERSION', File.dirname(__FILE__)))
 Gem::Specification.new do |s|
-  s.name = %q{cryptopp}
-  s.version = "0.0.4"
+  s.name = "cryptopp"
+  s.version = version
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["J Smith"]
-  s.date = %q{2010-07-01}
   s.description = %q{cryptopp is a cryptographic library for Ruby built on Wei Dai's Crypto++.}
+  s.summary = s.description
   s.email = %q{dark.panda@gmail.com}
+  s.license = "MIT"
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = [
     "README"
   ]
-  s.files = [
-    ".gitignore",
-     "MIT-LICENSE",
-     "README",
-     "Rakefile",
-     "cryptopp.gemspec",
-     "ext/.gitignore",
-     "ext/Rakefile",
-     "ext/ciphers.cpp",
-     "ext/cryptopp.cpp",
-     "ext/cryptopp_ruby_api.h",
-     "ext/defs/block_modes.def",
-     "ext/defs/checksums.def",
-     "ext/defs/ciphers.def",
-     "ext/defs/hashes.def",
-     "ext/defs/hmacs.def",
-     "ext/defs/paddings.def",
-     "ext/defs/rngs.def",
-     "ext/digests.cpp",
-     "ext/extconf.rb",
-     "ext/j3way.cpp",
-     "ext/j3way.h",
-     "ext/jadler32.h",
-     "ext/jaes.cpp",
-     "ext/jaes.h",
-     "ext/jarc4.cpp",
-     "ext/jarc4.h",
-     "ext/jbase.cpp",
-     "ext/jbase.h",
-     "ext/jbasiccipherinfo.h",
-     "ext/jblowfish.cpp",
-     "ext/jblowfish.h",
-     "ext/jcamellia.cpp",
-     "ext/jcamellia.h",
-     "ext/jcast128.cpp",
-     "ext/jcast128.h",
-     "ext/jcast256.cpp",
-     "ext/jcast256.h",
-     "ext/jcipher.cpp",
-     "ext/jcipher.h",
-     "ext/jcipher_t.h",
-     "ext/jconfig.h",
-     "ext/jconstants.h",
-     "ext/jcrc32.h",
-     "ext/jdes.cpp",
-     "ext/jdes.h",
-     "ext/jdes_ede2.cpp",
-     "ext/jdes_ede2.h",
-     "ext/jdes_ede3.cpp",
-     "ext/jdes_ede3.h",
-     "ext/jdes_xex3.cpp",
-     "ext/jdes_xex3.h",
-     "ext/jdiamond2.cpp",
-     "ext/jdiamond2.h",
-     "ext/jdiamond2lite.cpp",
-     "ext/jdiamond2lite.h",
-     "ext/jexception.h",
-     "ext/jgost.cpp",
-     "ext/jgost.h",
-     "ext/jhash.cpp",
-     "ext/jhash.h",
-     "ext/jhash_t.h",
-     "ext/jhaval.h",
-     "ext/jhelpers.cpp",
-     "ext/jhelpers.h",
-     "ext/jhmac.cpp",
-     "ext/jhmac.h",
-     "ext/jhmac_t.h",
-     "ext/jidea.cpp",
-     "ext/jidea.h",
-     "ext/jmarc4.cpp",
-     "ext/jmarc4.h",
-     "ext/jmars.cpp",
-     "ext/jmars.h",
-     "ext/jmd2.h",
-     "ext/jmd4.h",
-     "ext/jmd5.h",
-     "ext/jpanamacipher.cpp",
-     "ext/jpanamacipher.h",
-     "ext/jpanamahash.h",
-     "ext/jrc2.cpp",
-     "ext/jrc2.h",
-     "ext/jrc5.cpp",
-     "ext/jrc5.h",
-     "ext/jrc6.cpp",
-     "ext/jrc6.h",
-     "ext/jripemd160.h",
-     "ext/jsafer.cpp",
-     "ext/jsafer.h",
-     "ext/jseal.cpp",
-     "ext/jseal.h",
-     "ext/jserpent.cpp",
-     "ext/jserpent.h",
-     "ext/jsha.h",
-     "ext/jshacal2.cpp",
-     "ext/jshacal2.h",
-     "ext/jshark.cpp",
-     "ext/jshark.h",
-     "ext/jsink.cpp",
-     "ext/jsink.h",
-     "ext/jskipjack.cpp",
-     "ext/jskipjack.h",
-     "ext/jsquare.cpp",
-     "ext/jsquare.h",
-     "ext/jstream.cpp",
-     "ext/jstream.h",
-     "ext/jstream_t.h",
-     "ext/jtea.cpp",
-     "ext/jtea.h",
-     "ext/jtiger.h",
-     "ext/jtwofish.cpp",
-     "ext/jtwofish.h",
-     "ext/jwhirlpool.h",
-     "ext/utils.cpp",
-     "extras/parser_c.rb",
-     "test/ciphers_test.rb",
-     "test/data/ciphers/3desval.dat",
-     "test/data/ciphers/3wayval.dat",
-     "test/data/ciphers/arc4.dat",
-     "test/data/ciphers/blowfish.dat",
-     "test/data/ciphers/camellia.dat",
-     "test/data/ciphers/cast128v.dat",
-     "test/data/ciphers/cast256v.dat",
-     "test/data/ciphers/descert.dat",
-     "test/data/ciphers/diamond.dat",
-     "test/data/ciphers/gostval.dat",
-     "test/data/ciphers/ideaval.dat",
-     "test/data/ciphers/marsval.dat",
-     "test/data/ciphers/panamac.dat",
-     "test/data/ciphers/rc2val.dat",
-     "test/data/ciphers/rc5val.dat",
-     "test/data/ciphers/rc6val.dat",
-     "test/data/ciphers/rijndael.dat",
-     "test/data/ciphers/saferval.dat",
-     "test/data/ciphers/seal.dat",
-     "test/data/ciphers/serpentv.dat",
-     "test/data/ciphers/shacal2.dat",
-     "test/data/ciphers/sharkval.dat",
-     "test/data/ciphers/skipjack.dat",
-     "test/data/ciphers/squareva.dat",
-     "test/data/ciphers/twofishv.dat",
-     "test/data/digests/adler32.dat",
-     "test/data/digests/crc32.dat",
-     "test/data/digests/haval.dat",
-     "test/data/digests/havalcer.dat",
-     "test/data/digests/md2.dat",
-     "test/data/digests/md4.dat",
-     "test/data/digests/md5.dat",
-     "test/data/digests/panamah.dat",
-     "test/data/digests/ripemd.dat",
-     "test/data/digests/sha.dat",
-     "test/data/digests/tiger.dat",
-     "test/data/digests/whirlpool.dat",
-     "test/data/hmacs/hmac.dat",
-     "test/digests_test.rb",
-     "test/hmacs_test.rb",
-     "test/test_helper.rb"
-  ]
+  s.files = `git ls-files`.split($\)
   s.homepage = %q{http://github.com/dark-panda/ruby-cryptopp}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
-  s.summary = %q{cryptopp is a cryptographic library for Ruby built on Wei Dai's Crypto++.}
-  s.test_files = [
-    "test/ciphers_test.rb",
-     "test/digests_test.rb",
-     "test/hmacs_test.rb",
-     "test/test_helper.rb"
-  ]
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
 end

data/ext/Rakefile CHANGED

@@ -7,10 +7,10 @@ CLOBBER.include 'cryptopp.so'
 task :default => ['cryptopp.so']
 file 'cryptopp.so' => [ 'Makefile' ] do
-	sh 'make'
+  sh 'make'
 end
 file 'Makefile' do
-	ruby 'extconf.rb'
+  ruby 'extconf.rb'
 end

data/ext/ciphers.cpp CHANGED

@@ -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"
@@ -73,208 +73,208 @@ static VALUE cipher_decrypt(VALUE self, bool hex);
 static CipherEnum cipher_sym_to_const(VALUE c)
 {
-	CipherEnum cipher = UNKNOWN_CIPHER;
-	ID id = SYM2ID(c);
+  CipherEnum cipher = UNKNOWN_CIPHER;
+  ID id = SYM2ID(c);
-	if (id == rb_intern("rijndael")) {
-		cipher = AES_CIPHER;
-	}
-	else if (id == rb_intern("panama")) {
-		cipher = PANAMA_CIPHER;
-	}
-	else if (id == rb_intern("seal")) {
-		cipher = SEAL_CIPHER;
-	}
-#	define CIPHER_ALGORITHM_X_FORCE 1
-#	define CIPHER_ALGORITHM_X(klass, r, c, s) \
-		else if (id == rb_intern(# s)) { \
-			cipher = r ## _CIPHER; \
-		}
-#	include "defs/ciphers.def"
-	return cipher;
+  if (id == rb_intern("rijndael")) {
+    cipher = AES_CIPHER;
+  }
+  else if (id == rb_intern("panama")) {
+    cipher = PANAMA_CIPHER;
+  }
+  else if (id == rb_intern("seal")) {
+    cipher = SEAL_CIPHER;
+  }
+#  define CIPHER_ALGORITHM_X_FORCE 1
+#  define CIPHER_ALGORITHM_X(klass, r, c, s) \
+    else if (id == rb_intern(# s)) { \
+      cipher = r ## _CIPHER; \
+    }
+#  include "defs/ciphers.def"
+  return cipher;
 }
 static ModeEnum mode_sym_to_const(VALUE m)
 {
-	ModeEnum mode = UNKNOWN_MODE;
-	ID id = SYM2ID(m);
+  ModeEnum mode = UNKNOWN_MODE;
+  ID id = SYM2ID(m);
-	if (id == rb_intern("counter")) {
-		mode = CTR_MODE;
-	}
-#	define BLOCK_MODE_X(c, s) \
-		else if (id == rb_intern(# s)) { \
-			mode = c ## _MODE; \
-		}
-#	include "defs/block_modes.def"
-	return mode;
+  if (id == rb_intern("counter")) {
+    mode = CTR_MODE;
+  }
+#  define BLOCK_MODE_X(c, s) \
+    else if (id == rb_intern(# s)) { \
+      mode = c ## _MODE; \
+    }
+#  include "defs/block_modes.def"
+  return mode;
 }
 static PaddingEnum padding_sym_to_const(VALUE p)
 {
-	PaddingEnum padding = UNKNOWN_PADDING;
-	ID id = SYM2ID(p);
-	if (id == rb_intern("none")) {
-		padding = NO_PADDING;
-	}
-	else if (id == rb_intern("zeroes")) {
-		padding = ZEROS_PADDING;
-	}
-	else if (id == rb_intern("one_and_zeroes")) {
-		padding = ONE_AND_ZEROS_PADDING;
-	}
-#	define PADDING_X(c, s) \
-		else if (id == rb_intern(# s)) { \
-			padding = c ## _PADDING; \
-		}
-#	include "defs/paddings.def"
-	return padding;
+  PaddingEnum padding = UNKNOWN_PADDING;
+  ID id = SYM2ID(p);
+  if (id == rb_intern("none")) {
+    padding = NO_PADDING;
+  }
+  else if (id == rb_intern("zeroes")) {
+    padding = ZEROS_PADDING;
+  }
+  else if (id == rb_intern("one_and_zeroes")) {
+    padding = ONE_AND_ZEROS_PADDING;
+  }
+#  define PADDING_X(c, s) \
+    else if (id == rb_intern(# s)) { \
+      padding = c ## _PADDING; \
+    }
+#  include "defs/paddings.def"
+  return padding;
 }
 static RNGEnum rng_sym_to_const(VALUE r)
 {
-	RNGEnum rng = UNKNOWN_RNG;
-	ID id = SYM2ID(r);
+  RNGEnum rng = UNKNOWN_RNG;
+  ID id = SYM2ID(r);
-	if (false) {
-		// no-op so we can use our x-macro
-	}
-#	define RNG_X(c, s) \
-		else if (id == rb_intern(# s)) { \
-			rng = c ## _RNG; \
-		}
-#	include "defs/rngs.def"
-	return rng;
+  if (false) {
+    // no-op so we can use our x-macro
+  }
+#  define RNG_X(c, s) \
+    else if (id == rb_intern(# s)) { \
+      rng = c ## _RNG; \
+    }
+#  include "defs/rngs.def"
+  return rng;
 }
 /* See if a cipher algorithm is enabled. */
 static bool cipher_enabled(CipherEnum cipher)
 {
-	switch (cipher) {
-#		define CIPHER_ALGORITHM_X(klass, r, c, s) \
-			case r ##_CIPHER:
-#		include "defs/ciphers.def"
-			return true;
-	}
-	return false;
+  switch (cipher) {
+#    define CIPHER_ALGORITHM_X(klass, r, c, s) \
+      case r ##_CIPHER:
+#    include "defs/ciphers.def"
+      return true;
+  }
+  return false;
 }
 /* Figure out options for a cipher. We only check for Symbols, not Strings. */
 static void cipher_options(VALUE self, VALUE options)
 {
-	Check_Type(options, T_HASH);
-	{
-		VALUE plaintext = rb_hash_aref(options, ID2SYM(rb_intern("plaintext")));
-		VALUE plaintext_hex = rb_hash_aref(options, ID2SYM(rb_intern("plaintext_hex")));
-		if (!NIL_P(plaintext) && !NIL_P(plaintext_hex)) {
-			rb_raise(rb_eCryptoPP_Error, "can't set both plaintext and plaintext_hex in options");
-		}
-		else if (!NIL_P(plaintext)) {
-			cipher_plaintext_eq(self, plaintext, false);
-		}
-		else if (!NIL_P(plaintext_hex)) {
-			cipher_plaintext_eq(self, plaintext_hex, true);
-		}
-	}
-	{
-		VALUE ciphertext = rb_hash_aref(options, ID2SYM(rb_intern("ciphertext")));
-		VALUE ciphertext_hex = rb_hash_aref(options, ID2SYM(rb_intern("ciphertext_hex")));
-		if (!NIL_P(ciphertext) && !NIL_P(ciphertext_hex)) {
-			rb_raise(rb_eCryptoPP_Error, "can't set both ciphertext and ciphertext_hex in options");
-		}
-		else if (!NIL_P(ciphertext)) {
-			cipher_ciphertext_eq(self, ciphertext, false);
-		}
-		else if (!NIL_P(ciphertext_hex)) {
-			cipher_ciphertext_eq(self, ciphertext_hex, true);
-		}
-	}
-	{
-		VALUE key = rb_hash_aref(options, ID2SYM(rb_intern("key")));
-		VALUE key_hex = rb_hash_aref(options, ID2SYM(rb_intern("key_hex")));
-		if (!NIL_P(key) && !NIL_P(key_hex)) {
-			rb_raise(rb_eCryptoPP_Error, "can't set both key and key_hex in options");
-		}
-		else if (!NIL_P(key)) {
-			cipher_key_eq(self, key, false);
-		}
-		else if (!NIL_P(key_hex)) {
-			cipher_key_eq(self, key_hex, true);
-		}
-	}
-	{
-		VALUE key_length = rb_hash_aref(options, ID2SYM(rb_intern("key_length")));
-		if (!NIL_P(key_length)) {
-			rb_cipher_key_length_eq(self, key_length);
-		}
-	}
-#	if ENABLED_RC2_CIPHER
-	{
-		VALUE effective_key_length = rb_hash_aref(options, ID2SYM(rb_intern("effective_key_length")));
-		if (!NIL_P(effective_key_length)) {
-			rb_cipher_effective_key_length_eq(self, effective_key_length);
-		}
-	}
-#	endif
-	{
-		VALUE rounds = rb_hash_aref(options, ID2SYM(rb_intern("rounds")));
-		if (!NIL_P(rounds)) {
-			rb_cipher_rounds_eq(self, rounds);
-		}
-	}
-	{
-		VALUE rng = rb_hash_aref(options, ID2SYM(rb_intern("rng")));
-		if (!NIL_P(rng)) {
-			rb_cipher_rng_eq(self, rng);
-		}
-	}
-	{
-		VALUE rand_iv = rb_hash_aref(options, ID2SYM(rb_intern("rand_iv")));
-		VALUE iv = rb_hash_aref(options, ID2SYM(rb_intern("iv")));
-		VALUE iv_hex = rb_hash_aref(options, ID2SYM(rb_intern("iv_hex")));
-		if (!NIL_P(rand_iv) && (!NIL_P(iv) || !NIL_P(iv_hex))) {
-			rb_raise(rb_eCryptoPP_Error, "can't set both rand_iv and iv or iv_hex in options");
-		}
-		else if (!NIL_P(iv) && !NIL_P(iv_hex)) {
-			rb_raise(rb_eCryptoPP_Error, "can't set both iv and iv_hex in options");
-		}
-		else if (!NIL_P(rand_iv)) {
-			cipher_rand_iv(self, rand_iv);
-		}
-		else if (!NIL_P(iv)) {
-			cipher_iv_eq(self, iv, false);
-		}
-		else if (!NIL_P(iv_hex)) {
-			cipher_iv_eq(self, iv_hex, true);
-		}
-	}
-	{
-		VALUE block_mode = rb_hash_aref(options, ID2SYM(rb_intern("block_mode")));
-		if (!NIL_P(block_mode)) {
-			rb_cipher_block_mode_eq(self, block_mode);
-		}
-	}
-	{
-		VALUE padding = rb_hash_aref(options, ID2SYM(rb_intern("padding")));
-		if (!NIL_P(padding)) {
-			rb_cipher_padding_eq(self, padding);
-		}
-	}
+  Check_Type(options, T_HASH);
+  {
+    VALUE plaintext = rb_hash_aref(options, ID2SYM(rb_intern("plaintext")));
+    VALUE plaintext_hex = rb_hash_aref(options, ID2SYM(rb_intern("plaintext_hex")));
+    if (!NIL_P(plaintext) && !NIL_P(plaintext_hex)) {
+      rb_raise(rb_eCryptoPP_Error, "can't set both plaintext and plaintext_hex in options");
+    }
+    else if (!NIL_P(plaintext)) {
+      cipher_plaintext_eq(self, plaintext, false);
+    }
+    else if (!NIL_P(plaintext_hex)) {
+      cipher_plaintext_eq(self, plaintext_hex, true);
+    }
+  }
+  {
+    VALUE ciphertext = rb_hash_aref(options, ID2SYM(rb_intern("ciphertext")));
+    VALUE ciphertext_hex = rb_hash_aref(options, ID2SYM(rb_intern("ciphertext_hex")));
+    if (!NIL_P(ciphertext) && !NIL_P(ciphertext_hex)) {
+      rb_raise(rb_eCryptoPP_Error, "can't set both ciphertext and ciphertext_hex in options");
+    }
+    else if (!NIL_P(ciphertext)) {
+      cipher_ciphertext_eq(self, ciphertext, false);
+    }
+    else if (!NIL_P(ciphertext_hex)) {
+      cipher_ciphertext_eq(self, ciphertext_hex, true);
+    }
+  }
+  {
+    VALUE key = rb_hash_aref(options, ID2SYM(rb_intern("key")));
+    VALUE key_hex = rb_hash_aref(options, ID2SYM(rb_intern("key_hex")));
+    if (!NIL_P(key) && !NIL_P(key_hex)) {
+      rb_raise(rb_eCryptoPP_Error, "can't set both key and key_hex in options");
+    }
+    else if (!NIL_P(key)) {
+      cipher_key_eq(self, key, false);
+    }
+    else if (!NIL_P(key_hex)) {
+      cipher_key_eq(self, key_hex, true);
+    }
+  }
+  {
+    VALUE key_length = rb_hash_aref(options, ID2SYM(rb_intern("key_length")));
+    if (!NIL_P(key_length)) {
+      rb_cipher_key_length_eq(self, key_length);
+    }
+  }
+#  if ENABLED_RC2_CIPHER
+  {
+    VALUE effective_key_length = rb_hash_aref(options, ID2SYM(rb_intern("effective_key_length")));
+    if (!NIL_P(effective_key_length)) {
+      rb_cipher_effective_key_length_eq(self, effective_key_length);
+    }
+  }
+#  endif
+  {
+    VALUE rounds = rb_hash_aref(options, ID2SYM(rb_intern("rounds")));
+    if (!NIL_P(rounds)) {
+      rb_cipher_rounds_eq(self, rounds);
+    }
+  }
+  {
+    VALUE rng = rb_hash_aref(options, ID2SYM(rb_intern("rng")));
+    if (!NIL_P(rng)) {
+      rb_cipher_rng_eq(self, rng);
+    }
+  }
+  {
+    VALUE rand_iv = rb_hash_aref(options, ID2SYM(rb_intern("rand_iv")));
+    VALUE iv = rb_hash_aref(options, ID2SYM(rb_intern("iv")));
+    VALUE iv_hex = rb_hash_aref(options, ID2SYM(rb_intern("iv_hex")));
+    if (!NIL_P(rand_iv) && (!NIL_P(iv) || !NIL_P(iv_hex))) {
+      rb_raise(rb_eCryptoPP_Error, "can't set both rand_iv and iv or iv_hex in options");
+    }
+    else if (!NIL_P(iv) && !NIL_P(iv_hex)) {
+      rb_raise(rb_eCryptoPP_Error, "can't set both iv and iv_hex in options");
+    }
+    else if (!NIL_P(rand_iv)) {
+      cipher_rand_iv(self, rand_iv);
+    }
+    else if (!NIL_P(iv)) {
+      cipher_iv_eq(self, iv, false);
+    }
+    else if (!NIL_P(iv_hex)) {
+      cipher_iv_eq(self, iv_hex, true);
+    }
+  }
+  {
+    VALUE block_mode = rb_hash_aref(options, ID2SYM(rb_intern("block_mode")));
+    if (!NIL_P(block_mode)) {
+      rb_cipher_block_mode_eq(self, block_mode);
+    }
+  }
+  {
+    VALUE padding = rb_hash_aref(options, ID2SYM(rb_intern("padding")));
+    if (!NIL_P(padding)) {
+      rb_cipher_padding_eq(self, padding);
+    }
+  }
 }
@@ -282,43 +282,43 @@ static void cipher_options(VALUE self, VALUE options)
  * is found. May throw a JException if no suitable cipher is found. */
 static JBase* cipher_factory(VALUE algorithm)
 {
-	try {
-		switch (cipher_sym_to_const(algorithm)) {
-			default:
-				throw JException("the requested algorithm cannot be found");
-			break;
+  try {
+    switch (cipher_sym_to_const(algorithm)) {
+      default:
+        throw JException("the requested algorithm cannot be found");
+      break;
-#			define CIPHER_ALGORITHM_X(klass, r, c, s) \
-				case r ## _CIPHER: \
-					return static_cast<c*>(new c);
-#			include "defs/ciphers.def"
-		}
-	}
-	catch (Exception e) {
-		throw JException("Crypto++ exception: " + e.GetWhat());
-	}
+#      define CIPHER_ALGORITHM_X(klass, r, c, s) \
+        case r ## _CIPHER: \
+          return static_cast<c*>(new c);
+#      include "defs/ciphers.def"
+    }
+  }
+  catch (Exception e) {
+    throw JException("Crypto++ exception: " + e.GetWhat());
+  }
 }
 /* Wraps a Cipher object into a Ruby object. May throw a JException if no
  * suitable Cipher is found. */
 static VALUE wrap_cipher_in_ruby(JBase* cipher)
 {
-	const type_info& info = typeid(*cipher);
-#	define CIPHER_ALGORITHM_X(klass, r, c, s) \
-		if (info == typeid(c)) { \
-			return Data_Wrap_Struct(rb_cCryptoPP_Cipher_## r, cipher_mark, cipher_free, cipher); \
-		} \
-		else
-#	include "defs/ciphers.def"
-	{
-		throw JException("the requested algorithm has been disabled");
-	}
+  const type_info& info = typeid(*cipher);
+#  define CIPHER_ALGORITHM_X(klass, r, c, s) \
+    if (info == typeid(c)) { \
+      return Data_Wrap_Struct(rb_cCryptoPP_Cipher_## r, cipher_mark, cipher_free, cipher); \
+    } \
+    else
+#  include "defs/ciphers.def"
+  {
+    throw JException("the requested algorithm has been disabled");
+  }
 }
 /**
- *	call-seq:
- *		cipher_factory(algorithm)           => Cipher
- *		cipher_factory(algorithm, options)  => Cipher
+ *  call-seq:
+ *    cipher_factory(algorithm)           => Cipher
+ *    cipher_factory(algorithm, options)  => Cipher
  *
  * Creates a new Cipher object.
  *
@@ -326,35 +326,35 @@ static VALUE wrap_cipher_in_ruby(JBase* cipher)
  */
 VALUE rb_module_cipher_factory(int argc, VALUE *argv, VALUE self)
 {
-	VALUE algorithm, options, retval;
-	rb_scan_args(argc, argv, "11", &algorithm, &options);
-	try {
-		retval = wrap_cipher_in_ruby(cipher_factory(algorithm));
-	}
-	catch (Exception& e) {
-		rb_raise(rb_eCryptoPP_Error, e.GetWhat().c_str());
-	}
-	if (!NIL_P(options)) {
-		cipher_options(retval, options);
-	}
-	return retval;
+  VALUE algorithm, options, retval;
+  rb_scan_args(argc, argv, "11", &algorithm, &options);
+  try {
+    retval = wrap_cipher_in_ruby(cipher_factory(algorithm));
+  }
+  catch (Exception& e) {
+    rb_raise(rb_eCryptoPP_Error, "%s", e.GetWhat().c_str());
+  }
+  if (!NIL_P(options)) {
+    cipher_options(retval, options);
+  }
+  return retval;
 }
 #define CIPHER_ALGORITHM_X(klass, r, n, s) \
 VALUE rb_cipher_ ## r ##_new(int argc, VALUE *argv, VALUE self) \
 { \
-	VALUE options, retval; \
-	rb_scan_args(argc, argv, "01", &options); \
-	try { \
-		retval = wrap_cipher_in_ruby(cipher_factory(ID2SYM(rb_intern(# s)))); \
-	} \
-	catch (Exception& e) { \
-		rb_raise(rb_eCryptoPP_Error, e.GetWhat().c_str()); \
-	} \
-	if (!NIL_P(options)) { \
-		cipher_options(retval, options); \
-	} \
-	return retval; \
+  VALUE options, retval; \
+  rb_scan_args(argc, argv, "01", &options); \
+  try { \
+    retval = wrap_cipher_in_ruby(cipher_factory(ID2SYM(rb_intern(# s)))); \
+  } \
+  catch (Exception& e) { \
+    rb_raise(rb_eCryptoPP_Error, "%s", e.GetWhat().c_str()); \
+  } \
+  if (!NIL_P(options)) { \
+    cipher_options(retval, options); \
+  } \
+  return retval; \
 }
 #include "defs/ciphers.def"
@@ -362,15 +362,15 @@ VALUE rb_cipher_ ## r ##_new(int argc, VALUE *argv, VALUE self) \
 /* Creates a random initialization vector on the cipher. */
 static void cipher_rand_iv(VALUE self, VALUE l)
 {
-	JBase *cipher = NULL;
-	unsigned int length = NUM2UINT(rb_funcall(l, rb_intern("to_i"), 0));
-	Data_Get_Struct(self, JBase, cipher);
-	cipher->setRandIV(length);
+  JBase *cipher = NULL;
+  unsigned int length = NUM2UINT(rb_funcall(l, rb_intern("to_i"), 0));
+  Data_Get_Struct(self, JBase, cipher);
+  cipher->setRandIV(length);
 }
 /**
  * call-seq:
- *		rand_iv(length) => nil
+ *    rand_iv(length) => nil
  *
  * Sets a random initialization vector on the Cipher. This method uses the
  * random number generator set on the Cipher to produce the IV, so be sure to
@@ -380,135 +380,135 @@ static void cipher_rand_iv(VALUE self, VALUE l)
  */
 VALUE rb_cipher_rand_iv(VALUE self, VALUE l)
 {
-	JBase *cipher = NULL;
-	unsigned int length = NUM2UINT(rb_funcall(l, rb_intern("to_i"), 0));
-	Data_Get_Struct(self, JBase, cipher);
-	cipher->setRandIV(length);
-	return l;
+  JBase *cipher = NULL;
+  unsigned int length = NUM2UINT(rb_funcall(l, rb_intern("to_i"), 0));
+  Data_Get_Struct(self, JBase, cipher);
+  cipher->setRandIV(length);
+  return l;
 }
 /* Sets an IV on the cipher. */
 static string cipher_iv_eq(VALUE self, VALUE iv, bool hex)
 {
-	JBase *cipher = NULL;
-	Check_Type(iv, T_STRING);
-	Data_Get_Struct(self, JBase, cipher);
-	cipher->setIV(string(StringValuePtr(iv), RSTRING(iv)->len), hex);
-	return cipher->getIV(hex);
+  JBase *cipher = NULL;
+  Check_Type(iv, T_STRING);
+  Data_Get_Struct(self, JBase, cipher);
+  cipher->setIV(string(StringValuePtr(iv), RSTRING_LEN(iv)), hex);
+  return cipher->getIV(hex);
 }
 /**
  * call-seq:
- *		iv=(iv) => String
+ *    iv=(iv) => String
  *
  * Set an initialization vector on the Cipher.
  */
 VALUE rb_cipher_iv_eq(VALUE self, VALUE iv)
 {
-	cipher_iv_eq(self, iv, false);
-	return iv;
+  cipher_iv_eq(self, iv, false);
+  return iv;
 }
 /**
  * call-seq:
- *		iv_hex=(iv) => String
+ *    iv_hex=(iv) => String
  *
  * Set an initialization vector on the Cipher. This method uses hex data and
  * returns the IV as set.
  */
 VALUE rb_cipher_iv_hex_eq(VALUE self, VALUE iv)
 {
-	cipher_iv_eq(self, iv, true);
-	return iv;
+  cipher_iv_eq(self, iv, true);
+  return iv;
 }
 /* Gets the IV. */
 static string cipher_iv(VALUE self, bool hex)
 {
-	JBase *cipher = NULL;
-	Data_Get_Struct(self, JBase, cipher);
-	return cipher->getIV(hex);
+  JBase *cipher = NULL;
+  Data_Get_Struct(self, JBase, cipher);
+  return cipher->getIV(hex);
 }
 /**
  * call-seq:
- *		iv => String
+ *    iv => String
  *
  * Returns the Cipher's IV in binary.
  */
 VALUE rb_cipher_iv(VALUE self)
 {
-	string retval = cipher_iv(self, false);
-	return rb_tainted_str_new(retval.data(), retval.length());
+  string retval = cipher_iv(self, false);
+  return rb_tainted_str_new(retval.data(), retval.length());
 }
 /**
  * call-seq:
- *		iv => String
+ *    iv => String
  *
  * Returns the Cipher's IV in hex.
  */
 VALUE rb_cipher_iv_hex(VALUE self)
 {
-	string retval = cipher_iv(self, true);
-	return rb_tainted_str_new(retval.data(), retval.length());
+  string retval = cipher_iv(self, true);
+  return rb_tainted_str_new(retval.data(), retval.length());
 }
 /**
  * call-seq:
- *		block_mode=(mode) => Symbol
+ *    block_mode=(mode) => Symbol
  *
  * Set the block mode on block ciphers. Returns the mode as set and may raise
  * a CryptoPPError if the mode is invalid or you are using a stream cipher.
  */
 VALUE rb_cipher_block_mode_eq(VALUE self, VALUE m)
 {
-	JBase *cipher = NULL;
-	ModeEnum mode = mode_sym_to_const(m);
+  JBase *cipher = NULL;
+  ModeEnum mode = mode_sym_to_const(m);
-	if (!VALID_MODE(mode)) {
-		rb_raise(rb_eCryptoPP_Error, "invalid cipher mode");
-	}
-	Data_Get_Struct(self, JBase, cipher);
-	if (IS_STREAM_CIPHER(cipher->getCipherType())) {
-		rb_raise(rb_eCryptoPP_Error, "can't set mode on stream ciphers");
-	}
-	else {
-		((JCipher*) cipher)->setMode(mode);
-		return m;
-	}
+  if (!VALID_MODE(mode)) {
+    rb_raise(rb_eCryptoPP_Error, "invalid cipher mode");
+  }
+  Data_Get_Struct(self, JBase, cipher);
+  if (IS_STREAM_CIPHER(cipher->getCipherType())) {
+    rb_raise(rb_eCryptoPP_Error, "can't set mode on stream ciphers");
+  }
+  else {
+    ((JCipher*) cipher)->setMode(mode);
+    return m;
+  }
 }
 /**
  * call-seq:
- *		block_mode => Fixnum
+ *    block_mode => Fixnum
  *
  * Get the block mode. Returns <tt>nil</tt> if you try to use this on a stream
  * cipher.
  */
 VALUE rb_cipher_block_mode(VALUE self)
 {
-	JBase *cipher = NULL;
-	Data_Get_Struct(self, JBase, cipher);
-	ModeEnum mode = ((JCipher*) cipher)->getMode();
-	if (IS_STREAM_CIPHER(cipher->getCipherType())) {
-		return Qnil;
-	}
-#	define BLOCK_MODE_X(c, s) \
-		else if (mode == c ## _MODE) { \
-			return ID2SYM(rb_intern(# s)); \
-		}
-#	include "defs/block_modes.def"
+  JBase *cipher = NULL;
+  Data_Get_Struct(self, JBase, cipher);
+  ModeEnum mode = ((JCipher*) cipher)->getMode();
+  if (IS_STREAM_CIPHER(cipher->getCipherType())) {
+    return Qnil;
+  }
+#  define BLOCK_MODE_X(c, s) \
+    else if (mode == c ## _MODE) { \
+      return ID2SYM(rb_intern(# s)); \
+    }
+#  include "defs/block_modes.def"
 }
 /**
  * call-seq:
- *		padding=(padding) => Symbol
+ *    padding=(padding) => Symbol
  *
  * Set the padding on block ciphers.
  *
@@ -521,54 +521,54 @@ VALUE rb_cipher_block_mode(VALUE self)
  */
 VALUE rb_cipher_padding_eq(VALUE self, VALUE p)
 {
-	JBase *cipher = NULL;
-	PaddingEnum padding = padding_sym_to_const(p);
+  JBase *cipher = NULL;
+  PaddingEnum padding = padding_sym_to_const(p);
-	if (!VALID_PADDING(padding)) {
-		rb_raise(rb_eCryptoPP_Error, "invalid cipher padding");
-	}
-	Data_Get_Struct(self, JBase, cipher);
-	if (IS_STREAM_CIPHER(cipher->getCipherType())) {
-		rb_raise(rb_eCryptoPP_Error, "can't set padding on stream ciphers");
-	}
-	else {
-		((JCipher*) cipher)->setPadding(padding);
-		if (((JCipher*) cipher)->getPadding() != padding) {
-			rb_raise(rb_eCryptoPP_Error, "Padding '%s' cannot be used with mode '%s'", JCipher::getPaddingName(padding).c_str(), ((JCipher*) cipher)->getModeName().c_str());
-		}
-		else {
-			return p;
-		}
-	}
+  if (!VALID_PADDING(padding)) {
+    rb_raise(rb_eCryptoPP_Error, "invalid cipher padding");
+  }
+  Data_Get_Struct(self, JBase, cipher);
+  if (IS_STREAM_CIPHER(cipher->getCipherType())) {
+    rb_raise(rb_eCryptoPP_Error, "can't set padding on stream ciphers");
+  }
+  else {
+    ((JCipher*) cipher)->setPadding(padding);
+    if (((JCipher*) cipher)->getPadding() != padding) {
+      rb_raise(rb_eCryptoPP_Error, "Padding '%s' cannot be used with mode '%s'", JCipher::getPaddingName(padding).c_str(), ((JCipher*) cipher)->getModeName().c_str());
+    }
+    else {
+      return p;
+    }
+  }
 }
 /**
  * call-seq:
- *		padding => Fixnum
+ *    padding => Fixnum
  *
  * Get the cipher padding being used. Returns <tt>nil</tt> if you try to use
  * this on a stream cipher.
  */
 VALUE rb_cipher_padding(VALUE self)
 {
-	JBase *cipher = NULL;
-	Data_Get_Struct(self, JBase, cipher);
-	PaddingEnum padding = ((JCipher*) cipher)->getPadding();
-	if (IS_STREAM_CIPHER(cipher->getCipherType())) {
-		return Qnil;
-	}
-#	define PADDING_X(c, s) \
-		else if (padding == c ## _PADDING) { \
-			return ID2SYM(rb_intern(# s)); \
-		}
-#	include "defs/paddings.def"
+  JBase *cipher = NULL;
+  Data_Get_Struct(self, JBase, cipher);
+  PaddingEnum padding = ((JCipher*) cipher)->getPadding();
+  if (IS_STREAM_CIPHER(cipher->getCipherType())) {
+    return Qnil;
+  }
+#  define PADDING_X(c, s) \
+    else if (padding == c ## _PADDING) { \
+      return ID2SYM(rb_intern(# s)); \
+    }
+#  include "defs/paddings.def"
 }
 /**
  * call-seq:
- *		rng=(rng) => Symbol
+ *    rng=(rng) => Symbol
  *
  * Set the random number generator to use for IVs. A CryptoPPError will be
  * raised if an RNG is not available on the system.
@@ -579,178 +579,178 @@ VALUE rb_cipher_padding(VALUE self)
  */
 VALUE rb_cipher_rng_eq(VALUE self, VALUE r)
 {
-	JBase *cipher = NULL;
-	RNGEnum rng = rng_sym_to_const(r);
+  JBase *cipher = NULL;
+  RNGEnum rng = rng_sym_to_const(r);
-	if (!VALID_RNG(rng)) {
-		rb_raise(rb_eCryptoPP_Error, "invalid cipher RNG");
-	}
-	Data_Get_Struct(self, JBase, cipher);
-	((JCipher*) cipher)->setRNG(rng);
-	if (((JCipher*) cipher)->getRNG() != rng) {
-		rb_raise(rb_eCryptoPP_Error, "RNG '%s' is unavailable", JBase::getRNGName(rng).c_str());
-	}
-	else {
-		return r;
-	}
+  if (!VALID_RNG(rng)) {
+    rb_raise(rb_eCryptoPP_Error, "invalid cipher RNG");
+  }
+  Data_Get_Struct(self, JBase, cipher);
+  ((JCipher*) cipher)->setRNG(rng);
+  if (((JCipher*) cipher)->getRNG() != rng) {
+    rb_raise(rb_eCryptoPP_Error, "RNG '%s' is unavailable", JBase::getRNGName(rng).c_str());
+  }
+  else {
+    return r;
+  }
 }
 /**
  * call-seq:
- *		rng => Fixnum
+ *    rng => Fixnum
  *
  * Get the RNG being used.
  */
 VALUE rb_cipher_rng(VALUE self)
 {
-	JBase *cipher = NULL;
-	Data_Get_Struct(self, JBase, cipher);
-	RNGEnum rng = ((JCipher*) cipher)->getRNG();
-	if (false) {
-		// no-op so we can use our x-macro
-	}
-#	define RNG_X(c, s) \
-		else if (rng == c ## _RNG) { \
-			return ID2SYM(rb_intern(# s)); \
-		}
-#	include "defs/rngs.def"
+  JBase *cipher = NULL;
+  Data_Get_Struct(self, JBase, cipher);
+  RNGEnum rng = ((JCipher*) cipher)->getRNG();
+  if (false) {
+    // no-op so we can use our x-macro
+  }
+#  define RNG_X(c, s) \
+    else if (rng == c ## _RNG) { \
+      return ID2SYM(rb_intern(# s)); \
+    }
+#  include "defs/rngs.def"
 }
 /* Set the plaintext. */
 static string cipher_plaintext_eq(VALUE self, VALUE plaintext, bool hex)
 {
-	JBase *cipher = NULL;
-	Check_Type(plaintext, T_STRING);
-	Data_Get_Struct(self, JBase, cipher);
-	cipher->setPlaintext(string(StringValuePtr(plaintext), RSTRING(plaintext)->len), hex);
-	return cipher->getPlaintext(hex);
+  JBase *cipher = NULL;
+  Check_Type(plaintext, T_STRING);
+  Data_Get_Struct(self, JBase, cipher);
+  cipher->setPlaintext(string(StringValuePtr(plaintext), RSTRING_LEN(plaintext)), hex);
+  return cipher->getPlaintext(hex);
 }
 /**
  * call-seq:
- *		plaintext=(string) => String
+ *    plaintext=(string) => String
  *
  * Sets the plaintext on the Cipher in binary and returns the same.
  */
 VALUE rb_cipher_plaintext_eq(VALUE self, VALUE plaintext)
 {
-	cipher_plaintext_eq(self, plaintext, false);
-	return plaintext;
+  cipher_plaintext_eq(self, plaintext, false);
+  return plaintext;
 }
 /**
  * call-seq:
- *		plaintext_hex=(string) => String
+ *    plaintext_hex=(string) => String
  *
  * Sets the plaintext on the Cipher in hex and returns the same.
  */
 VALUE rb_cipher_plaintext_hex_eq(VALUE self, VALUE plaintext)
 {
-	cipher_plaintext_eq(self, plaintext, true);
-	return plaintext;
+  cipher_plaintext_eq(self, plaintext, true);
+  return plaintext;
 }
 /* Get the plaintext. */
 static string cipher_plaintext(VALUE self, bool hex)
 {
-	JBase *cipher = NULL;
-	Data_Get_Struct(self, JBase, cipher);
-	return cipher->getPlaintext(hex);
+  JBase *cipher = NULL;
+  Data_Get_Struct(self, JBase, cipher);
+  return cipher->getPlaintext(hex);
 }
 /**
  * call-seq:
- *		plaintext => String
+ *    plaintext => String
  *
  * Gets the plaintext from the Cipher in binary.
  */
 VALUE rb_cipher_plaintext(VALUE self)
 {
-	string retval = cipher_plaintext(self, false);
-	return rb_tainted_str_new(retval.data(), retval.length());
+  string retval = cipher_plaintext(self, false);
+  return rb_tainted_str_new(retval.data(), retval.length());
 }
 /**
  * call-seq:
- *		plaintext_hex => String
+ *    plaintext_hex => String
  *
  * Gets the plaintext from the Cipher in hex.
  */
 VALUE rb_cipher_plaintext_hex(VALUE self)
 {
-	string retval = cipher_plaintext(self, true);
-	return rb_tainted_str_new(retval.data(), retval.length());
+  string retval = cipher_plaintext(self, true);
+  return rb_tainted_str_new(retval.data(), retval.length());
 }
 /* Set the ciphertext. */
 static string cipher_ciphertext_eq(VALUE self, VALUE ciphertext, bool hex)
 {
-	JBase *cipher = NULL;
-	Check_Type(ciphertext, T_STRING);
-	Data_Get_Struct(self, JBase, cipher);
-	cipher->setCiphertext(string(StringValuePtr(ciphertext), RSTRING(ciphertext)->len), hex);
-	return cipher->getCiphertext(hex);
+  JBase *cipher = NULL;
+  Check_Type(ciphertext, T_STRING);
+  Data_Get_Struct(self, JBase, cipher);
+  cipher->setCiphertext(string(StringValuePtr(ciphertext), RSTRING_LEN(ciphertext)), hex);
+  return cipher->getCiphertext(hex);
 }
 /**
  * call-seq:
- *		ciphertext=(string) => String
+ *    ciphertext=(string) => String
  *
  * Sets the ciphertext on the Cipher in binary and returns the same.
  */
 VALUE rb_cipher_ciphertext_eq(VALUE self, VALUE ciphertext)
 {
-	cipher_ciphertext_eq(self, ciphertext, false);
-	return ciphertext;
+  cipher_ciphertext_eq(self, ciphertext, false);
+  return ciphertext;
 }
 /**
  * call-seq:
- *		ciphertext_hex=(string) => String
+ *    ciphertext_hex=(string) => String
  *
  * Sets the ciphertext on the Cipher in hex and returns the same.
  */
 VALUE rb_cipher_ciphertext_hex_eq(VALUE self, VALUE ciphertext)
 {
-	cipher_ciphertext_eq(self, ciphertext, true);
-	return ciphertext;
+  cipher_ciphertext_eq(self, ciphertext, true);
+  return ciphertext;
 }
 /* Get the ciphertext. */
 static string cipher_ciphertext(VALUE self, bool hex)
 {
-	JBase *cipher = NULL;
-	Data_Get_Struct(self, JBase, cipher);
-	return cipher->getCiphertext(hex);
+  JBase *cipher = NULL;
+  Data_Get_Struct(self, JBase, cipher);
+  return cipher->getCiphertext(hex);
 }
 /**
  * call-seq:
- *		ciphertext => String
+ *    ciphertext => String
  *
  * Gets the ciphertext from the Cipher in binary.
  */
 VALUE rb_cipher_ciphertext(VALUE self)
 {
-	string retval = cipher_ciphertext(self, false);
-	return rb_tainted_str_new(retval.data(), retval.length());
+  string retval = cipher_ciphertext(self, false);
+  return rb_tainted_str_new(retval.data(), retval.length());
 }
 /**
  * call-seq:
- *		ciphertext_hex => String
+ *    ciphertext_hex => String
  *
  * Gets the ciphertext from the Cipher in hex.
  */
 VALUE rb_cipher_ciphertext_hex(VALUE self)
 {
-	string retval = cipher_ciphertext(self, true);
-	return rb_tainted_str_new(retval.data(), retval.length());
+  string retval = cipher_ciphertext(self, true);
+  return rb_tainted_str_new(retval.data(), retval.length());
 }
@@ -759,16 +759,16 @@ VALUE rb_cipher_ciphertext_hex(VALUE self)
  * of 12 bytes, while Blowfish can use keys of 1 to 72 bytes. */
 static string cipher_key_eq(VALUE self, VALUE key, bool hex)
 {
-	JBase *cipher = NULL;
-	Check_Type(key, T_STRING);
-	Data_Get_Struct(self, JBase, cipher);
-	cipher->setKey(string(StringValuePtr(key), RSTRING(key)->len), hex);
-	return cipher->getKey(hex);
+  JBase *cipher = NULL;
+  Check_Type(key, T_STRING);
+  Data_Get_Struct(self, JBase, cipher);
+  cipher->setKey(string(StringValuePtr(key), RSTRING_LEN(key)), hex);
+  return cipher->getKey(hex);
 }
 /**
  * call-seq:
- *		key=(string) => String
+ *    key=(string) => String
  *
  * Sets the key on the Cipher in binary and returns the same. Note that the
  * key try to set may be truncated or padded depending on its length. Some
@@ -785,13 +785,13 @@ static string cipher_key_eq(VALUE self, VALUE key, bool hex)
  */
 VALUE rb_cipher_key_eq(VALUE self, VALUE key)
 {
-	cipher_key_eq(self, key, false);
-	return key;
+  cipher_key_eq(self, key, false);
+  return key;
 }
 /**
  * call-seq:
- *		key_hex=(string) => String
+ *    key_hex=(string) => String
  *
  * Sets the key on the Cipher in hex and returns the same. Note that the
  * key try to set may be truncated or padded depending on its length. Some
@@ -808,47 +808,47 @@ VALUE rb_cipher_key_eq(VALUE self, VALUE key)
  */
 VALUE rb_cipher_key_hex_eq(VALUE self, VALUE key)
 {
-	cipher_key_eq(self, key, true);
-	return key;
+  cipher_key_eq(self, key, true);
+  return key;
 }
 /* Get the key. */
 static string cipher_key(VALUE self, bool hex)
 {
-	JBase *cipher = NULL;
-	Data_Get_Struct(self, JBase, cipher);
-	return cipher->getKey(hex);
+  JBase *cipher = NULL;
+  Data_Get_Struct(self, JBase, cipher);
+  return cipher->getKey(hex);
 }
 /**
  * call-seq:
- *		key => String
+ *    key => String
  *
  * Returns the key set on the Cipher in binary.
  */
 VALUE rb_cipher_key(VALUE self)
 {
-	string retval = cipher_key(self, false);
-	return rb_tainted_str_new(retval.data(), retval.length());
+  string retval = cipher_key(self, false);
+  return rb_tainted_str_new(retval.data(), retval.length());
 }
 /**
  * call-seq:
- *		key => String
+ *    key => String
  *
  * Returns the key set on the Cipher in hex.
  */
 VALUE rb_cipher_key_hex(VALUE self)
 {
-	string retval = cipher_key(self, true);
-	return rb_tainted_str_new(retval.data(), retval.length());
+  string retval = cipher_key(self, true);
+  return rb_tainted_str_new(retval.data(), retval.length());
 }
 /**
  * call-seq:
- *		key_length=(length) => Fixnum
+ *    key_length=(length) => Fixnum
  *
  * Sets the key length. Some ciphers require rather specific key lengths,
  * and if the key length you attempt to set is invalid, an exception will
@@ -857,31 +857,31 @@ VALUE rb_cipher_key_hex(VALUE self)
  */
 VALUE rb_cipher_key_length_eq(VALUE self, VALUE l)
 {
-	JBase *cipher = NULL;
-	unsigned int length = NUM2UINT(rb_funcall(l, rb_intern("to_i"), 0));
-	Data_Get_Struct(self, JBase, cipher);
-	cipher->setKeylength(length);
-	if (cipher->getKeylength() != length) {
-		rb_raise(rb_eCryptoPP_Error, "tried to set a key length of %d but %d was used", length, cipher->getKeylength());
-	}
-	else {
-		return l;
-	}
+  JBase *cipher = NULL;
+  unsigned int length = NUM2UINT(rb_funcall(l, rb_intern("to_i"), 0));
+  Data_Get_Struct(self, JBase, cipher);
+  cipher->setKeylength(length);
+  if (cipher->getKeylength() != length) {
+    rb_raise(rb_eCryptoPP_Error, "tried to set a key length of %d but %d was used", length, cipher->getKeylength());
+  }
+  else {
+    return l;
+  }
 }
 /**
  * call-seq:
- *		key_length => Fixnum
+ *    key_length => Fixnum
  *
  * Gets the key length. The key length being returned in terms of bytes
  * in binary, not hex characters.
  */
 VALUE rb_cipher_key_length(VALUE self)
 {
-	JBase *cipher = NULL;
-	Data_Get_Struct(self, JBase, cipher);
-	return rb_fix_new(cipher->getKeylength());
+  JBase *cipher = NULL;
+  Data_Get_Struct(self, JBase, cipher);
+  return rb_fix_new(cipher->getKeylength());
 }
@@ -890,9 +890,9 @@ VALUE rb_cipher_key_length(VALUE self)
  */
 VALUE rb_cipher_default_key_length(VALUE self)
 {
-	JBase *cipher = NULL;
-	Data_Get_Struct(self, JBase, cipher);
-	return rb_fix_new(cipher->getDefaultKeylength());
+  JBase *cipher = NULL;
+  Data_Get_Struct(self, JBase, cipher);
+  return rb_fix_new(cipher->getDefaultKeylength());
 }
 /**
@@ -900,9 +900,9 @@ VALUE rb_cipher_default_key_length(VALUE self)
  */
 VALUE rb_cipher_min_key_length(VALUE self)
 {
-	JBase *cipher = NULL;
-	Data_Get_Struct(self, JBase, cipher);
-	return rb_fix_new(cipher->getMinKeylength());
+  JBase *cipher = NULL;
+  Data_Get_Struct(self, JBase, cipher);
+  return rb_fix_new(cipher->getMinKeylength());
 }
 /**
@@ -910,9 +910,9 @@ VALUE rb_cipher_min_key_length(VALUE self)
  */
 VALUE rb_cipher_max_key_length(VALUE self)
 {
-	JBase *cipher = NULL;
-	Data_Get_Struct(self, JBase, cipher);
-	return rb_fix_new(cipher->getMaxKeylength());
+  JBase *cipher = NULL;
+  Data_Get_Struct(self, JBase, cipher);
+  return rb_fix_new(cipher->getMaxKeylength());
 }
 /**
@@ -920,9 +920,9 @@ VALUE rb_cipher_max_key_length(VALUE self)
  */
 VALUE rb_cipher_mult_key_length(VALUE self)
 {
-	JBase *cipher = NULL;
-	Data_Get_Struct(self, JBase, cipher);
-	return rb_fix_new(cipher->getMultKeylength());
+  JBase *cipher = NULL;
+  Data_Get_Struct(self, JBase, cipher);
+  return rb_fix_new(cipher->getMultKeylength());
 }
 /**
@@ -930,17 +930,17 @@ VALUE rb_cipher_mult_key_length(VALUE self)
  */
 VALUE rb_cipher_valid_key_length(VALUE self, VALUE l)
 {
-	JBase *cipher = NULL;
-	unsigned int length = NUM2UINT(l);
-	Data_Get_Struct(self, JBase, cipher);
-	return rb_fix_new(cipher->getValidKeylength(length));
+  JBase *cipher = NULL;
+  unsigned int length = NUM2UINT(l);
+  Data_Get_Struct(self, JBase, cipher);
+  return rb_fix_new(cipher->getValidKeylength(length));
 }
 #if ENABLED_RC2_CIPHER
 /**
  * call-seq:
- *		effect_key_length=(length) => Fixnum
+ *    effect_key_length=(length) => Fixnum
  *
  * Set the effective keylength on the RC2 algorithm. This function can
  * only be used with RC2. Returns the actual effective keylength set. The
@@ -948,21 +948,21 @@ VALUE rb_cipher_valid_key_length(VALUE self, VALUE l)
  */
 VALUE rb_cipher_effective_key_length_eq(VALUE self, VALUE l)
 {
-	JBase *cipher = NULL;
-	unsigned int length = NUM2UINT(rb_funcall(l, rb_intern("to_i"), 0));
-	Data_Get_Struct(self, JBase, cipher);
-	if (cipher->getCipherType() != RC2_CIPHER) {
-		rb_raise(rb_eCryptoPP_Error, "effective key lengths can only be used with the RC2 cipher");
-	}
-	else {
-		((JRC2*) cipher)->setEffectiveKeylength(length);
-		if (((JRC2*) cipher)->getEffectiveKeylength() != length) {
-			rb_raise(rb_eCryptoPP_Error, "tried to set an effective key length of %d but %d was used", length, ((JRC2*) cipher)->getEffectiveKeylength());
-		}
-		else {
-			return l;
-		}
-	}
+  JBase *cipher = NULL;
+  unsigned int length = NUM2UINT(rb_funcall(l, rb_intern("to_i"), 0));
+  Data_Get_Struct(self, JBase, cipher);
+  if (cipher->getCipherType() != RC2_CIPHER) {
+    rb_raise(rb_eCryptoPP_Error, "effective key lengths can only be used with the RC2 cipher");
+  }
+  else {
+    ((JRC2*) cipher)->setEffectiveKeylength(length);
+    if (((JRC2*) cipher)->getEffectiveKeylength() != length) {
+      rb_raise(rb_eCryptoPP_Error, "tried to set an effective key length of %d but %d was used", length, ((JRC2*) cipher)->getEffectiveKeylength());
+    }
+    else {
+      return l;
+    }
+  }
 }
@@ -972,30 +972,30 @@ VALUE rb_cipher_effective_key_length_eq(VALUE self, VALUE l)
  */
 VALUE rb_cipher_effective_key_length(VALUE self)
 {
-	JBase *cipher = NULL;
-	Data_Get_Struct(self, JBase, cipher);
-	return rb_fix_new(((JRC2*) cipher)->getEffectiveKeylength());
+  JBase *cipher = NULL;
+  Data_Get_Struct(self, JBase, cipher);
+  return rb_fix_new(((JRC2*) cipher)->getEffectiveKeylength());
 }
 #endif
 /**
  * call-seq:
- * 		block_size => Fixnum
+ *     block_size => Fixnum
  *
  * Gets the block size.
  */
 VALUE rb_cipher_block_size(VALUE self)
 {
-	JBase *cipher = NULL;
-	Data_Get_Struct(self, JBase, cipher);
-	return rb_fix_new(cipher->getBlockSize());
+  JBase *cipher = NULL;
+  Data_Get_Struct(self, JBase, cipher);
+  return rb_fix_new(cipher->getBlockSize());
 }
 /**
  * call-seq:
- *		rounds=(rounds) => Fixnum
+ *    rounds=(rounds) => Fixnum
  *
  * Sets the number of rounds to perform on block ciphers. Some block ciphers
  * have different requirements for their rounds than others. An exception
@@ -1003,41 +1003,41 @@ VALUE rb_cipher_block_size(VALUE self)
  */
 VALUE rb_cipher_rounds_eq(VALUE self, VALUE r)
 {
-	JBase *cipher = NULL;
-	unsigned int rounds = NUM2UINT(rb_funcall(r, rb_intern("to_i"), 0));
-	Data_Get_Struct(self, JBase, cipher);
-	if (IS_STREAM_CIPHER(cipher->getCipherType())) {
-		rb_raise(rb_eCryptoPP_Error, "can't set rounds on stream ciphers");
-	}
-	else {
-		((JCipher*) cipher)->setRounds(rounds);
-		if (((JCipher*) cipher)->getRounds() != rounds) {
-			rb_raise(rb_eCryptoPP_Error, "tried set the number of rounds to %d but %d was used instead", rounds, ((JCipher*) cipher)->getRounds());
-		}
-		else {
-			return r;
-		}
-	}
+  JBase *cipher = NULL;
+  unsigned int rounds = NUM2UINT(rb_funcall(r, rb_intern("to_i"), 0));
+  Data_Get_Struct(self, JBase, cipher);
+  if (IS_STREAM_CIPHER(cipher->getCipherType())) {
+    rb_raise(rb_eCryptoPP_Error, "can't set rounds on stream ciphers");
+  }
+  else {
+    ((JCipher*) cipher)->setRounds(rounds);
+    if (((JCipher*) cipher)->getRounds() != rounds) {
+      rb_raise(rb_eCryptoPP_Error, "tried set the number of rounds to %d but %d was used instead", rounds, ((JCipher*) cipher)->getRounds());
+    }
+    else {
+      return r;
+    }
+  }
 }
 /**
  * call-seq:
- * 		rounts => Fixnum
+ *     rounts => Fixnum
  *
  * Gets the number of rounds to perform on block ciphers. Returns nil if you
  * try to use this on a stream cipher.
  */
 VALUE rb_cipher_rounds(VALUE self)
 {
-	JBase *cipher = NULL;
-	Data_Get_Struct(self, JBase, cipher);
-	if (IS_STREAM_CIPHER(cipher->getCipherType())) {
-		return Qnil;
-	}
-	else {
-		return rb_fix_new(((JCipher*) cipher)->getRounds());
-	}
+  JBase *cipher = NULL;
+  Data_Get_Struct(self, JBase, cipher);
+  if (IS_STREAM_CIPHER(cipher->getCipherType())) {
+    return Qnil;
+  }
+  else {
+    return rb_fix_new(((JCipher*) cipher)->getRounds());
+  }
 }
@@ -1046,20 +1046,20 @@ VALUE rb_cipher_rounds(VALUE self)
  * will always be available through the ciphertext methods regardless. */
 static VALUE cipher_encrypt(VALUE self, bool hex)
 {
-	JBase *cipher = NULL;
-	Data_Get_Struct(self, JBase, cipher);
-	try {
-		cipher->encrypt();
-		return rb_tainted_str_new(cipher->getCiphertext(hex).data(), cipher->getCiphertext(hex).length());
-	}
-	catch (Exception e) {
-		rb_raise(rb_eCryptoPP_Error, string("Crypto++ exception: " + e.GetWhat()).c_str());
-	}
+  JBase *cipher = NULL;
+  Data_Get_Struct(self, JBase, cipher);
+  try {
+    cipher->encrypt();
+    return rb_tainted_str_new(cipher->getCiphertext(hex).data(), cipher->getCiphertext(hex).length());
+  }
+  catch (Exception e) {
+    rb_raise(rb_eCryptoPP_Error, "Crypto++ exception: %s", e.GetWhat().c_str());
+  }
 }
 /**
  * call-seq:
- * 		encrypt => String
+ *     encrypt => String
  *
  * Encrypt the plaintext using the options set on the Cipher. This method will
  * return the ciphertext in binary. The raw ciphertext will always be available
@@ -1067,12 +1067,12 @@ static VALUE cipher_encrypt(VALUE self, bool hex)
  */
 VALUE rb_cipher_encrypt(VALUE self)
 {
-	return cipher_encrypt(self, false);
+  return cipher_encrypt(self, false);
 }
 /**
  * call-seq:
- * 		encrypt_hex => String
+ *     encrypt_hex => String
  *
  * Encrypt the plaintext using the options set on the Cipher. This method will
  * return the ciphertext in hex. The raw ciphertext will always be available
@@ -1080,7 +1080,7 @@ VALUE rb_cipher_encrypt(VALUE self)
  */
 VALUE rb_cipher_encrypt_hex(VALUE self)
 {
-	return cipher_encrypt(self, true);
+  return cipher_encrypt(self, true);
 }
@@ -1090,21 +1090,21 @@ VALUE rb_cipher_encrypt_hex(VALUE self)
  * available through the plaintext methods regardless. */
 static VALUE cipher_decrypt(VALUE self, bool hex)
 {
-	JBase *cipher = NULL;
-	Data_Get_Struct(self, JBase, cipher);
-	try {
-		cipher->decrypt();
-		string retval = cipher->getPlaintext(hex);
-		return rb_tainted_str_new(retval.data(), retval.length());
-	}
-	catch (Exception e) {
-		rb_raise(rb_eCryptoPP_Error, "Crypto++ exception: %s", e.GetWhat().c_str());
-	}
+  JBase *cipher = NULL;
+  Data_Get_Struct(self, JBase, cipher);
+  try {
+    cipher->decrypt();
+    string retval = cipher->getPlaintext(hex);
+    return rb_tainted_str_new(retval.data(), retval.length());
+  }
+  catch (Exception e) {
+    rb_raise(rb_eCryptoPP_Error, "Crypto++ exception: %s", e.GetWhat().c_str());
+  }
 }
 /**
  * call-seq:
- * 		decrypt => String
+ *     decrypt => String
  *
  * Decrypt the ciphertext using the options set on the Cipher. This method
  * will return the plaintext in binary. The raw plaintext will always be
@@ -1112,12 +1112,12 @@ static VALUE cipher_decrypt(VALUE self, bool hex)
  */
 VALUE rb_cipher_decrypt(VALUE self)
 {
-	return cipher_decrypt(self, false);
+  return cipher_decrypt(self, false);
 }
 /**
  * call-seq:
- * 		decrypt_hex => String
+ *     decrypt_hex => String
  *
  * Decrypt the ciphertext using the options set on the Cipher. This method
  * will return the plaintext in hex. The raw plaintext will always be
@@ -1125,13 +1125,13 @@ VALUE rb_cipher_decrypt(VALUE self)
  */
 VALUE rb_cipher_decrypt_hex(VALUE self)
 {
-	return cipher_decrypt(self, true);
+  return cipher_decrypt(self, true);
 }
 /**
  * call-seq:
- *		encrypt_io(in, out) => true
+ *    encrypt_io(in, out) => true
  *
  * Encrypts a Ruby IO object and spits the result into another one. You can use
  * any sort of Ruby object as long as it implements <tt>eof?</tt>,
@@ -1139,28 +1139,28 @@ VALUE rb_cipher_decrypt_hex(VALUE self)
  *
  * Examples:
  *
- *	cipher.encrypt_io(File.open("http://example.com/"), File.open("test.out", 'w'))
+ *  cipher.encrypt_io(File.open("http://example.com/"), File.open("test.out", 'w'))
  *
- *	output = StringIO.new
- *	cipher.encrypt_io(File.open('test.enc'), output)
+ *  output = StringIO.new
+ *  cipher.encrypt_io(File.open('test.enc'), output)
  */
 VALUE rb_cipher_encrypt_io(VALUE self, VALUE in, VALUE out)
 {
-	JBase *cipher = NULL;
-	Data_Get_Struct(self, JBase, cipher);
-	try {
-		cipher->encryptRubyIO(&in, &out);
-		return Qtrue;
-	}
-	catch (Exception e) {
-		rb_raise(rb_eCryptoPP_Error, "Crypto++ exception:  %s in %s()", e.GetWhat().c_str());
-	}
+  JBase *cipher = NULL;
+  Data_Get_Struct(self, JBase, cipher);
+  try {
+    cipher->encryptRubyIO(&in, &out);
+    return Qtrue;
+  }
+  catch (Exception e) {
+    rb_raise(rb_eCryptoPP_Error, "Crypto++ exception: %s", e.GetWhat().c_str());
+  }
 }
 /**
  * call-seq:
- *		decrypt_io(in, out) => true
+ *    decrypt_io(in, out) => true
  *
  * Decrypts a Ruby IO object and spits the result into another one. You can use
  * any sort of Ruby object as long as it implements <tt>eof?</tt>,
@@ -1168,235 +1168,235 @@ VALUE rb_cipher_encrypt_io(VALUE self, VALUE in, VALUE out)
  *
  * Examples:
  *
- *	cipher.decrypt_io(File.open("http://example.com/"), File.open("test.out", 'w'))
+ *  cipher.decrypt_io(File.open("http://example.com/"), File.open("test.out", 'w'))
  *
- *	output = StringIO.new
- *	cipher.decrypt_io(File.open('test.enc'), output)
+ *  output = StringIO.new
+ *  cipher.decrypt_io(File.open('test.enc'), output)
  */
 VALUE rb_cipher_decrypt_io(VALUE self, VALUE in, VALUE out)
 {
-	JBase *cipher = NULL;
-	Data_Get_Struct(self, JBase, cipher);
-	try {
-		cipher->decryptRubyIO(&in, &out);
-		return Qtrue;
-	}
-	catch (Exception e) {
-		rb_raise(rb_eCryptoPP_Error, "Crypto++ exception:  %s in %s()", e.GetWhat().c_str());
-	}
+  JBase *cipher = NULL;
+  Data_Get_Struct(self, JBase, cipher);
+  try {
+    cipher->decryptRubyIO(&in, &out);
+    return Qtrue;
+  }
+  catch (Exception e) {
+    rb_raise(rb_eCryptoPP_Error, "Crypto++ exception: %s", e.GetWhat().c_str());
+  }
 }
 /**
  * call-seq:
- *		cipher_name(algorithm) => String
+ *    cipher_name(algorithm) => String
  *
  * Returns the name of a Cipher.
  */
 VALUE rb_module_cipher_name(VALUE self, VALUE c)
 {
-	switch (cipher_sym_to_const(c)) {
-		default:
-			rb_raise(rb_eCryptoPP_Error, "could not find a valid cipher type");
-		break;
+  switch (cipher_sym_to_const(c)) {
+    default:
+      rb_raise(rb_eCryptoPP_Error, "could not find a valid cipher type");
+    break;
-#		define CIPHER_ALGORITHM_X(klass, r, c, s) \
-			case r ## _CIPHER: \
-				return rb_tainted_str_new2(c::getStaticCipherName().c_str());
-#		include "defs/ciphers.def"
-	}
+#    define CIPHER_ALGORITHM_X(klass, r, c, s) \
+      case r ## _CIPHER: \
+        return rb_tainted_str_new2(c::getStaticCipherName().c_str());
+#    include "defs/ciphers.def"
+  }
 }
 /**
  * call-seq:
- *		algorithm_name() => String
+ *    algorithm_name() => String
  *
  * Returns the name of the cipher algorithm being used.
  */
 VALUE rb_cipher_algorithm_name(VALUE self)
 {
-	JBase *cipher = NULL;
-	Data_Get_Struct(self, JBase, cipher);
-	return rb_tainted_str_new2(cipher->getCipherName().c_str());
+  JBase *cipher = NULL;
+  Data_Get_Struct(self, JBase, cipher);
+  return rb_tainted_str_new2(cipher->getCipherName().c_str());
 }
 /**
  * call-seq:
- *		block_mode_name(block_mode) => String
+ *    block_mode_name(block_mode) => String
  *
  * Singleton method to return the name of a block cipher mode.
  */
 VALUE rb_module_block_mode_name(VALUE self, VALUE m)
 {
-	return rb_tainted_str_new2(JCipher::getModeName(mode_sym_to_const(m)).c_str());
+  return rb_tainted_str_new2(JCipher::getModeName(mode_sym_to_const(m)).c_str());
 }
 /**
  * call-seq:
- *		block_mode_name() => String
+ *    block_mode_name() => String
  *
  * Returns the name of the mode being used.
  */
 VALUE rb_cipher_block_mode_name(VALUE self)
 {
-	JBase *cipher = NULL;
-	Data_Get_Struct(self, JBase, cipher);
-	if (IS_STREAM_CIPHER(cipher->getCipherType())) {
-		return Qnil;
-	}
-	else {
-		return rb_tainted_str_new2(JCipher::getModeName(((JCipher*) cipher)->getMode()).c_str());
-	}
+  JBase *cipher = NULL;
+  Data_Get_Struct(self, JBase, cipher);
+  if (IS_STREAM_CIPHER(cipher->getCipherType())) {
+    return Qnil;
+  }
+  else {
+    return rb_tainted_str_new2(JCipher::getModeName(((JCipher*) cipher)->getMode()).c_str());
+  }
 }
 /**
  * call-seq:
- *		padding_name(padding) => String
+ *    padding_name(padding) => String
  *
  * Singleton method to return the name of the a block cipher padding mode.
  */
 VALUE rb_module_padding_name(VALUE self, VALUE p)
 {
-	return rb_tainted_str_new2(JCipher::getPaddingName(padding_sym_to_const(p)).c_str());
+  return rb_tainted_str_new2(JCipher::getPaddingName(padding_sym_to_const(p)).c_str());
 }
 /**
  * call-seq:
- *		padding_name() => String
+ *    padding_name() => String
  *
  * Returns the name of the padding being used.
  */
 VALUE rb_cipher_padding_name(VALUE self)
 {
-	JBase *cipher = NULL;
-	Data_Get_Struct(self, JBase, cipher);
-	if (IS_STREAM_CIPHER(cipher->getCipherType())) {
-		return Qnil;
-	}
-	else {
-		return rb_tainted_str_new2(JCipher::getPaddingName(((JCipher*) cipher)->getPadding()).c_str());
-	}
+  JBase *cipher = NULL;
+  Data_Get_Struct(self, JBase, cipher);
+  if (IS_STREAM_CIPHER(cipher->getCipherType())) {
+    return Qnil;
+  }
+  else {
+    return rb_tainted_str_new2(JCipher::getPaddingName(((JCipher*) cipher)->getPadding()).c_str());
+  }
 }
 /**
  * call-seq:
- *		rng_name(rng) => String
+ *    rng_name(rng) => String
  *
  * Singleton method to return the name of the random number generator being
  * used.
  */
 VALUE rb_module_rng_name(VALUE self, VALUE r)
 {
-	return rb_tainted_str_new2(JCipher::getRNGName(rng_sym_to_const(r)).c_str());
+  return rb_tainted_str_new2(JCipher::getRNGName(rng_sym_to_const(r)).c_str());
 }
 /**
  * call-seq:
- *		rng_name() => String
+ *    rng_name() => String
  *
  * Returns the name of the random number generator being used.
  */
 VALUE rb_cipher_rng_name(VALUE self)
 {
-	JBase *cipher = NULL;
-	Data_Get_Struct(self, JBase, cipher);
-	return rb_tainted_str_new2(JCipher::getRNGName(cipher->getRNG()).c_str());
+  JBase *cipher = NULL;
+  Data_Get_Struct(self, JBase, cipher);
+  return rb_tainted_str_new2(JCipher::getRNGName(cipher->getRNG()).c_str());
 }
 /**
  * call-seq:
- *		cipher_type() => Symbol
+ *    cipher_type() => Symbol
  *
  * Returns the type of cipher being used as a Symbol.
  */
 VALUE rb_cipher_cipher_type(VALUE self)
 {
-	JBase *cipher = NULL;
-	Data_Get_Struct(self, JBase, cipher);
+  JBase *cipher = NULL;
+  Data_Get_Struct(self, JBase, cipher);
-	switch (cipher->getCipherType()) {
-#		define CIPHER_ALGORITHM_X(klass, r, c, s) \
-			case r ## _CIPHER: \
-				return ID2SYM(rb_intern(# s));
-#		include "defs/ciphers.def"
+  switch (cipher->getCipherType()) {
+#    define CIPHER_ALGORITHM_X(klass, r, c, s) \
+      case r ## _CIPHER: \
+        return ID2SYM(rb_intern(# s));
+#    include "defs/ciphers.def"
-		default:
-			return Qnil;
-	}
+    default:
+      return Qnil;
+  }
 }
 /**
  * call-seq:
- *		cipher_enabled?(algorithm) => boolean
+ *    cipher_enabled?(algorithm) => boolean
  *
  * Singleton method to check for the availability of a cipher algorithm.
  */
 VALUE rb_module_cipher_enabled(VALUE self, VALUE c)
 {
-	switch (cipher_sym_to_const(c)) {
-		default:
-			return Qfalse;
+  switch (cipher_sym_to_const(c)) {
+    default:
+      return Qfalse;
-#	define CIPHER_ALGORITHM_X(klass, r, c, s) \
-		case r ## _CIPHER:
-#	include "defs/ciphers.def"
-			return Qtrue;
-	}
+#  define CIPHER_ALGORITHM_X(klass, r, c, s) \
+    case r ## _CIPHER:
+#  include "defs/ciphers.def"
+      return Qtrue;
+  }
 }
 /**
  * call-seq:
- *		rng_available?(rng) => boolean
+ *    rng_available?(rng) => boolean
  *
  * Singleton method to check for the availability of a random number generator.
  */
 VALUE rb_module_rng_available(VALUE self, VALUE r)
 {
-	ID id = SYM2ID(r);
-	if (id == rb_intern("rand")) {
-		return Qtrue;
-	}
-#	ifdef NONBLOCKING_RNG_AVAILABLE
-		else if (id == rb_intern("non_blocking")) {
-			return Qtrue;
-		}
-#	endif
+  ID id = SYM2ID(r);
+  if (id == rb_intern("rand")) {
+    return Qtrue;
+  }
+#  ifdef NONBLOCKING_RNG_AVAILABLE
+    else if (id == rb_intern("non_blocking")) {
+      return Qtrue;
+    }
+#  endif
-#	ifdef BLOCKING_RNG_AVAILABLE
-		else if (id == rb_intern("blocking")) {
-			return Qtrue;
-		}
-#	endif
+#  ifdef BLOCKING_RNG_AVAILABLE
+    else if (id == rb_intern("blocking")) {
+      return Qtrue;
+    }
+#  endif
-	else {
-		return Qfalse;
-	}
+  else {
+    return Qfalse;
+  }
 }
 /**
  * call-seq:
- *		cipher_list() => Array
+ *    cipher_list() => Array
  *
  * Returns an Array of available ciphers.
  */
 VALUE rb_module_cipher_list(VALUE self)
 {
-	VALUE ary = rb_ary_new();
+  VALUE ary = rb_ary_new();
-#	define CIPHER_ALGORITHM_X(klass, r, c, s) \
-		rb_ary_push(ary, ID2SYM(rb_intern(# s)));
-#	include "defs/ciphers.def"
+#  define CIPHER_ALGORITHM_X(klass, r, c, s) \
+    rb_ary_push(ary, ID2SYM(rb_intern(# s)));
+#  include "defs/ciphers.def"
-	return ary;
+  return ary;
 }