xmlenc 0.6.8 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ddb636923d7131d4b738212dc45113fb43141e95
-  data.tar.gz: a30f0fce4a2bf4acd5163fa1d478046a557a6a98
+  metadata.gz: 9bd6b427526017614daaa55dabf68ae2a39bae85
+  data.tar.gz: cc5c4813f5758495e514aed426fb98d9dd45ac4d
 SHA512:
-  metadata.gz: 79124669c3bdd0dc63f6cb185f42e980c7cb466c6c645e50c28dd249310b2189ca011a4f16fe4d563cd8e22759f5b55e4c3567c70a37641050a3518b428723ba
-  data.tar.gz: 1c0826bb77cf4d5781dcbb9310c14748230d5088b8c331b8de2e0a08469ab2b9c64f6c5de2f2ec7ec8777f51d0b9c5892c90630494ff05abcd3e35cc383c5806
+  metadata.gz: a2c81dbb86bd5f99e014252110984cbb2b4d450d73ad8b31f6f8f2375503a7c5bd63950821fbe4dae85d78eb8209098aedd587690e6135a5c689a73df9f75c94
+  data.tar.gz: 5cba8f5ba6f103b57504b0ef3e9f7dea2fc192dc4c6ff44b06b1b09eea3a3dc3afb0440b695d85c38f4812bf3e38bd7d759d57f530f306ebbefee9448ba186e2

data/lib/xmlenc/builder/encrypted_data.rb

@@ -37,9 +37,16 @@ module Xmlenc
         encryptor = algorithm.setup
         encrypted = encryptor.encrypt(data, :node => encryption_method)
         cipher_data.cipher_value = Base64.encode64(encrypted)
+
         key_params = { :data => encryptor.key }
+
         encrypted_key = EncryptedKey.new(key_params.merge(key_options))
         encrypted_key.add_data_reference(id)
+
+        if key_options[:carried_key_name].present?
+          encrypted_key.carried_key_name = key_options[:carried_key_name]
+        end
+
         encrypted_key
       end
 
@@ -50,6 +57,13 @@ module Xmlenc
         end
       end
 
+      def set_key_name(key_name)
+        if key_name
+          self.key_info ||= KeyInfo.new
+          self.key_info.key_name = key_name
+        end
+      end
+
       private
 
       def algorithm

data/lib/xmlenc/version.rb

@@ -1,3 +1,3 @@
 module Xmlenc
-  VERSION = "0.6.8"
+  VERSION = "0.6.9"
 end

data/spec/lib/xmlenc/builder/encrypted_data_spec.rb

@@ -112,23 +112,39 @@ describe Xmlenc::Builder::EncryptedData do
         expect(Xmlenc::Builder::EncryptedKey).to receive(:new).with(hash_including(key_options))
         subject.encrypt('TEST', key_options)
       end
+
+      context 'when a "carried_key_name" is passed' do
+        let(:key_options) { { :id => '_SOME_ID', :recipient => 'SOME_RECIPIENT', :carried_key_name => 'CARRIED_KEY_NAME' } }
+
+        it 'sets the carried key name' do
+          expect(subject.encrypt('TEST', key_options).carried_key_name).to eq 'CARRIED_KEY_NAME'
+        end
+      end
     end
   end
 
-  describe "#set_key_retrieval_method" do
-    it "sets the key info with the key name" do
+  describe '#set_key_retrieval_method' do
+    it 'sets the key info with the retrieval method' do
       subject.set_key_retrieval_method 'retrieval_method'
-      expect(subject.key_info.retrieval_method).to eq "retrieval_method"
+      expect(subject.key_info.retrieval_method).to eq 'retrieval_method'
+    end
+
+    it 'does not set the key info element if the "retrieval_method" is nil' do
+      subject.key_info = nil
+      subject.set_key_retrieval_method(nil)
+      expect(subject.key_info).to be_nil
     end
+  end
 
-    it "does not override old key info data" do
-      subject.set_key_retrieval_method("key retrieval_method")
-      expect(subject.key_info.encrypted_key).not_to be_nil
+  describe '#set_key_name' do
+    it 'sets the key info with the key name' do
+      subject.set_key_name 'key_name'
+      expect(subject.key_info.key_name).to eq 'key_name'
     end
 
-    it "does not set the key info element if the key retrieval_method is nil" do
+    it 'does not set the key info element if the "key_name" is nil' do
       subject.key_info = nil
-      subject.set_key_retrieval_method(nil)
+      subject.set_key_name(nil)
       expect(subject.key_info).to be_nil
     end
   end

data/spec/lib/xmlenc/encrypted_document_spec.rb

@@ -65,10 +65,4 @@ describe Xmlenc::EncryptedDocument do
     end
   end
 
-  describe 'parsing documents' do
-    let(:encrypted_xml) { File.read('spec/fixtures/artifact_response.xml') }
-    fit 'finds the correct data' do
-      puts subject.encrypted_keys.count
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xmlenc
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
 platform: ruby
 authors:
 - Benoist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-22 00:00:00.000000000 Z
+date: 2017-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport