gibberish 1.1.0 → 1.2.0

data/CHANGELOG.mdown

@@ -1,3 +1,6 @@
+### v1.2.0
+* Added digest support for SHA224/384 and HMAC SHA224/384/512. [Pull request #5](https://github.com/mdp/gibberish/pull/5)
+
 ### v1.1.0
 
-Add SHA512 support
+* Add SHA512 support

data/README.markdown

@@ -59,11 +59,16 @@ Gibberish AES is fully compatible with default OpenSSL on the command line
 
 ## HMAC
 
-Defaults to 128 bit digest
+Defaults to 128 bit digest and SHA1
 
     Gibberish::HMAC("key", "some data")
     #=> 521677c580722c5c52fa15d978e8656341c4f3c5
 
+Other digests can be used
+
+    Gibberish::HMAC("key", "some data", :digest => :sha256)
+    #=> 01add3f98ce4d49403d98362a046c6cca2c79d778426282c53e4f628f648c12b
+
 [Find out more](http://mdp.github.com/gibberish/Gibberish/HMAC.html)
 
 ## Digests
@@ -74,9 +79,15 @@ Defaults to 128 bit digest
     Gibberish::SHA1("somedata")
     #=> efaa311ae448a7374c122061bfed952d940e9e37
 
+    Gibberish::SHA224("somedata")
+    #=> a39b86d838273f5ff4879c26f85e3cb333bb44d73b24f275bad1a6c6
+
     Gibberish::SHA256("somedata")
     #=> 87d149cb424c0387656f211d2589fb5b1e16229921309e98588419ccca8a7362
 
+    Gibberish::SHA384("somedata")
+    #=> b6800736973cc061e3efb66a34f8bda8fa946804c6cc4f26a6b9b3950211078801709d0d82707c569a07c8f63c804c87
+
     Gibberish::SHA512("somedata")
     #=> a053441b6de662599ecb14c580d6637dcb856a66b2a40a952d39df772e47e98ea22f9e105b31463c5cf2472feae7649464fe89d99ceb6b0bc398a6926926f416
 

data/lib/gibberish/digest.rb

@@ -5,20 +5,26 @@ module Gibberish
   #
   #     Gibberish::MD5("data") #=> 8d777f385d3dfec8815d20f7496026dc
   #     Gibberish::SHA1("data") #=> a17c9aaa61e80a1bf71d0d850af4e5baa9800bbd
+  #     Gibberish::SHA224("data") #=> f4739673acc03c424343b452787ee23dd62999a8a9f14f4250995769
   #     Gibberish::SHA256("data") #=> 3a6eb0790f39ac87c94f3856b2dd2c5d110e6811602261a9a923d3bb23adc8b7
+  #     Gibberish::SHA384("data") #=> 2039e0f0b92728499fb88e23ebc3cfd0554b28400b0ed7b753055c88b5865c3c2aa72c6a1a9ae0a755d87900a4a6ff41
   #     Gibberish::SHA512("data") #=> 77c7ce9a5d86bb386d443bb96390faa120633158699c8844c30b13ab0bf92760b7e4416aea397db91b4ac0e5dd56b8ef7e4b066162ab1fdc088319ce6defc876
   #
   # ## OpenSSL CLI Interop
   #
   #     echo -n 'data' | openssl dgst -sha1
+  #     echo -n 'data' | openssl dgst -sha224
   #     echo -n 'data' | openssl dgst -sha256
+  #     echo -n 'data' | openssl dgst -sha384
   #     echo -n 'data' | openssl dgst -sha512
   #     echo -n 'data' | openssl dgst -md5
   #
   # is the same as
   #
   #     Gibberish::SHA1("data")
+  #     Gibberish::SHA224("data")
   #     Gibberish::SHA256("data")
+  #     Gibberish::SHA384("data")
   #     Gibberish::SHA512("data")
   #     Gibberish::MD5("data")
   #
@@ -41,6 +47,23 @@ module Gibberish
       end
     end
 
+    # Returns the SHA224 digest for the data
+    #
+    # Shorcut alias: Gibberish::SHA224(data)
+    #
+    # @param [String] key
+    # @param [#to_s] data
+    # @param [Hash] options
+    # @option opts [Boolean] :binary (false) encode the data in binary, not Base64
+    def self.sha224(data, opts={})
+      data = data.to_s
+      if opts[:binary]
+        OpenSSL::Digest::SHA224.digest(data)
+      else
+        OpenSSL::Digest::SHA224.hexdigest(data)
+      end
+    end
+
     # Returns the SHA256 digest for the data
     #
     # Shorcut alias: Gibberish::SHA256(data)
@@ -58,6 +81,23 @@ module Gibberish
       end
     end
 
+    # Returns the SHA384 digest for the data
+    #
+    # Shorcut alias: Gibberish::SHA384(data)
+    #
+    # @param [String] key
+    # @param [#to_s] data
+    # @param [Hash] options
+    # @option opts [Boolean] :binary (false) encode the data in binary, not Base64
+    def self.sha384(data, opts={})
+      data = data.to_s
+      if opts[:binary]
+        OpenSSL::Digest::SHA384.digest(data)
+      else
+        OpenSSL::Digest::SHA384.hexdigest(data)
+      end
+    end
+
     # Returns the SHA512 digest for the data
     #
     # Shorcut alias: Gibberish::SHA512(data)
@@ -97,10 +137,18 @@ module Gibberish
     Digest.sha1(data,opts)
   end
 
+  def self.SHA224(data, opts={})
+    Digest.sha224(data,opts)
+  end
+
   def self.SHA256(data, opts={})
     Digest.sha256(data,opts)
   end
 
+  def self.SHA384(data, opts={})
+    Digest.sha384(data,opts)
+  end
+
   def self.SHA512(data, opts={})
     Digest.sha512(data,opts)
   end

data/lib/gibberish/hmac.rb

@@ -4,8 +4,16 @@ module Gibberish
   # ## Example
   #
   #     Gibberish::HMAC('key', 'data') #=> 104152c5bfdca07bc633eebd46199f0255c9f49d
+  #     Gibberish::HMAC('key', 'data', :digest => :sha224)
+  #       #=> 19424d4210e50d7a4521b5f0d54b4b0cff3060deddccfd894fda5b3b
   #     Gibberish::HMAC('key', 'data', :digest => :sha256)
   #       #=> 5031fe3d989c6d1537a013fa6e739da23463fdaec3b70137d828e36ace221bd0
+  #     Gibberish::HMAC('key', 'data', :digest => :sha384)
+  #       #=> c5f97ad9fd1020c174d7dc02cf83c4c1bf15ee20ec555b690ad58e62da8a00ee
+  #           44ccdb65cb8c80acfd127ebee568958a
+  #     Gibberish::HMAC('key', 'data', :digest => :sha512)
+  #       #=> 3c5953a18f7303ec653ba170ae334fafa08e3846f2efe317b87efce82376253c
+  #           b52a8c31ddcde5a3a2eee183c2b34cb91f85e64ddbc325f7692b199473579c58
   #
   # ## OpenSSL CLI Interop
   #
@@ -18,7 +26,10 @@ module Gibberish
   class HMAC
     DIGEST = {
       :sha1 => OpenSSL::Digest::Digest.new('sha1'),
-      :sha256 => OpenSSL::Digest::Digest.new('sha256')
+      :sha224 => OpenSSL::Digest::Digest.new('sha224'),
+      :sha256 => OpenSSL::Digest::Digest.new('sha256'),
+      :sha384 => OpenSSL::Digest::Digest.new('sha384'),
+      :sha512 => OpenSSL::Digest::Digest.new('sha512')
     }
 
     # Returns the HMAC for the key and data

data/lib/gibberish/version.rb

@@ -1,3 +1,3 @@
 module Gibberish
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/spec/digest_spec.rb

@@ -10,10 +10,18 @@ describe "A variety of digest methods" do
     Gibberish::SHA1("password").must_equal("5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8")
   end
 
+  it "should work with SHA224" do
+    Gibberish::SHA224("password").must_equal("d63dc919e201d7bc4c825630d2cf25fdc93d4b2f0d46706d29038d01")
+  end
+
   it "should work with SHA256" do
     Gibberish::SHA256("password").must_equal("5e884898da28047151d0e56f8dc6292773603d0d6aabbdd62a11ef721d1542d8")
   end
 
+  it "should work with SHA384" do
+    Gibberish::SHA384("password").must_equal("a8b64babd0aca91a59bdbb7761b421d4f2bb38280d3a75ba0f21f2bebc45583d446c598660c94ce680c47d19c30783a7")
+  end
+
   it "should work with SHA512" do
     Gibberish::SHA512("password").must_equal("b109f3bbbc244eb82441917ed06d618b9008dd09b3befd1b5e07394c706a8bb980b1d7785e5976ec049b46df5f1326af5a2ea6d103fd07c95385ffab0cacbc86")
   end

data/spec/hmac_spec.rb

@@ -12,4 +12,47 @@ describe "HMAC" do
     hmac.must_equal(o_hmac.chomp)
   end
 
+  it "should hopefully work for sha224" do
+    Gibberish::HMAC("password", "data", :digest => :sha224).must_equal(
+      "f66aa39e91d003f7d3fc1205f77bd4947af51735a49e197fbd478728")
+  end
+
+  it "should work with OpenSSL HMAC for sha224" do
+    hmac = Gibberish::HMAC("password", "data\n", :digest => :sha224)
+    o_hmac = `echo "data" | openssl dgst -sha224 -hmac 'password'`
+    hmac.must_equal(o_hmac.chomp)
+  end
+
+  it "should hopefully work for sha256" do
+    Gibberish::HMAC("password", "data", :digest => :sha256).must_equal(
+      "cccf6f0334130a7010d62332c75b53e7d8cea715e52692b06e9cd41b05644be3")
+  end
+
+  it "should work with OpenSSL HMAC for sha256" do
+    hmac = Gibberish::HMAC("password", "data\n", :digest => :sha256)
+    o_hmac = `echo "data" | openssl dgst -sha256 -hmac 'password'`
+    hmac.must_equal(o_hmac.chomp)
+  end
+
+  it "should hopefully work for sha384" do
+    Gibberish::HMAC("password", "data", :digest => :sha384).must_equal(
+      "2ed475691214fb85d086577d8d525c609b92520ebd793a74856b3ffd8d3477eaaf0b06ef9e06c8aa81cf29f95078aca6")
+  end
+
+  it "should work with OpenSSL HMAC for sha384" do
+    hmac = Gibberish::HMAC("password", "data\n", :digest => :sha384)
+    o_hmac = `echo "data" | openssl dgst -sha384 -hmac 'password'`
+    hmac.must_equal(o_hmac.chomp)
+  end
+
+  it "should hopefully work for sha512" do
+    Gibberish::HMAC("password", "data", :digest => :sha512).must_equal("abf85192282b501874f4803ea08672f2c9d6e656c57801023a0b1f4dd9492ba960efdb560a8618ec783327d6dc31577422651a4cf7eaf722d2caefbc04038c6e")
+  end
+
+  it "should work with OpenSSL HMAC for sha512" do
+    hmac = Gibberish::HMAC("password", "data\n", :digest => :sha512)
+    o_hmac = `echo "data" | openssl dgst -sha512 -hmac 'password'`
+    hmac.must_equal(o_hmac.chomp)
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gibberish
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: 
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Mark Percival
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-12 00:00:00 -08:00
+date: 2011-12-09 00:00:00 -08:00
 default_executable: 
 dependencies: []