ccipher_factory 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8e882748e988af57209ddc3342a3c791b60fcb8d78ad22ae83eaa607f1645d12
-  data.tar.gz: a2e9baaef537e4ede9201d677c8054e06c24344b2d8687481b13f0d31f8aa9b0
+  metadata.gz: bb2ce71c27c1cf55de4c778e9acd14c66eb67776886877ba62fc07dfa9e7d291
+  data.tar.gz: ab03a998acdad1131b9fe94d969f1854105767a2a81ac80c003e17967da2b5db
 SHA512:
-  metadata.gz: 95101b641134a18fcdab9627ec321806ca71cf7ce6b90927e4e71f5929a20e9ecf7bb1d3bed32489bde32cc0aee3fb560030d80f7e79693d4fc47e1bc0eacfca
-  data.tar.gz: '0559a64e2c0e866fdbd6fcdd6f2c6bf850be2cf4d67770175a019b3b0e7f867820e970bce678396c8a05266fcb6d9f938afba4747910f7bbae3c66bf80891a93'
+  metadata.gz: 4ae234edf1e0ca9c126600c8f5813950645912dbd400171bea2b2e911b7c5db18f76252636d4a699cbccc10b8ee281cc7f76236bbbf48831c1d2a4ab8f679f58
+  data.tar.gz: 85e8d6d06350ce23c78d649f94662c8a8bf2dbaa815c7f566742bed79037746c7f766d599022543459a94415f1ff5930443a0c1ed523543b8d53ba3bd5293d25

data/.release_history.yml

@@ -0,0 +1,6 @@
+---
+ccipher_factory:
+- :version: 0.1.0
+  :timestamp: 1660211506.8015714
+- :version: 0.1.1
+  :timestamp: 1678183843.7795694

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,
 
 
@@ -150,6 +152,15 @@ module CcipherFactory
             int :keysize
             bin :key
           end,
+
+          symkey_keystore: Binenc::EngineFactory.instance(:bin_struct).define do
+            oid :oid, BTag.constant_value(:symkey_keystore)
+            int :version, 0x0100
+            bin :symkey_derived
+            bin :symkey_cipher
+            bin :symkey
+          end,
+
           
           symkey_att_sign: Binenc::EngineFactory.instance(:bin_struct).define do
             oid :oid, BTag.constant_value(:symkey_att_sign)

data/lib/ccipher_factory/encoding/binenc_constant.rb

@@ -27,6 +27,8 @@ if not defined?(BTag)
         define_constant(:symkey_att_sign, "#.22")
 
         define_constant(:kcv, "#.30")
+
+        define_constant(:symkey_keystore, "#.50")
       end
 
       define_constant(:compression, "#.40") do
@@ -44,6 +46,8 @@ if not defined?(BTag)
 
           define_constant(:ecc_att_sign, "#.12")
         end
+
+        define_constant(:asymkey_keystore, "#.50")
       end
 
       define_constant(:composite, "#.60") do

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/symkey_keystore/symkey_keystore.rb

@@ -0,0 +1,74 @@
+
+
+module CcipherFactory
+  class SymKeyKeystore
+    include TR::CondUtils
+    def self.from_encoded(bin, &block)
+      
+      raise SymKeyCipherError, "Block is required" if not block
+
+      ts = BinStruct.instance.struct_from_bin(bin)
+      from_tspec(ts, &block)
+    end
+
+    def self.from_tspec(ts, &block)
+      
+      sk = CcipherFactory::SymKey.from_encoded(ts.symkey_derived) do |ops|
+        case ops
+        when :password
+          block.call(:password)
+        end
+      end
+
+      dec = CcipherFactory::SymKeyCipher.att_decryptor
+      decOut = MemBuf.new
+      dec.output(decOut)
+      dec.key = sk
+      dec.att_decrypt_init
+      dec.att_decrypt_update(ts.symkey_cipher)
+      dec.att_decrypt_final
+
+      CcipherFactory::SymKey.from_encoded(decOut.bytes)
+
+    end
+
+    def to_keystore(key, &block)
+     
+      raise SymKeyCipherError, "Key is required" if is_empty?(key)
+      raise SymKeyCipherError, "Block is required" if not block
+
+      # 1. Derive session key from user password
+      sk = CcipherFactory::SymKeyGenerator.derive(:aes, 256) do |ops|
+        case ops
+        when :password
+          pass = block.call(:password)
+          if is_empty?(pass)
+            raise SymKeyCipherError, "Password is required" 
+          end
+          pass
+        end
+      end
+    
+      # 2. Encrypt the given key with session key
+      enc = CcipherFactory::SymKeyCipher.att_encryptor 
+      enc.mode = :gcm
+      enc.key = sk
+
+      encOut = MemBuf.new
+      enc.output(encOut)
+
+      key.attach_mode
+
+      enc.att_encrypt_init
+      enc.att_encrypt_update(key.encoded)
+      enc.att_encrypt_final
+
+      ts = BinStruct.instance.struct(:symkey_keystore)
+      ts.symkey_derived = sk.encoded
+      ts.symkey_cipher = encOut.bytes
+      ts.symkey = "testing"
+      ts.encoded
+
+    end
+  end
+end

data/lib/ccipher_factory/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CcipherFactory
-  VERSION = "0.1.0"
+  VERSION = "0.1.2"
 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.2
 platform: ruby
 authors:
 - Ian
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-11 00:00:00.000000000 Z
+date: 2023-03-08 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
@@ -145,6 +146,7 @@ files:
 - lib/ccipher_factory/symkey_cipher/symkey_sign.rb
 - lib/ccipher_factory/symkey_cipher/symkey_signer.rb
 - lib/ccipher_factory/symkey_cipher/symkey_verify.rb
+- lib/ccipher_factory/symkey_keystore/symkey_keystore.rb
 - lib/ccipher_factory/version.rb
 - run_test.rb
 homepage: https://github.com/cameronian/ccipher_factory