sandal 0.0.1 → 0.0.2

data/lib/sandal/enc/aescbc.rb

@@ -14,9 +14,9 @@ module Sandal
         @sha_size = aes_size * 2 # TODO: Any smarter way to do this?
         @name = "A#{aes_size}CBC+HS#{@sha_size}"
         @alg_name = "RSA1_5" # TODO: From key?
-        @cipher_name = "AES-#{aes_size}-CBC"
+        @cipher_name = "aes-#{aes_size}-cbc"
         @key = key
-        @digest = OpenSSL::Digest.new("SHA#{@sha_size}")
+        @digest = OpenSSL::Digest.new("sha#{@sha_size}")
       end
 
       def encrypt(header, payload)

data/lib/sandal/sig/es.rb

@@ -11,7 +11,7 @@ module Sandal
       def initialize(sha_size, key)
         throw ArgumentError.new('A key is required.') unless key
         @name = "ES#{sha_size}"
-        @digest = OpenSSL::Digest.new("SHA#{sha_size}")
+        @digest = OpenSSL::Digest.new("sha#{sha_size}")
         @key = key
       end
 
@@ -28,7 +28,7 @@ module Sandal
         hash = @digest.digest(payload)
         r, s = self.class.decode_jws_signature(signature)
         asn1_sig = self.class.encode_asn1_signature(r, s)
-        @key.dsa_verify_asn1(hash, asn1_sig)
+        result = @key.dsa_verify_asn1(hash, asn1_sig)
       end
 
       # Decodes an ASN1 signature into a pair of BNs.
@@ -45,17 +45,22 @@ module Sandal
 
       # Decodes a JWS signature into a pair of BNs.
       def self.decode_jws_signature(signature)
-        hex_string = Sandal::Util.base64_decode(signature)
-        coord_length = hex_string.length / 2
-        r = OpenSSL::BN.new(hex_string[0..(coord_length - 1)].unpack('H*')[0], 16)
-        s = OpenSSL::BN.new(hex_string[coord_length..-1].unpack('H*')[0], 16)
+        binary_string = Sandal::Util.base64_decode(signature)
+        coord_length = binary_string.length / 2
+        r = OpenSSL::BN.new(binary_string[0..(coord_length - 1)].unpack('H*')[0], 16)
+        s = OpenSSL::BN.new(binary_string[coord_length..-1].unpack('H*')[0], 16)
         return r, s
       end
 
       # Encodes a pair of BNs into a JWS signature.
-      def self.encode_jws_signature(r, s)  
-        hex_string = [r.to_s(16) + s.to_s(16)].pack('H*')
-        Sandal::Util.base64_encode(hex_string)
+      def self.encode_jws_signature(r, s)
+        # TODO: Is there a better way to convert these to a binary string?
+        r_str = [r.to_s(16)].pack('H*')
+        r_str = "\x00" + r_str if r_str.length % 2 != 0
+        s_str = [s.to_s(16)].pack('H*')
+        s_str = "\x00" + s_str if s_str.length % 2 != 0
+        binary_string = r_str + s_str
+        Sandal::Util.base64_encode(binary_string)
       end
 
     end

data/lib/sandal/sig/hs.rb

@@ -11,7 +11,7 @@ module Sandal
       def initialize(sha_size, key)
         throw ArgumentError.new('A key is required.') unless key
         @name = "HS#{sha_size}"
-        @digest = OpenSSL::Digest.new("SHA#{sha_size}")
+        @digest = OpenSSL::Digest.new("sha#{sha_size}")
         @key = key
       end
 

data/lib/sandal/sig/rs.rb

@@ -14,7 +14,7 @@ module Sandal
       def initialize(sha_size, key)
         throw ArgumentError.new('A key is required.') unless key
         @name = "RS#{sha_size}"
-        @digest = OpenSSL::Digest.new("SHA#{sha_size}")
+        @digest = OpenSSL::Digest.new("sha#{sha_size}")
         @key = key
       end
 

data/lib/sandal/version.rb

@@ -1,4 +1,4 @@
 module Sandal
   # The semantic version of the library.
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sandal
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-25 00:00:00.000000000 Z
+date: 2013-03-26 00:00:00.000000000 Z
 dependencies: []
 description: A ruby library for creating and reading JSON Web Tokens (JWT), supporting
   JSON Web Signatures (JWS) and JSON Web Encryption (JWE).