ccipher_factory 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a83a5b71fd4c1ed7974bd951d3ecb84b01ca18060a323a7bf76d25d9c63ca3a
-  data.tar.gz: b5ef665bf09048f3c2c8534beafb13e7624d0f18403292ab7122d02b7735ef3c
+  metadata.gz: bb2ce71c27c1cf55de4c778e9acd14c66eb67776886877ba62fc07dfa9e7d291
+  data.tar.gz: ab03a998acdad1131b9fe94d969f1854105767a2a81ac80c003e17967da2b5db
 SHA512:
-  metadata.gz: f96c5d460d68e4a70300861d7e94e8a0abc7d0b86b207d50763caef2099470cc8e4da26ea523b3bd8a5d3224724d4a33d2043f66d6d2273c67b90dddbe3709b0
-  data.tar.gz: 2b2e4585e99cd7c1ecea2b07ebf4dadfa90111a3c17763c64684483d19ab6e9f476fa6ce4049ce014708ff4ae8b9fefde203debac21fe37c96f4737fee9ef8f5
+  metadata.gz: 4ae234edf1e0ca9c126600c8f5813950645912dbd400171bea2b2e911b7c5db18f76252636d4a699cbccc10b8ee281cc7f76236bbbf48831c1d2a4ab8f679f58
+  data.tar.gz: 85e8d6d06350ce23c78d649f94662c8a8bf2dbaa815c7f566742bed79037746c7f766d599022543459a94415f1ff5930443a0c1ed523543b8d53ba3bd5293d25

data/.release_history.yml

@@ -2,3 +2,5 @@
 ccipher_factory:
 - :version: 0.1.0
   :timestamp: 1660211506.8015714
+- :version: 0.1.1
+  :timestamp: 1678183843.7795694

data/lib/ccipher_factory/encoding/bin_struct.rb

@@ -152,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/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.1"
+  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.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ian
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-03-07 00:00:00.000000000 Z
+date: 2023-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: toolrack
@@ -146,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