xmldsig 0.0.2 → 0.0.3

data/lib/xmldsig/signature.rb

@@ -66,7 +66,7 @@ module Xmldsig
       if private_key
         private_key.sign(signature_method.new, canonicalized_signed_info)
       else
-        yield(canonicalized_signed_info)
+        yield(canonicalized_signed_info, signature_algorithm)
       end
     end
 
@@ -85,9 +85,12 @@ module Xmldsig
           Base64.encode64(digest_value).chomp
     end
 
+    def signature_algorithm
+      signed_info.at_xpath("descendant::ds:SignatureMethod", NAMESPACES).get_attribute("Algorithm")
+    end
+
     def signature_method
-      algorithm = signed_info.at_xpath("descendant::ds:SignatureMethod", NAMESPACES).get_attribute("Algorithm")
-      algorithm = algorithm && algorithm =~ /sha(.*?)$/i && $1.to_i
+      algorithm = signature_algorithm && signature_algorithm =~ /sha(.*?)$/i && $1.to_i
       case algorithm
         when 256 then
           OpenSSL::Digest::SHA256
@@ -115,7 +118,7 @@ module Xmldsig
       signature_valid = if certificate
         certificate.public_key.verify(signature_method.new, signature_value, canonicalized_signed_info)
       else
-        yield(signature_value, canonicalized_signed_info)
+        yield(signature_value, canonicalized_signed_info, signature_algorithm)
       end
 
       unless signature_valid

data/lib/xmldsig/version.rb

@@ -1,3 +1,3 @@
 module Xmldsig
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/lib/xmldsig/signature_spec.rb

@@ -61,7 +61,8 @@ describe Xmldsig::Signature do
     end
 
     it "accepts a block" do
-      signature.sign do |data|
+      signature.sign do |data, signature_algorithm|
+        signature_algorithm.should == "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"
         private_key.sign(OpenSSL::Digest::SHA256.new, data)
       end
       signature.signature_value.should == Base64.decode64("
@@ -103,7 +104,8 @@ describe Xmldsig::Signature do
     end
 
     it "accepts a block" do
-      signature.valid? do |signature_value, data|
+      signature.valid? do |signature_value, data, signature_algorithm|
+        signature_algorithm.should == "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"
         certificate.public_key.verify(OpenSSL::Digest::SHA256.new, signature_value, data)
       end
       signature.errors.should be_empty

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xmldsig
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-17 00:00:00.000000000 Z
+date: 2013-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri