aspis 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 185a743d7eac9bf51be9f4fe226230f1f80c40a62a4bb0f0369220225df4b1ce
-  data.tar.gz: ae52af9fd222c6d38c749e0c768bc27f33f141e0dd628e750b689ed31e10eabd
+  metadata.gz: 978a70410af727b8fa5742fa96cd055b9cb767e38fbfdb837b654145afbb44cf
+  data.tar.gz: 48521856c3b2878674692c9ed81fdb50b3de4eb2966ff16af6115ef431b8e0d1
 SHA512:
-  metadata.gz: 36b039f303d773fef53aeeaef29d0991a30d7c4093d9e52e6d755e4876ce1c5836efdbfa3b348329b7d1101f6b9c6aa27853009ee2a353885a1c14af161cf22e
-  data.tar.gz: 2a987e228220b1996b5de171e05f1bdc91ad7f10892b65903df24c3ea30ae5f4153506421f562f336f19310a551042cc2e1e512ca4516e7a88feb5164db96021
+  metadata.gz: 82fd12f2436e209fb0a506995f13bff752b7decc46b2d4fd9d5bacefd0a3d65002e8366f9360ab4957988e560fc5034ec98c858422fdd7dae910791d3a6edad0
+  data.tar.gz: 980065d8833495225ed8bae2d7b4058ded99b1fe249f3ee2eb1c3476beebf1bc48144d146655433d6e043abac40e5f5706437b3f0e77012349125e92c1d56547

data/lib/aspis.rb

@@ -1,10 +1,8 @@
 # frozen_string_literal: true
 
 require 'aspis/version'
-require 'aspis/asymmetric_encrypt'
-require 'aspis/asymmetric_decrypt'
-require 'aspis/symmetric_encrypt'
-require 'aspis/symmetric_decrypt'
+require 'aspis/asymmetric'
+require 'aspis/symmetric'
 require 'aspis/generate_keys'
 require 'aspis/aspis_init'
 

data/lib/aspis/aspis_init.rb

@@ -15,10 +15,8 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 require 'optparse'
 
-require_relative 'asymmetric_encrypt.rb'
-require_relative 'asymmetric_decrypt.rb'
-require_relative 'symmetric_encrypt.rb'
-require_relative 'symmetric_decrypt.rb'
+require_relative 'asymmetric.rb'
+require_relative 'symmetric.rb'
 require_relative 'generate_keys.rb'
 require_relative 'version.rb'
 
@@ -84,15 +82,15 @@ module AspisInit
     case options[:mode]
     when 'encrypt'
       if options[:public_key]
-        puts AsymmetricEncrypt.encrypt(ARGF.read, options[:public_key], options[:private_key], options[:ask_pass])
+        puts Asymmetric.encrypt(ARGF.read, options[:public_key], options[:private_key], options[:ask_pass])
       else
-        puts SymmetricEncrypt.encrypt(ARGF.read, options[:opslimit], options[:memlimit], options[:ask_pass])
+        puts Symmetric.encrypt(ARGF.read, options[:opslimit], options[:memlimit], options[:ask_pass])
       end
     when 'decrypt'
       if options[:public_key]
-        puts AsymmetricDecrypt.decrypt(ARGF.read, options[:public_key], options[:private_key], options[:ask_pass])
+        puts Asymmetric.decrypt(ARGF.read, options[:public_key], options[:private_key], options[:ask_pass])
       else
-        puts SymmetricDecrypt.decrypt(ARGF.read, options[:ask_pass])
+        puts Symmetric.decrypt(ARGF.read, options[:ask_pass])
       end
     when 'generate'
       GenerateKeys.generate(options[:opslimit], options[:memlimit], options[:ask_pass])

data/lib/aspis/{asymmetric_encrypt.rb → asymmetric.rb}

@@ -5,16 +5,16 @@ require 'fileutils'
 require 'base64'
 require 'json'
 
-require_relative 'symmetric_decrypt.rb'
+require_relative 'symmetric.rb'
 require_relative 'version.rb'
 
-module AsymmetricEncrypt
+module Asymmetric
   def self.encrypt(plaintext, public_key, private_key, ask_pass)
     recipient_public_key = File.read(public_key)
     recipient_public_key = Base64.decode64(recipient_public_key)
 
     sender_private_key = File.read(private_key)
-    sender_private_key = SymmetricDecrypt.decrypt(sender_private_key, ask_pass)
+    sender_private_key = Symmetric.decrypt(sender_private_key, ask_pass)
 
     box = RbNaCl::SimpleBox.from_keypair(recipient_public_key, sender_private_key)
     ciphertext = box.encrypt(plaintext)
@@ -23,5 +23,20 @@ module AsymmetricEncrypt
     output = { version: Aspis::VERSION,
                ciphertext: ciphertext }
     JSON.generate(output)
+  end 
+
+  def self.decrypt(input, public_key, private_key, ask_pass)
+    sender_public_key = File.read(public_key)
+    sender_public_key = Base64.decode64(sender_public_key)
+
+    recipient_private_key = File.read(private_key)
+    recipient_private_key = Symmetric.decrypt(recipient_private_key, ask_pass)
+
+    box = RbNaCl::SimpleBox.from_keypair(sender_public_key, recipient_private_key)
+
+    input = JSON.parse(input)
+    ciphertext = input['ciphertext']
+    ciphertext = Base64.decode64(ciphertext)
+    box.decrypt(ciphertext)
   end
 end

data/lib/aspis/generate_keys.rb

@@ -4,7 +4,7 @@ require 'rbnacl'
 require 'fileutils'
 require 'base64'
 
-require_relative 'symmetric_encrypt.rb'
+require_relative 'symmetric.rb'
 
 module GenerateKeys
   def self.generate(opslimit, memlimit, ask_pass)
@@ -16,7 +16,7 @@ module GenerateKeys
     public_key = Base64.strict_encode64(public_key)
 
     # Encrypt private key before writing to disk
-    private_key = SymmetricEncrypt.encrypt(private_key, opslimit, memlimit, ask_pass)
+    private_key = Symmetric.encrypt(private_key, opslimit, memlimit, ask_pass)
 
     File.write(aspis_dir + '/private_key', private_key)
     File.write(aspis_dir + '/public_key', public_key)

data/lib/aspis/{symmetric_encrypt.rb → symmetric.rb}

@@ -5,7 +5,7 @@ require 'json'
 require 'base64'
 require 'io/console'
 
-module SymmetricEncrypt
+module Symmetric
   def self.timingsafe_compare(secret1, secret2)
     check = secret1.bytesize ^ secret2.bytesize
     secret1.bytes.zip(secret2.bytes) { |x, y| check |= x ^ y.to_i }
@@ -59,4 +59,35 @@ module SymmetricEncrypt
 
     JSON.generate(output)
   end
+
+def self.decrypt(input, ask_pass)
+    input = JSON.parse(input)
+
+    salt = input['salt']
+    salt = Base64.decode64(salt)
+
+    ops = input['ops']
+    mem = input['mem']
+    key_size = input['key_size']
+
+    ciphertext = input['ciphertext']
+    ciphertext = Base64.decode64(ciphertext)
+
+    password = if ask_pass == false
+                 ENV['ASPIS_PASS']
+               else
+                 IO.console.getpass 'Enter passphrase: '
+               end 
+
+    key = RbNaCl::PasswordHash.argon2i(
+      password,
+      salt,
+      ops,
+      mem,
+      key_size
+    )   
+
+    box = RbNaCl::SimpleBox.from_secret_key(key)
+    box.decrypt(ciphertext)
+  end
 end

data/lib/aspis/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aspis
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Joseph Fierro
@@ -100,11 +100,9 @@ files:
 - exe/aspis
 - lib/aspis.rb
 - lib/aspis/aspis_init.rb
-- lib/aspis/asymmetric_decrypt.rb
-- lib/aspis/asymmetric_encrypt.rb
+- lib/aspis/asymmetric.rb
 - lib/aspis/generate_keys.rb
-- lib/aspis/symmetric_decrypt.rb
-- lib/aspis/symmetric_encrypt.rb
+- lib/aspis/symmetric.rb
 - lib/aspis/version.rb
 homepage: https://github.com/jsfierro/aspis
 licenses:

data/lib/aspis/asymmetric_decrypt.rb

@@ -1,25 +0,0 @@
-# frozen_string_literal: true
-
-require 'rbnacl'
-require 'fileutils'
-require 'base64'
-require 'json'
-
-require_relative 'symmetric_decrypt.rb'
-
-module AsymmetricDecrypt
-  def self.decrypt(input, public_key, private_key, ask_pass)
-    sender_public_key = File.read(public_key)
-    sender_public_key = Base64.decode64(sender_public_key)
-
-    recipient_private_key = File.read(private_key)
-    recipient_private_key = SymmetricDecrypt.decrypt(recipient_private_key, ask_pass)
-
-    box = RbNaCl::SimpleBox.from_keypair(sender_public_key, recipient_private_key)
-
-    input = JSON.parse(input)
-    ciphertext = input['ciphertext']
-    ciphertext = Base64.decode64(ciphertext)
-    box.decrypt(ciphertext)
-  end
-end

data/lib/aspis/symmetric_decrypt.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-require 'rbnacl'
-require 'json'
-require 'base64'
-
-module SymmetricDecrypt
-  def self.decrypt(input, ask_pass)
-    input = JSON.parse(input)
-
-    salt = input['salt']
-    salt = Base64.decode64(salt)
-
-    ops = input['ops']
-    mem = input['mem']
-    key_size = input['key_size']
-
-    ciphertext = input['ciphertext']
-    ciphertext = Base64.decode64(ciphertext)
-
-    password = if ask_pass == false
-                 ENV['ASPIS_PASS']
-               else
-                 IO.console.getpass 'Enter passphrase: '
-               end
-
-    key = RbNaCl::PasswordHash.argon2i(
-      password,
-      salt,
-      ops,
-      mem,
-      key_size
-    )
-
-    box = RbNaCl::SimpleBox.from_secret_key(key)
-    box.decrypt(ciphertext)
-  end
-end