ltec 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8d26733395b3b78dc2ec834297af2fe7773acf8f4f3b9de6681f226b4d82fa3
-  data.tar.gz: 1f37579b78dde51aa930d1cac9511837ee399dfd3924344e9f2ebff4f0032065
+  metadata.gz: 7ce0a8046af3c372c5d9747dfd683b81c3932c140bc6def663e8a2e906c40d06
+  data.tar.gz: 2c4ba23adb846477de6e15626b25f691f6ebcb2c024786fdb5668a028345d4db
 SHA512:
-  metadata.gz: ff58f4e4698ca7f495627db0763cba642dbe60abd32583feb653dbbdc14e0cfa447c4d27ffc56977331cfe24098a5eec33cdd6f4b1f2a8d6df99551b583c2751
-  data.tar.gz: 9d3b5eb65fd5bab11c43dafda2e83aa6586c0fa9038e5b05c79af41e9df5d1856b7702b50ad0f3f31c214c95452090e42774ea0052f46540f3c06ea842c6bd8b
+  metadata.gz: 0c587741da4cf932e833ffa0f02ac0fa72b602bf53350f1fcad7ff87a798f97a5eab215cb9019ccb8c6b0fce532ee062e9e92e7d7e79eca2af377afdde4a8f85
+  data.tar.gz: f9a4ece61730d029d94f2bd8431c4de373360d908694cc12fa49ff77449cb7c634e46085e8b4595baacc8c7017cb8117e05c8f03be25f23c9cf54f27b1cbb767

data/Gemfile.lock

@@ -1,18 +1,18 @@
 PATH
   remote: .
   specs:
-    ltec (0.1.0)
+    ltec (0.1.3)
       base64 (~> 0.1.0)
       openssl (~> 2.2.0)
-      salsa20 (~> 0.1.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    base64 (0.1.0)
-    openssl (2.2.0)
-    rake (13.0.3)
-    salsa20 (0.1.3)
+    base64 (0.1.1)
+    ipaddr (1.2.4)
+    openssl (2.2.1)
+      ipaddr
+    rake (13.0.6)
 
 PLATFORMS
   x86_64-darwin-20

data/README.md

@@ -3,6 +3,10 @@
 a tinny tool to encryt your private message via ECC(Secp256k1)
 
 
+# upate 0.1.2
+using AES instead of Salsa20 
+
+
 ## Installation
 
 Install the gem and add to the application's Gemfile by executing:

data/exe/ltectool

@@ -15,7 +15,7 @@ require "ltec"
 cmd = ARGV[0]
 
 if cmd == 'g'
-    kp = Ltec::EC.generateKeyPair()
+    kp = Ltec::EC.generateKeyPair(ARGV[1])
     puts "publickey: #{kp['pubkey']}"
     puts "privatekey: #{kp['seckey']}"
 elsif cmd == 'e'
@@ -33,7 +33,7 @@ else
     puts <<EOF
     ltectool cmd [options]
      commands
-       g   generate key pair
+       g [privateKey]  generate key pair
        e    publickey   message
        d    privatekey  message
 

data/lib/ltec/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ltec
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 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
@@ -29,11 +28,43 @@ module Ltec
         return base64.unpack("m*")[0].unpack('H*')[0]
     end
     
-    def EC.generateKeyPair()
-        ec1 = OpenSSL::PKey::EC.generate(SECP256K1)
-        seckey = EC.hexToBase64(ec1.private_key.to_s(16))
-        pubkey = EC.hexToBase64(ec1.public_key.to_bn(:compressed).to_s(16))
-        return {"seckey" => seckey.strip,"pubkey" => pubkey.strip}
+    def EC.generateKeyPair(inputSecKey)
+        if inputSecKey 
+            puts "generate key pair from secret key"
+           if inputSecKey.length < 44   # 32 byte
+               throw "secret key length error ,it's 32 "
+               
+           end
+
+            ec = OpenSSL::PKey::EC.new(SECP256K1)
+            pubNum = OpenSSL::BN.new("1",16)
+            tmpPt = OpenSSL::PKey::EC::Point.new(ec.group)
+
+            priKey = OpenSSL::BN.new(toHex(base64Decode(inputSecKey)),16) 
+
+            maxStr = 'FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141'
+            OpenSSL
+            max = OpenSSL::BN.new(maxStr,16) 
+            if priKey >= max
+                throw "Private Key must be smaller than #{maxStr}"
+            end
+
+
+
+
+            pubPt =  tmpPt.mul(0,priKey)
+            hexpt = pubPt.to_bn(:compressed).to_s(16)
+            pub64 = hexToBase64(hexpt)
+
+            return {"seckey" => inputSecKey.strip,"pubkey" => pub64.strip}
+        else 
+            puts 'create New key pair'
+            ec1 = OpenSSL::PKey::EC.generate(SECP256K1)
+            seckey = EC.hexToBase64(ec1.private_key.to_s(16))
+            pubkey = EC.hexToBase64(ec1.public_key.to_bn(:compressed).to_s(16))
+            return {"seckey" => seckey.strip,"pubkey" => pubkey.strip}
+        end
+       
     end 
     
     def EC.encrypt(pubKey,msg)
@@ -65,24 +96,34 @@ 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
         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 +146,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(ARGV[0])
+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.3
 platform: ruby
 authors:
 - vitock
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-05-13 00:00:00.000000000 Z
+date: 2022-06-01 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