jcs.org / rubywarden
An unofficial, mostly Bitwarden-compatible API server written in Ruby (Sinatra and ActiveRecord)
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Convert CipherString to a string before passing to AR (#69)

Without this our data ends up as a raw object in the db.
Only tested on my end with keepass

Should fix #64 and #59

authored by

Aaron Bieber and committed by
joshua stein e539b67d 20280ce7

+4 -4
+1 -1
tools/1password_import.rb
··· 79 79 Bitwarden::KDF::TYPES[@u.kdf_type], @u.kdf_iterations) 80 80 81 81 def encrypt(str) 82 - @u.encrypt_data_with_master_password_key(str, @master_key) 82 + @u.encrypt_data_with_master_password_key(str, @master_key).to_s 83 83 end 84 84 85 85 to_save = {}
+1 -1
tools/bitwarden_import.rb
··· 35 35 end 36 36 37 37 def encrypt(str) 38 - @u.encrypt_data_with_master_password_key(str, @master_key) 38 + @u.encrypt_data_with_master_password_key(str, @master_key).to_s 39 39 end 40 40 41 41 def get_or_create_folder_uuid(str)
+1 -1
tools/keepass_import.rb
··· 91 91 end 92 92 93 93 def encrypt(str) 94 - @u.encrypt_data_with_master_password_key(str, @master_key) 94 + @u.encrypt_data_with_master_password_key(str, @master_key).to_s 95 95 end 96 96 97 97 def get_or_create_folder_uuid(str)
+1 -1
tools/lastpass_import.rb
··· 86 86 end 87 87 88 88 def encrypt(str) 89 - @u.encrypt_data_with_master_password_key(str, @master_key) 89 + @u.encrypt_data_with_master_password_key(str, @master_key).to_s 90 90 end 91 91 92 92 def get_or_create_folder_uuid(str)