json-jwt 0.5.6 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f19422f66eb5b83b9e0bd358351adae0079ef23b
-  data.tar.gz: 9fcfb99e7aefa37537925233bf1669706ec30b9a
+  metadata.gz: 9ed6b68461d916fd8be52e755b8bb2c77253149d
+  data.tar.gz: 8f0b99b938171b21ab88d259471ec72622c979bb
 SHA512:
-  metadata.gz: 43e31546b57bcf852d496a588d444669ca48060191cec2c5283eadca9c6da5c7e69d337df9f40a240798a88c9e14316d9ad0a20c2bcbe7f7d0ede3e4cad6daee
-  data.tar.gz: 867b59f52a7937a7c86fe6b159038506e2821899872b7e4bb9bbcc6ac6d18310ee6e7cd31216180eabaff1072b3cb487253fb20e26ccdb163efde2a57005fed6
+  metadata.gz: 07c51fe7a0b6b66ce4e4504f36baf1698c76537fa8f38513d2cc3fc67dd33208c88b64b8fbe8d0c6feafbf457d10e1ccdf2f3f2adc148035577ed3d5c37cedfb
+  data.tar.gz: 44ae1afcca4d398d46fedacfa69e3403d484f77011af870b7e77f38496a4b1177d3b8fad54a014b49a980dc0f871135b3eed27354cc3035e3cba80b1d36d7d22

data/README.rdoc

@@ -33,7 +33,7 @@ JSON Web Token and its family (JSON Web Signature, JSON Web Encryption and JSON
   jws.to_s # => header.payload.signature
 
   # With signature & encryption
-  jwe = jws.encrypt(key, algorithm, encryption_method) # algorithm & encryption_method are optional. default RSA1_5 & A128CBC+HS256
+  jwe = jws.encrypt(key, algorithm, encryption_method) # algorithm & encryption_method are optional. default RSA1_5 & A128CBC-HS256
   jws.to_s # => header.master_key.iv.cipher_text.integrity_value
 
 For details about <code>key</code> and <code>algorithm</code>, see

data/VERSION

@@ -1 +1 @@
-0.5.6
+0.6.0

data/lib/json/jwe.rb

@@ -9,8 +9,8 @@ module JSON
 
     attr_accessor(
       :public_key_or_secret, :private_key_or_secret, :mode,
-      :input, :plain_text, :cipher_text, :integrity_value, :iv,
-      :master_key, :encrypted_master_key, :encryption_key, :integrity_key
+      :input, :plain_text, :cipher_text, :authentication_tag, :iv,
+      :content_encryption_key, :jwe_encrypted_key, :encryption_key, :mac_key
     )
 
     register_header_keys :enc, :epk, :zip, :apu, :apv
@@ -49,10 +49,10 @@ module JSON
       if mode == :encyption
         [
           header.to_json,
-          encrypted_master_key,
+          jwe_encrypted_key,
           iv,
           cipher_text,
-          integrity_value
+          authentication_tag
         ].collect do |segment|
           UrlSafeBase64.encode64 segment.to_s
         end.join('.')
@@ -74,7 +74,7 @@ module JSON
     end
 
     def cbc?
-      [:'A128CBC+HS256', :'A256CBC+HS512'].collect(&:to_s).include? encryption_method.to_s
+      [:'A128CBC-HS256', :'A256CBC-HS512'].collect(&:to_s).include? encryption_method.to_s
     end
 
     def dir?
@@ -95,9 +95,9 @@ module JSON
         'aes-128-gcm'
       when :A256GCM.to_s
         'aes-256-gcm'
-      when :'A128CBC+HS256'.to_s
+      when :'A128CBC-HS256'.to_s
         'aes-128-cbc'
-      when :'A256CBC+HS512'.to_s
+      when :'A256CBC-HS512'.to_s
         'aes-256-cbc'
       else
         raise UnexpectedAlgorithm.new('Unknown Encryption Algorithm')
@@ -106,9 +106,9 @@ module JSON
 
     def sha_size
       case encryption_method.to_s
-      when :'A128CBC+HS256'.to_s
+      when :'A128CBC-HS256'.to_s
         256
-      when :'A256CBC+HS512'.to_s
+      when :'A256CBC-HS512'.to_s
         512
       else
         raise UnexpectedAlgorithm.new('Unknown Hash Size')
@@ -119,50 +119,14 @@ module JSON
       OpenSSL::Digest::Digest.new "SHA#{sha_size}"
     end
 
-    def derive_cbc_encryption_and_integirity_keys!
-      encryption_key_size = sha_size / 2
-      integrity_key_size = sha_size
-      encryption_segments = [
-        1,
-        master_key,
-        encryption_key_size,
-        encryption_method,
-        0,
-        0,
-        'Encryption'
-      ]
-      integrity_segments = [
-        1,
-        master_key,
-        integrity_key_size,
-        encryption_method,
-        0,
-        0,
-        'Integrity'
-      ]
-      encryption_hash_input, integrity_hash_input = [encryption_segments, integrity_segments].collect do |segments|
-        segments.collect do |segment|
-          case segment
-          when Integer
-            BinData::Int32be.new(segment).to_binary_s
-          else
-            segment.to_s
-          end
-        end.join
-      end
-      self.encryption_key = sha_digest.digest(encryption_hash_input)[0, encryption_key_size / 8]
-      self.integrity_key = sha_digest.digest integrity_hash_input
-      self
-    end
-
     # encyption
 
-    def encrypted_master_key
-      @encrypted_master_key ||= case algorithm.to_s
+    def jwe_encrypted_key
+      @jwe_encrypted_key ||= case algorithm.to_s
       when :RSA1_5.to_s
-        public_key_or_secret.public_encrypt master_key
+        public_key_or_secret.public_encrypt content_encryption_key
       when :'RSA-OAEP'.to_s
-        public_key_or_secret.public_encrypt master_key, OpenSSL::PKey::RSA::PKCS1_OAEP_PADDING
+        public_key_or_secret.public_encrypt content_encryption_key, OpenSSL::PKey::RSA::PKCS1_OAEP_PADDING
       when :A128KW.to_s
         raise NotImplementedError.new('A128KW not supported yet')
       when :A256KW.to_s
@@ -190,65 +154,64 @@ module JSON
       cipher.key = encryption_key
       self.iv = cipher.random_iv
       if gcm?
-        cipher.auth_data = [header.to_json, encrypted_master_key, iv].collect do |segment|
-          UrlSafeBase64.encode64 segment.to_s
-        end.join('.')
+        cipher.auth_data = UrlSafeBase64.encode64 header.to_json
       end
       self
     end
 
     def generate_gcm_keys!
-      self.master_key ||= if dir?
+      self.content_encryption_key ||= if dir?
         public_key_or_secret
       else
         cipher.random_key
       end
-      self.encryption_key = master_key
-      self.integrity_key = :wont_be_used
+      self.encryption_key = content_encryption_key
       self
     end
 
     def generate_cbc_keys!
-      self.master_key ||= if dir?
+      self.content_encryption_key ||= if dir?
         public_key_or_secret
       else
         SecureRandom.random_bytes sha_size / 8
       end
-      derive_cbc_encryption_and_integirity_keys!
+      self.mac_key, self.encryption_key = content_encryption_key.unpack("a#{content_encryption_key.length / 2}" * 2)
+      self
     end
 
-    def integrity_value
-      @integrity_value ||= case
+    def authentication_tag
+      @authentication_tag ||= case
       when gcm?
         cipher.auth_tag
       when cbc?
+        auth_data = UrlSafeBase64.encode64 header.to_json
         secured_input = [
-          header.to_json,
-          encrypted_master_key,
+          auth_data,
           iv,
-          cipher_text
-        ].collect do |segment|
-          UrlSafeBase64.encode64 segment.to_s
-        end.join('.')
-        OpenSSL::HMAC.digest sha_digest, integrity_key, secured_input
+          cipher_text,
+          BinData::Uint64be.new(auth_data.length * 8).to_binary_s
+        ].join
+        OpenSSL::HMAC.digest(
+          sha_digest, mac_key, secured_input
+        )[0, sha_size / 2 / 8]
       end
     end
 
     # decryption
 
     def decode_segments!
-      _header_json_, self.encrypted_master_key, self.iv, self.cipher_text, self.integrity_value = input.split('.').collect do |segment|
+      _header_json_, self.jwe_encrypted_key, self.iv, self.cipher_text, self.authentication_tag = input.split('.').collect do |segment|
         UrlSafeBase64.decode64 segment
       end
       self
     end
 
-    def decrypt_master_key
+    def decrypt_content_encryption_key
       case algorithm.to_s
       when :RSA1_5.to_s
-        private_key_or_secret.private_decrypt encrypted_master_key
+        private_key_or_secret.private_decrypt jwe_encrypted_key
       when :'RSA-OAEP'.to_s
-        private_key_or_secret.private_decrypt encrypted_master_key, OpenSSL::PKey::RSA::PKCS1_OAEP_PADDING
+        private_key_or_secret.private_decrypt jwe_encrypted_key, OpenSSL::PKey::RSA::PKCS1_OAEP_PADDING
       when :A128KW.to_s
         raise NotImplementedError.new('A128KW not supported yet')
       when :A256KW.to_s
@@ -267,26 +230,33 @@ module JSON
     end
 
     def restore_cipher_keys!
-      self.master_key = decrypt_master_key
+      self.content_encryption_key = decrypt_content_encryption_key
       case
       when gcm?
-        self.encryption_key = master_key
-        self.integrity_key = :wont_be_used
+        self.encryption_key = content_encryption_key
       when cbc?
-        derive_cbc_encryption_and_integirity_keys!
+        self.mac_key, self.encryption_key = content_encryption_key.unpack("a#{content_encryption_key.length / 2}" * 2)
       end
       cipher.key = encryption_key
       cipher.iv = iv # NOTE: 'iv' has to be set after 'key' for GCM
       if gcm?
-        cipher.auth_tag = integrity_value
-        cipher.auth_data = input.split('.')[0, 3].join('.')
+        cipher.auth_tag = authentication_tag
+        cipher.auth_data = input.split('.').first
       end
     end
 
     def verify_cbc_integirity_value!
-      secured_input = input.split('.')[0, 4].join('.')
-      expected_integrity_value = OpenSSL::HMAC.digest sha_digest, integrity_key, secured_input
-      unless integrity_value == expected_integrity_value
+      auth_data = input.split('.').first
+      secured_input = [
+        auth_data,
+        iv,
+        cipher_text,
+        BinData::Uint64be.new(auth_data.length * 8).to_binary_s
+      ].join
+      expected_authentication_tag = OpenSSL::HMAC.digest(
+        sha_digest, mac_key, secured_input
+      )[0, sha_size / 2 / 8]
+      unless authentication_tag == expected_authentication_tag
         raise DecryptionFailed.new('Invalid integrity value')
       end
     end

data/lib/json/jwt.rb

@@ -59,7 +59,7 @@ module JSON
       end
     end
 
-    def encrypt(public_key_or_secret, algorithm = :RSA1_5, encryption_method = :'A128CBC+HS256')
+    def encrypt(public_key_or_secret, algorithm = :RSA1_5, encryption_method = :'A128CBC-HS256')
       jwe = JWE.new(self)
       jwe.alg = algorithm
       jwe.enc = encryption_method

data/spec/json/jwe_spec.rb

@@ -59,8 +59,8 @@ describe JSON::JWE do
     end
 
     shared_examples_for :cbc_encryption do
-      context 'when enc=A128CBC+HS256' do
-        before { jwe.enc = :'A128CBC+HS256' }
+      context 'when enc=A128CBC-HS256' do
+        before { jwe.enc = :'A128CBC-HS256' }
 
         it 'should decryptable by Nimbus JOSE JWT' do
           jwe.encrypt! key
@@ -68,8 +68,8 @@ describe JSON::JWE do
         end
       end
 
-      context 'when enc=A256CBC+HS512' do
-        before { jwe.enc = :'A256CBC+HS512' }
+      context 'when enc=A256CBC-HS512' do
+        before { jwe.enc = :'A256CBC-HS512' }
 
         it 'should decryptable by Nimbus JOSE JWT' do
           jwe.encrypt! key
@@ -137,7 +137,7 @@ describe JSON::JWE do
       context 'when unknonw/unsupported algorithm given' do
         let(:key) { public_key }
         let(:alg) { :RSA1_5 }
-        let(:enc) { :'A128CBC+HS256' }
+        let(:enc) { :'A128CBC-HS256' }
         before { jwe.alg, jwe.enc = alg, enc }
 
         context 'when alg=unknown' do
@@ -280,13 +280,13 @@ describe JSON::JWE do
         end
       end
 
-      context 'when enc=A128CBC+HS256' do
-        let(:enc) { :'A128CBC+HS256' }
+      context 'when enc=A128CBC-HS256' do
+        let(:enc) { :'A128CBC-HS256' }
         it_behaves_like :decryptable
       end
 
-      context 'when enc=A256CBC+HS512' do
-        let(:enc) { :'A256CBC+HS512' }
+      context 'when enc=A256CBC-HS512' do
+        let(:enc) { :'A256CBC-HS512' }
         it_behaves_like :decryptable
       end
     end
@@ -313,14 +313,14 @@ describe JSON::JWE do
         end
       end
 
-      context 'when enc=A128CBC+HS256' do
-        let(:enc) { :'A128CBC+HS256' }
+      context 'when enc=A128CBC-HS256' do
+        let(:enc) { :'A128CBC-HS256' }
         it_behaves_like :decryptable
         it_behaves_like :verify_cbc_integrity_value
       end
 
-      context 'when enc=A256CBC+HS512' do
-        let(:enc) { :'A256CBC+HS512' }
+      context 'when enc=A256CBC-HS512' do
+        let(:enc) { :'A256CBC-HS512' }
         it_behaves_like :decryptable
         it_behaves_like :verify_cbc_integrity_value
       end
@@ -336,7 +336,7 @@ describe JSON::JWE do
       let(:input) { 'whatever' }
       let(:key) { public_key }
       let(:alg) { :RSA1_5 }
-      let(:enc) { :'A128CBC+HS256' }
+      let(:enc) { :'A128CBC-HS256' }
 
       context 'when alg=unknown' do
         let(:alg) { :unknown }

data/spec/json/jwt_spec.rb

@@ -115,7 +115,7 @@ describe JSON::JWT do
     end
 
     it 'should accept optional algorithm and encryption method' do
-      jwt.encrypt(shared_key, :dir, :'A256CBC+HS512').should be_a JSON::JWE
+      jwt.encrypt(SecureRandom.hex(32), :dir, :'A256CBC-HS512').should be_a JSON::JWE
     end
   end
 
@@ -167,7 +167,7 @@ describe JSON::JWT do
         it 'should skip verification' do
           expect do
             jwe = JSON::JWT.decode input, :skip_decryption
-            jwe.header.should == {'alg' => 'RSA1_5', 'enc' => 'A128CBC+HS256'}
+            jwe.header.should == {'alg' => 'RSA1_5', 'enc' => 'A128CBC-HS256'}
           end.not_to raise_error
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: json-jwt
 version: !ruby/object:Gem::Version
-  version: 0.5.6
+  version: 0.6.0
 platform: ruby
 authors:
 - nov matake
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-01 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json