nishiki/mpw
1
0
Fork 0
mirror of https://github.com/nishiki/manage-password.git synced 2025-02-22 10:50:10 +00:00
Code Issues Releases Activity

fix pinentry mode with gpg 1.4

Browse source
This commit is contained in:
Adrien Waksberg 2017-04-02 23:44:36 +02:00
parent 92cb89ad33
commit d1adfd24c1
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/mpw/mpw.rb
View file

@ -337,9 +337,18 @@ module MPW
def decrypt(data) def decrypt(data)
return nil if data.to_s.empty? return nil if data.to_s.empty?
crypto = GPGME::Crypto.new(armor: true) password =
if /^1\.[0-9.]+$/ =~ GPGME::Engine.info.first.version
{ password: @gpg_pass }
else
{ password: @gpg_pass,
pinentry_mode: GPGME::PINENTRY_MODE_LOOPBACK }
end
crypto.decrypt(data, password: @gpg_pass, pinentry_mode: GPGME::PINENTRY_MODE_LOOPBACK).read.force_encoding('utf-8') crypto = GPGME::Crypto.new(armor: true)
crypto
.decrypt(data, password)
.read.force_encoding('utf-8')
rescue => e rescue => e
raise "#{I18n.t('error.gpg_file.decrypt')}\n#{e}" raise "#{I18n.t('error.gpg_file.decrypt')}\n#{e}"
end end