ltec 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8d26733395b3b78dc2ec834297af2fe7773acf8f4f3b9de6681f226b4d82fa3
-  data.tar.gz: 1f37579b78dde51aa930d1cac9511837ee399dfd3924344e9f2ebff4f0032065
+  metadata.gz: fb6af2beec7f8bbecdf9ab6f626f7241ab135a750cb0d9149a681f11b88c13cf
+  data.tar.gz: b13e8e025bffa6da9e2820b64758f85491da2b4c987ef76b81e7f200a9ee5e07
 SHA512:
-  metadata.gz: ff58f4e4698ca7f495627db0763cba642dbe60abd32583feb653dbbdc14e0cfa447c4d27ffc56977331cfe24098a5eec33cdd6f4b1f2a8d6df99551b583c2751
-  data.tar.gz: 9d3b5eb65fd5bab11c43dafda2e83aa6586c0fa9038e5b05c79af41e9df5d1856b7702b50ad0f3f31c214c95452090e42774ea0052f46540f3c06ea842c6bd8b
+  metadata.gz: 315ddf7858cb471ff3ef415e05c464519da4417bea2a74084cea74344cb3df9ee961359b262289e8f0f38ba3134a8ddc0e4ceaca79260ea9847e5ea6b02e9cd7
+  data.tar.gz: 2d7919deac25120018c9a75b6e3ec65350837f95bb86038702143f56851a0096db9047fe6f484e5271bb26eaf0df16f35f7733f720a378bd7fdc3065fe126516

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ltec (0.1.0)
+    ltec (0.1.1)
       base64 (~> 0.1.0)
       openssl (~> 2.2.0)
       salsa20 (~> 0.1.3)
@@ -9,8 +9,10 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    base64 (0.1.0)
-    openssl (2.2.0)
+    base64 (0.1.1)
+    ipaddr (1.2.4)
+    openssl (2.2.1)
+      ipaddr
     rake (13.0.3)
     salsa20 (0.1.3)
 

data/lib/ltec/version.rb

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

data/lib/ltec.rb

@@ -3,7 +3,6 @@
 require_relative "ltec/version"
 require 'openssl'
 require "base64"
-require 'salsa20'
 
 module Ltec
   class Error < StandardError; end
@@ -65,24 +64,35 @@ module Ltec
             
         dhHash = OpenSSL::Digest.digest("SHA512", ptX)
             
-        nonce = OpenSSL::Random.random_bytes(8)
-        encryptor = Salsa20.new(dhHash[0...32], nonce)
-        encrypted_text = encryptor.encrypt(msg)
-    
+        nonce = OpenSSL::Random.random_bytes(16)
+
+        encryptor = OpenSSL::Cipher::AES256.new(:CBC)
+        encryptor.encrypt
+        encryptor.key =  dhHash[0...32]
+        encryptor.iv =  nonce
+        
+
+        # encryptor = Salsa20.new(dhHash[0...32], nonce)
+        encrypted_text = encryptor.update(msg) + encryptor.final
+        puts 1123
         dataforMac = nonce + empherPub + encrypted_text
         mac = OpenSSL::HMAC.digest('sha256', dhHash[32,64], dataforMac)
     
         # 
-        return base64(fromHex('0300080020002100') + nonce + mac + empherPub + encrypted_text)
+        return base64(fromHex('0100100020002100') + nonce + mac + empherPub + encrypted_text)
             
     end
     
     def EC.decrypt(secKey,base64Cipher)
         encResult = base64Decode(base64Cipher)
-        nonce = encResult[8...16]
-        mac = encResult[16...48]
-        tmpPub = encResult[48...81]
-        dataEnc = encResult[81...encResult.length]
+        start = 8
+        nonce = encResult[start...(start + 16)] 
+        start = start + 16;
+        mac = encResult[start...(start + 32)]
+        start = start + 32;
+        tmpPub = encResult[start...(start + 33)]
+        start = start + 33;
+        dataEnc = encResult[start...(encResult.length)]
     
         tmpPubHex = toHex(tmpPub)
         ec = OpenSSL::PKey::EC.new(SECP256K1)
@@ -105,9 +115,13 @@ module Ltec
         if mac2 != mac 
             raise 'Mac not Fit,the privateKey is not fit'
         end
-            
-        encryptor = Salsa20.new(key, nonce)
-        txt = encryptor.decrypt(dataEnc)
+        # encryptor = Salsa20.new(key, nonce)
+        # txt = encryptor.decrypt(dataEnc)
+        encryptor = OpenSSL::Cipher::AES256.new(:CBC)
+        encryptor.decrypt
+        encryptor.key =  key
+        encryptor.iv =  nonce
+        txt = encryptor.update(dataEnc) + encryptor.final
         return txt
     end
   end

data/lib/test.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require_relative "ltec" 
+
+kp = Ltec::EC.generateKeyPair()
+puts kp 
+msg = "hello"
+msg2 = "hello world3"
+
+enc1 = Ltec::EC.encrypt(kp['pubkey'],msg)
+dec1 = Ltec::EC.decrypt(kp['seckey'],enc1)
+puts enc1 
+puts dec1
+
+
+
+enc2 = Ltec::EC.encrypt(kp['pubkey'],msg2)
+dec2 = Ltec::EC.decrypt(kp['seckey'],enc2)
+puts enc2
+puts dec2

data/ltec.gemspec

@@ -35,7 +35,6 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "openssl", "~> 2.2.0"
   spec.add_dependency "base64", "~> 0.1.0"
-  spec.add_dependency "salsa20", "~> 0.1.3"
   
 
   # For more information and examples about making a new gem, check out our

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ltec
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - vitock
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-13 00:00:00.000000000 Z
+date: 2022-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: openssl
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
-- !ruby/object:Gem::Dependency
-  name: salsa20
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.3
 description: 'using ECC  to enrypt private message with ruby ,the curve is SECP256k1  '
 email:
 - ''
@@ -67,6 +53,7 @@ files:
 - exe/ltectool
 - lib/ltec.rb
 - lib/ltec/version.rb
+- lib/test.rb
 - ltec.gemspec
 - sig/ltec.rbs
 homepage: https://github.com/vitock/ltec_rb.git