sha3 0.2.3 → 0.2.5

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 035f7085d22a6bccff51be3775cde1b8aa61ff9a
+  data.tar.gz: 52abae3fab52ae7634b0ad016d81e69895f98227
+SHA512:
+  metadata.gz: 18aeef47b4c1fb4a79ada7b4ea00323d47f9404d58c74b37586a858a2561727c944eb9ac778a6a673574c02dc4ad7e93535c4cd8ee1bf8b9b7db12c154cbdaf7
+  data.tar.gz: fb635f1a539f597a0b6c74d9c74f3d0eff3862349df27b7212806e93c9f1ad0e2b16a6bef17ba38f5089b52846ce2912d95d5ef6fab8084547e4e95ba42887e3

data/.gitignore

@@ -18,4 +18,5 @@ tmp
 # YARD artifacts
 .yardoc
 _yardoc
-doc/
+doc/
+Gemfile.lock

data/.travis.yml

@@ -1,13 +1,13 @@
 language: ruby
 rvm:
+  - 2.0.0
   - 1.9.3
   - 1.9.2
   - 1.8.7
   - ruby-head
   - rbx-18mode
   - rbx-19mode
-  - ree
-  
+
 gemfile: Gemfile.ci
 
 branches:

data/ChangeLog.rdoc

@@ -17,3 +17,11 @@
 === 0.2.3 / 2013-1-28
 
 * Added documentation file (decoupled form C source); refactored C source.
+
+=== 0.2.4 / 2013-5-20
+
+* Fixed instance copy validation code (YANKED)
+
+=== 0.2.5 / 2013-5-21
+
+* Fixed the fix to instance copy validation code.

data/README.rdoc

@@ -1,6 +1,6 @@
 = sha3  {<img src="https://secure.travis-ci.org/johanns/sha3.png" alt="Build Status" />}[http://travis-ci.org/johanns/sha3] {<img src="https://gemnasium.com/johanns/sha3.png" alt="Dependency Status" />}[https://gemnasium.com/johanns/sha3]
 
-<em>SHA3 for Ruby</em> is a native (C) implementation of Keccak (SHA3) cryptographic hashing algorithm. Platform optimized reference is used, wherever possible.
+<em>SHA3 for Ruby</em> is a native (C) implementation of Keccak (SHA3) cryptographic hashing algorithm.
 
 Home :: https://github.com/johanns/sha3#readme
 Issues :: https://github.com/johanns/sha3/issues
@@ -14,18 +14,18 @@ Documentation :: http://rubydoc.info/gems/sha3/frames
 
 == Installation
 
-  $ gem install sha3
+  gem install sha3
 
 == Usage
 
   require 'sha3'
 
-Valid hash bit-lengths are: *224*, *256*, *384*, *512*. You may also use corresponding symbols when instantiating a new instance or calling the <em>SHA3::Digest.compute()</em> method: 
-  
+Valid hash bit-lengths are: *224*, *256*, *384*, *512*. You may also use corresponding symbols when instantiating a new instance or calling the <em>SHA3::Digest.compute()</em> method:
+
   :sha224  :sha256  :sha384  :sha512
 
   # SHA3::Digest.new(224) is SHA3::Digest.new(:sha224)
-  
+
 Alternatively, you can instantiate using one of four sub-classes:
 
   SHA3::Digest::SHA224.new() # 224 bits
@@ -34,35 +34,35 @@ Alternatively, you can instantiate using one of four sub-classes:
   SHA3::Digest::SHA512.new() # 512 bits
 
 === Basics
-  
+
   # Instantiate a new SHA3::Digest class with 256 bit length
   s = SHA3::Digest.new(:sha256)
-  
+
   # OR #
-  
+
   s = SHA3::Digest::SHA256.new()
-  
+
   # Update hash state, and compute new value
   s.update "Compute Me"
-  
+
   # << is an .update() alias
   s << "Me too"
-  
+
   # Returns digest value in bytes
   s.digest
-  # => "\xBE\xDF\r\xD9\xA1[dt \x8BbLN\x8A\x1Eg,\xE0\xF0d\x98\xE3\xAB\xD7\xCC7\xF0\xAEiu\x92Y"
-   
+  # => "\xBE\xDF\r\xD9\xA1..."
+
   # Returns digest value as hex string
   s.hexdigest
-  # => "bedf0dd9a15b6474208b624c4e8a1e672ce0f06498e3abd7cc37f0ae69759259"
+  # => "bedf0dd9a15b647..."
 
   ### Digest class-methods: ###
-  
+
   SHA3::Digest.hexdigest("Hash me, please", :sha224)
-  # => "200e7bc18cd6132689eb8fa3f7c3a978d73215384a626c23e4508f33"
+  # => "200e7bc18cd613..."
 
   SHA3::Digest::SHA384.digest("Hash me, please")
-  # => "\xF5\xCEpC\xB0eV\xA3\x92P\xF8\x93\xB8\x145\x19\x1A)\xB1\x88\xBF\a\a7\x88\f\xFETI\e\x17\x80\xEC\xA6}\xABR\xAE\xAFK\xFF|d\x81\xF7\xB5\x9Ah"
+  # => "\xF5\xCEpC\xB0eV..."
 
 === Hashing a file
 
@@ -71,13 +71,13 @@ Alternatively, you can instantiate using one of four sub-classes:
 
   # Calling SHA3::Digest.file(...) defaults to SHA256
   s = SHA3::Digest.file("tests.sh")
-  # => #<SHA3::Digest: a9801db49389339bd8a62817f229f0f9394ca73b34fd7dbc7ec5ed7a99bc49f1>
+  # => #<SHA3::Digest: a9801db49389339...>
 
 === Bit-length hashing
-  
+
   # Compute hash of "011"
   SHA3::Digest.compute(:sha224, "\xC0", 3).unpack("H*")
-  # => ["2b695a6fd92a2b3f3ce9cfca617d22c9bb52815dd59a9719b01bad25"]
+  # => ["2b695a6fd92a..."]
 
 == Development
 
@@ -96,6 +96,7 @@ Only a small subset of test vectors are included in the source repository; howev
 
 Tested with Rubies:
 
+  - MRI 2.0.0
   - MRI 1.9.3
   - MRI 1.9.2
   - MRI 1.8.7
@@ -106,7 +107,7 @@ Tested with Rubies:
 
 On:
 
-  - Ubuntu 12.04, 12.10
+  - Ubuntu 12.04, 12.10, 13.04
   - Windows 7, 8
   - Mac OS X 10.8
 
@@ -116,6 +117,8 @@ On:
 *0.2.0* :: Production worthy, but breaks API compatibility with 0.1.x. Backward-compatibility will be maintained henceforth.
 *0.2.2* :: Added sub-class for each SHA3 supported bit-lengths (example: SHA3::Digest::SHA256). Minor bug fix.
 *0.2.3* :: Added documentation file (decoupled form C source); refactored C source.
+*0.2.4* :: Bug fixes. (YANKED)
+*0.2.5* :: Bug fixes. (See ChangeLog.rdoc)
 
 == TO DO:
 
@@ -124,6 +127,6 @@ On:
 
 == Copyright
 
-Copyright (c) 2012 Johanns Gregorian (https://github.com/johanns)
+Copyright (c) 2012 - 2013 Johanns Gregorian (https://github.com/johanns)
 
 See LICENSE.txt for details.

data/ext/sha3/digest.c

@@ -1,3 +1,5 @@
+/* Copyright (c) 2012 - 2013 Johanns Gregorian <io+sha3@jsani.com> */
+
 #include "sha3.h"
 
 VALUE cDigest;
@@ -109,8 +111,25 @@ static VALUE c_digest_reset(VALUE self)
   return self;
 }
 
+// Fix: And, permanent reminder of a rookie mistake in c_digest_copy, comparing structs with ==/!= op
+// Fix: Woke-up after 2-hours of sleep, and for good reason. Fixed string comparison. Need to re-read K&R!
+static int cmp_states(MDX *mdx1, MDX *mdx2)
+{
+    return (
+      (mdx1->hashbitlen == mdx2->hashbitlen) &&
+      (strcmp((const char *) mdx1->state->state, (const char *)mdx2->state->state) == 0) &&
+      (strcmp((const char *) mdx1->state->dataQueue, (const char *) mdx2->state->dataQueue) == 0) &&
+      (mdx1->state->rate == mdx2->state->rate) &&
+      (mdx1->state->capacity == mdx2->state->capacity) &&
+      (mdx1->state->bitsInQueue == mdx2->state->bitsInQueue) &&
+      (mdx1->state->fixedOutputLength == mdx2->state->fixedOutputLength) &&
+      (mdx1->state->squeezing == mdx2->state->squeezing) &&
+      (mdx1->state->bitsAvailableForSqueezing == mdx2->state->bitsAvailableForSqueezing)
+    );
+}
+
 // SHA3::Digest.copy(obj) -> self
-static VALUE c_digest_copy(VALUE self, VALUE obj) 
+static VALUE c_digest_copy(VALUE self, VALUE obj)
 {
   MDX *mdx1, *mdx2;
 
@@ -123,18 +142,18 @@ static VALUE c_digest_copy(VALUE self, VALUE obj)
 
   memcpy(mdx1->state, mdx2->state, sizeof(hashState));
   mdx1->hashbitlen = mdx2->hashbitlen;
- 
+
   // Fetch the data again to make sure it was copied
   GETMDX(self, mdx1);
   SAFEGETMDX(obj, mdx2);
-  if ((mdx1->state != mdx2->state) && (mdx1->hashbitlen != mdx2->hashbitlen))
+  if (!cmp_states(mdx1, mdx2))
     rb_raise(eDigestError, "failed to copy state");
 
   return self;
 }
 
 // SHA3::Digest.digest_length -> Integer
-static VALUE c_digest_length(VALUE self) 
+static VALUE c_digest_length(VALUE self)
 {
   MDX *mdx;
   GETMDX(self, mdx);

data/ext/sha3/digest.h

@@ -1,6 +1,12 @@
+/* Copyright (c) 2012 - 2013 Johanns Gregorian <io+sha3@jsani.com> */
+
 #ifndef _DIGEST_H_
 #define _DIGEST_H_
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 // From ruby/ext/openssl/ossl_digest.c
 #define GETMDX(obj, mdx) do {                                    \
   Data_Get_Struct((obj), MDX, (mdx));                            \
@@ -27,4 +33,8 @@ typedef struct {
 
 void Init_sha3_n_digest(void);
 
+#ifdef  __cplusplus
+}
+#endif
+
 #endif

data/ext/sha3/extconf.rb

@@ -1,14 +1,26 @@
 require 'mkmf'
+require 'rbconfig'
 
-case 1.size
-when 4 # 32bit optimized code
+FileUtils.rm "#{$srcdir}/KeccakF-1600-opt.c", :force => true
+
+target_cpu = RbConfig::CONFIG['target_cpu']
+
+if 1.size == 4 and target_cpu =~ /i386|x86_32/   # x86 32bit optimized code
+  Logging::message "=== Using i386 optimized Keccak code ===\n"
   FileUtils.cp "#{$srcdir}/KeccakF-1600-opt32.c-arch", "#{$srcdir}/KeccakF-1600-opt.c"
-when 8 # 64bit optimized code
+elsif 1.size == 8 and target_cpu =~ /i686|x86_64/
+  Logging::message "=== Using i686 optimized Keccak code ===\n"
   FileUtils.cp "#{$srcdir}/KeccakF-1600-opt64.c-arch", "#{$srcdir}/KeccakF-1600-opt.c"
-else # Ha? Use reference code
+else # Ha? Use reference code -- slow
+  Logging::message "=== Using reference Keccak code ===\n"
   FileUtils.cp "#{$srcdir}/KeccakF-1600-reference.c-arch", "#{$srcdir}/KeccakF-1600-opt.c"
 end
 
+find_header("KeccakF-1600-interface.h")
+find_header("KeccakSponge.h")
+find_header("KeccakNISTInterface.h")
+find_header("sha3.h")
+find_header("digest.h")
+
 $CFLAGS = ' -fomit-frame-pointer -O3 -g0 -march=nocona '
 create_makefile 'sha3_n'
-

data/ext/sha3/sha3.c

@@ -1,3 +1,5 @@
+/* Copyright (c) 2012 - 2013 Johanns Gregorian <io+sha3@jsani.com> */
+
 #include "sha3.h"
 
 VALUE mSHA3;

data/ext/sha3/sha3.h

@@ -1,3 +1,5 @@
+/* Copyright (c) 2012 - 2013 Johanns Gregorian <io+sha3@jsani.com> */
+
 #ifndef _SHA3_H_
 #define _SHA3_H_
 
@@ -6,10 +8,18 @@
 #include "KeccakNISTInterface.h"
 #include "digest.h"
 
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
 extern VALUE mSHA3;
 extern VALUE eSHA3Error;
 
 int get_hlen(VALUE);
 void Init_sha3_n(void);
 
+#ifdef  __cplusplus
+}
+#endif
+
 #endif

data/lib/sha3/version.rb

@@ -1,8 +1,8 @@
 module SHA3
   extend self
-  
+
   # sha3 release version
-  VERSION = "0.2.3"
+  VERSION = "0.2.5"
 
   # keccak version number
   KECCAK_VERSION = "3.2"

data/sha3.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.name          = "sha3"
   gem.version       = SHA3::VERSION
   gem.summary       = %q{SHA3 for Ruby}
-  gem.description   = %q{SHA3 for Ruby is a native (C) implementation of Keccak (SHA3) cryptographic hashing algorithm. See https://github.com/johanns/sha3#readme for details.}
+  gem.description   = %q{SHA3 for Ruby is a native (C) implementation of Keccak (SHA3) cryptographic hashing algorithm.}
   gem.license       = "MIT"
   gem.authors       = ["Johanns Gregorian"]
   gem.email         = "io+sha3@jsani.com"

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: sha3
 version: !ruby/object:Gem::Version
-  version: 0.2.3
-  prerelease: 
+  version: 0.2.5
 platform: ruby
 authors:
 - Johanns Gregorian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-28 00:00:00.000000000 Z
+date: 2013-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubygems-tasks
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,13 +62,12 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.8'
 description: SHA3 for Ruby is a native (C) implementation of Keccak (SHA3) cryptographic
-  hashing algorithm. See https://github.com/johanns/sha3#readme for details.
+  hashing algorithm.
 email: io+sha3@jsani.com
 executables: []
 extensions:
@@ -133,27 +124,26 @@ files:
 homepage: https://github.com/johanns/sha3#readme
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: SHA3 for Ruby
 test_files:
 - spec/generate_tests.rb