ccipher_factory 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e882748e988af57209ddc3342a3c791b60fcb8d78ad22ae83eaa607f1645d12
-  data.tar.gz: a2e9baaef537e4ede9201d677c8054e06c24344b2d8687481b13f0d31f8aa9b0
+  metadata.gz: 4a83a5b71fd4c1ed7974bd951d3ecb84b01ca18060a323a7bf76d25d9c63ca3a
+  data.tar.gz: b5ef665bf09048f3c2c8534beafb13e7624d0f18403292ab7122d02b7735ef3c
 SHA512:
-  metadata.gz: 95101b641134a18fcdab9627ec321806ca71cf7ce6b90927e4e71f5929a20e9ecf7bb1d3bed32489bde32cc0aee3fb560030d80f7e79693d4fc47e1bc0eacfca
-  data.tar.gz: '0559a64e2c0e866fdbd6fcdd6f2c6bf850be2cf4d67770175a019b3b0e7f867820e970bce678396c8a05266fcb6d9f938afba4747910f7bbae3c66bf80891a93'
+  metadata.gz: f96c5d460d68e4a70300861d7e94e8a0abc7d0b86b207d50763caef2099470cc8e4da26ea523b3bd8a5d3224724d4a33d2043f66d6d2273c67b90dddbe3709b0
+  data.tar.gz: 2b2e4585e99cd7c1ecea2b07ebf4dadfa90111a3c17763c64684483d19ab6e9f476fa6ce4049ce014708ff4ae8b9fefde203debac21fe37c96f4737fee9ef8f5

data/.release_history.yml

@@ -0,0 +1,4 @@
+---
+ccipher_factory:
+- :version: 0.1.0
+  :timestamp: 1660211506.8015714

data/lib/ccipher_factory/encoding/bin_struct.rb

@@ -103,6 +103,7 @@ module CcipherFactory
             int :digest
             int :outByteLength
             bin :salt
+            bin :value
           end,
 
           kdf_scrypt: Binenc::EngineFactory.instance(:bin_struct).define do
@@ -114,9 +115,9 @@ module CcipherFactory
             int :blocksize
             int :parallel
             int :outByteLength
+            bin :value
           end,
 
-
           kdf_pbkdf2: Binenc::EngineFactory.instance(:bin_struct).define do
             oid :oid, BTag.constant_value(:kdf_pbkdf2)
             int :version, 0x0100
@@ -124,6 +125,7 @@ module CcipherFactory
             bin :salt
             int :iterations
             int :outByteLength
+            bin :value
           end,
 
 

data/lib/ccipher_factory/kdf/hkdf.rb

@@ -13,6 +13,7 @@ module CcipherFactory
 
       attr_accessor :outByteLength, :salt
       attr_accessor :digestAlgo
+      attr_accessor :attachedDigest, :attachedValue
       attr_reader :derivedVal
       def derive_init(*args, &block)
 
@@ -21,6 +22,12 @@ module CcipherFactory
 
         @salt = SecureRandom.random_bytes(@outByteLength) if is_empty?(@salt)
 
+        if is_empty?(@attachedValue)
+          @attachedDigest = false if is_empty?(@attachedDigest)
+        else
+          @attachedDigest = true
+        end
+
         if block
           instance_eval(&block)
           derive_final
@@ -96,10 +103,23 @@ module CcipherFactory
         ts.digest = BTag.constant_value(digestId)
         ts.salt = @salt
         ts.outByteLength = @outByteLength
+        if is_bool?(@attachedDigest) and @attachedDigest
+          ts.value = @derivedVal
+        else
+          ts.value = ""
+        end
         ts.encoded
 
       end
 
+      def is_attached_mode?
+        if is_empty?(@attachedValue) 
+          @attachedDigest
+        else
+          true
+        end
+      end
+
       private
       def logger
         if @logger.nil?

data/lib/ccipher_factory/kdf/kdf.rb

@@ -47,6 +47,7 @@ module CcipherFactory
         kdf.salt = ts.salt
         kdf.outByteLength = ts.outByteLength
         kdf.digest = Digest.from_encoded(ts.digest)
+        kdf.attachedValue = ts.value
         kdf.derive_init
         kdf
       when :kdf_hkdf
@@ -55,6 +56,7 @@ module CcipherFactory
         kdf.digestAlgo = BTag.value_constant(ts.digest)
         kdf.salt = ts.salt
         kdf.outByteLength = ts.outByteLength
+        kdf.attachedValue = ts.value
         kdf.derive_init
       when :kdf_pbkdf2
         kdf = KDFEngine.new
@@ -63,6 +65,7 @@ module CcipherFactory
         kdf.salt = ts.salt
         kdf.iter = ts.iterations
         kdf.outByteLength = ts.outByteLength
+        kdf.attachedValue = ts.value
         kdf.derive_init
       else
         raise KDFError, "Unknown KDF envelope ID '#{ts.oid}'"

data/lib/ccipher_factory/kdf/pbkdf2.rb

@@ -7,6 +7,8 @@ module CcipherFactory
       include Common
 
       attr_accessor :salt, :iter, :outByteLength, :digestAlgo
+      attr_accessor :attachedDigest, :attachedValue
+      attr_reader :derivedVal
 
       def derive_init(*args, &block)
 
@@ -15,6 +17,12 @@ module CcipherFactory
 
         @salt = SecureRandom.random_bytes(@outByteLength) if is_empty?(@salt)
 
+        if is_empty?(@attachedValue)
+          @attachedDigest = false if is_empty?(@attachedDigest)
+        else
+          @attachedDigest = true
+        end
+
         if block
           instance_eval(&block)
           derive_final
@@ -65,10 +73,23 @@ module CcipherFactory
         ts.salt = @salt
         ts.outByteLength = @outByteLength
         ts.iterations = hconf.iter
+        if is_bool?(@attachedDigest) and @attachedDigest
+          ts.value = @derivedVal
+        else
+          ts.value = ""
+        end
         ts.encoded
 
       end
 
+      def is_attached_mode?
+        if is_empty?(@attachedValue) 
+          @attachedDigest
+        else
+          true
+        end
+      end
+
       def logger
         if @logger.nil?
           @logger = TeLogger::Tlogger.new

data/lib/ccipher_factory/kdf/scrypt.rb

@@ -14,6 +14,7 @@ module CcipherFactory
       ##
       attr_accessor :cost, :parallel, :blocksize, :salt, :outByteLength
       attr_accessor :digestAlgo, :digest
+      attr_accessor :attachedDigest, :attachedValue
       attr_reader :derivedVal
       def derive_init(*args, &block)
 
@@ -44,6 +45,12 @@ module CcipherFactory
 
         @digest.output(intOutputBuf)
 
+        if is_empty?(@attachedValue)
+          @attachedDigest = false if is_empty?(@attachedDigest)
+        else
+          @attachedDigest = true
+        end
+
         if block
           instance_eval(&block)
           derive_final
@@ -85,10 +92,23 @@ module CcipherFactory
         ts.blocksize = @blocksize
         ts.parallel = @parallel
         ts.outByteLength = @outByteLength
+        if is_bool?(@attachedDigest) and @attachedDigest
+          ts.value = @derivedVal
+        else
+          ts.value = ""
+        end
         ts.encoded
 
       end
 
+      def is_attached_mode?
+        if is_empty?(@attachedValue) 
+          @attachedDigest
+        else
+          true
+        end
+      end
+
       private
       def logger
         if @logger.nil?

data/lib/ccipher_factory/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CcipherFactory
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ccipher_factory
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Ian
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-11 00:00:00.000000000 Z
+date: 2023-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toolrack
@@ -87,6 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".release_history.yml"
 - ".rspec"
 - Gemfile
 - Gemfile.lock-java