simple_crypt 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19887745fe51e79e906c60336ccc4803b418fce128ce5c61229cb441e2b581fa
-  data.tar.gz: f55e18a8ff56b74f734cebebf370d39c8f1a61a04cd34400599515299b3d617b
+  metadata.gz: 4ef4c33991428c84237551c5d7eecf83dc17f21579f5f85027f35f5eb89b2979
+  data.tar.gz: 3e4b223d1ecd2cd71c6df841c14a5a84f9d447353fe6c779774f891d6abc8148
 SHA512:
-  metadata.gz: 572602b36627f94c9912dbdbb77a2958c1b7fdccb1ee7ddfc80dc929a8db485334895816493f2990cac6f586ce903c635e0e23103dd4b13f12801dfd98034383
-  data.tar.gz: dde02a4ec2170d0153c829d0ec6d16e30040c240242661836b2f6a69d260d2d7a218bc813ac8bd1342348b7211668cda8905738d10c2696c3f91828d4072751b
+  metadata.gz: 7418353c839a55671ed4dd865c20f0dc675cd27f236f216b9ef1b6349a9a408c7aa705aee60c4d3b996bca550ea12b77bca5fcbdb4ffaa84ab097a7c3eff658f
+  data.tar.gz: d297d9643c97b3a1d1237a38fe65b6dc746dd797e0b3a8ec373f42a7dc9db68e82227a6e3332a43f96d0913d8c9b455b89a46c58a7b19744d56e76a130181c07

data/lib/simple_crypt.rb

@@ -1,19 +1,22 @@
 require 'base64'
 require 'openssl'
 require 'securerandom'
-require 'simple_crypt/secret'
+require_relative 'simple_crypt/secret'
 
 # encrypts and stores and decrypts secrets
 module SimpleCrypt
   def self.encrypt(data, pwd)
-    cipher = OpenSSL::Cipher.new('aes-256-gcm')
-    cipher.encrypt
-    iv = cipher.random_iv
-    salt = OpenSSL::Random.random_bytes 16
+    iv = OpenSSL::Random.random_bytes(12)
+    salt = OpenSSL::Random.random_bytes(16)
     auth_data = SecureRandom.urlsafe_base64(16)
     key = gen_key(pwd, salt)
+
+    cipher = OpenSSL::Cipher.new('aes-256-gcm')
+    cipher.encrypt
+    cipher.iv = iv
     cipher.key = key
     cipher.auth_data = auth_data
+
     sec = SimpleCrypt::Secret.new
     sec.secret_data = Base64.strict_encode64(cipher.update(data) + cipher.final)
     sec.iv = Base64.strict_encode64(iv)
@@ -26,13 +29,14 @@ module SimpleCrypt
   def self.decrypt(secret, pwd)
     salt = Base64.strict_decode64(secret.salt)
     secret_data = Base64.strict_decode64(secret.secret_data)
+
     decipher = OpenSSL::Cipher.new('aes-256-gcm')
     decipher.decrypt
     decipher.iv = Base64.strict_decode64(secret.iv)
-    key = gen_key(pwd, salt)
-    decipher.key = key
+    decipher.key = gen_key(pwd, salt)
     decipher.auth_tag = Base64.strict_decode64(secret.auth_tag)
     decipher.auth_data = secret.auth_data
+
     begin
       decrypted = decipher.update(secret_data) + decipher.final
       return decrypted

data/lib/simple_crypt/secret.rb

@@ -1,5 +1,3 @@
-require 'json'
-
 # stores secret info as a class
 module SimpleCrypt
   class Secret
@@ -12,21 +10,5 @@ module SimpleCrypt
       @auth_tag = auth_tag
       @auth_data = auth_data
     end
-
-    def to_json
-      JSON.generate(Hash[instance_variables.map { |name| [name, instance_variable_get(name)] }])
-    end
-
-    def self.load(json)
-      data = JSON.parse(json)
-      s = new(
-        data['@secret_data'],
-        data['@iv'],
-        data['@salt'],
-        data['@auth_tag'],
-        data['@auth_data']
-      )
-      s
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_crypt
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Nick Silverman
@@ -18,10 +18,11 @@ extra_rdoc_files: []
 files:
 - lib/simple_crypt.rb
 - lib/simple_crypt/secret.rb
-homepage: 
+homepage: https://github.com/nckslvrmn/simple_crypt
 licenses:
 - GPL-3.0
-metadata: {}
+metadata:
+  source_code_uri: https://github.com/nckslvrmn/simple_crypt
 post_install_message: 
 rdoc_options: []
 require_paths: