Remove all mentions of salt from repo and use :per_attribute_iv mode …

…by default
riboseinc · Mar 12, 2019 · f1862af · f1862af
1 parent 9d5b4aa
commit f1862af
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 4 deletions.
diff --git a/app/models/rails/keyserver/key.rb b/app/models/rails/keyserver/key.rb
@@ -47,7 +47,7 @@ def save_fingerprint; end
 
       attr_encrypted :private,
                      key:  Engine.config.encryption_key,
-                     mode: :per_attribute_iv_and_salt
+                     mode: Engine.config.try(:encryption_mode) || :per_attribute_iv
 
       scope :primary, -> {
         pkg = arel_table[:primary_key_grip]

diff --git a/db/migrate/20180822000001_create_schema.rb b/db/migrate/20180822000001_create_schema.rb
@@ -23,7 +23,6 @@ def up
       t.string     :owner_type
       t.binary     :public
       t.binary     :encrypted_private
-      t.binary     :encrypted_private_salt
       t.binary     :encrypted_private_iv
       t.datetime   :activation_date
       t.text       :metadata

diff --git a/spec/models/rails/key/pgp_spec.rb b/spec/models/rails/key/pgp_spec.rb
@@ -640,5 +640,4 @@
   # - read rails pub & pri
   # - Remove private key once a new key is activated
   # - Change encryption key of the new key when it is encrypted
-  # use salt
 end
diff --git a/spec/test_app/db/schema.rb b/spec/test_app/db/schema.rb
@@ -23,7 +23,6 @@
     t.string "owner_type"
     t.binary "public"
     t.binary "encrypted_private"
-    t.binary "encrypted_private_salt"
     t.datetime "activation_date"
     t.text "metadata"
     t.datetime "created_at"