浏览代码

backups/qvm-tools: decode password using console encoding

Marek Marczykowski-Górecki 10 年之前
父节点
当前提交
4ff39859c4
共有 2 个文件被更改,包括 4 次插入0 次删除
  1. 2 0
      qvm-tools/qvm-backup
  2. 2 0
      qvm-tools/qvm-backup-restore

+ 2 - 0
qvm-tools/qvm-backup

@@ -142,6 +142,8 @@ def main():
         print >>sys.stderr, "ERROR: Password mismatch"
         exit(1)
 
+    passphrase = passphrase.decode(sys.stdin.encoding)
+
     kwargs = {}
     if options.hmac_algorithm:
         kwargs['hmac_algorithm'] = options.hmac_algorithm

+ 2 - 0
qvm-tools/qvm-backup-restore

@@ -26,6 +26,7 @@ from qubes.backup import backup_restore_header
 from qubes.backup import backup_restore_prepare
 from qubes.backup import backup_restore_print_summary
 from qubes.backup import backup_restore_do
+import sys
 from optparse import OptionParser
 
 import os
@@ -109,6 +110,7 @@ def main():
             exit(1)
 
     passphrase = getpass.getpass("Please enter the pass phrase that will be used to decrypt/verify the backup: ")
+    passphrase = passphrase.decode(sys.stdin.encoding)
 
     print >> sys.stderr, "Checking backup content..."