Merge lp:~ed.so/duplicity/reuse-passphrase-for-signing-fix into lp:duplicity/0.6-series

Proposed by edso on 2011-08-23
Status: Merged
Merged at revision: 780
Proposed branch: lp:~ed.so/duplicity/reuse-passphrase-for-signing-fix
Merge into: lp:duplicity/0.6-series
Diff against target: 47 lines (+12/-7)
2 files modified
Changelog.GNU (+5/-0)
duplicity-bin (+7/-7)
To merge this branch: bzr merge lp:~ed.so/duplicity/reuse-passphrase-for-signing-fix
Reviewer Review Type Date Requested Status
duplicity-team 2011-08-23 Pending
Review via email: mp+72541@code.launchpad.net

Description of the change

fixes

duplicity claiming: PASSPHRASE variable not set

ede

To post a comment you must log in.
780. By edso on 2011-08-23

drop sign passphrase verification prompt

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Changelog.GNU'
2--- Changelog.GNU 2011-08-19 15:57:23 +0000
3+++ Changelog.GNU 2011-08-23 13:49:03 +0000
4@@ -1,3 +1,8 @@
5+2011-08-23 edso
6+
7+ - usability enhancement: sign passphrase prompt has no second
8+ verification prompt anymore, symmetric passphrases are still verified
9+
10 2011-08-19 Kenneth Loafman <kenneth@loafman.com>
11
12 fixes to unit tests to support SIGN_PASSPHRASE.
13
14=== modified file 'duplicity-bin'
15--- duplicity-bin 2011-08-19 15:44:54 +0000
16+++ duplicity-bin 2011-08-23 13:49:03 +0000
17@@ -90,15 +90,15 @@
18 ## if signing key is also an encryption key assume that the passphrase is identical
19 if ( for_signing
20 and globals.gpg_profile.sign_key in globals.gpg_profile.recipients
21- and globals.gpg_profile.passphrase is not None ):
22- log.Notice(_("Reuse already set PASSPHRASE as SIGNING_PASSPHRASE"))
23- return globals.gpg_profile.passphrase
24+ and 'PASSPHRASE' in os.environ ):
25+ log.Notice(_("Reuse configured PASSPHRASE as SIGN_PASSPHRASE"))
26+ return os.environ['PASSPHRASE']
27 ## if one encryption key is also the signing key assume that the passphrase is identical
28 if ( not for_signing
29 and globals.gpg_profile.sign_key in globals.gpg_profile.recipients
30- and globals.gpg_profile.signing_passphrase is not None ):
31- log.Notice(_("Reuse already set SIGNING_PASSPHRASE as PASSPHRASE"))
32- return globals.gpg_profile.signing_passphrase
33+ and 'SIGN_PASSPHRASE' in os.environ ):
34+ log.Notice(_("Reuse configured SIGN_PASSPHRASE as PASSPHRASE"))
35+ return os.environ['SIGN_PASSPHRASE']
36
37 # Next, verify we need to ask the user
38
39@@ -1268,7 +1268,7 @@
40 # the sign key can have a different passphrase than the encrypt
41 # key, therefore request a passphrase
42 if globals.gpg_profile.sign_key:
43- globals.gpg_profile.signing_passphrase = get_passphrase(3, action, True)
44+ globals.gpg_profile.signing_passphrase = get_passphrase(1, action, True)
45
46 # if there are no recipients (no --encrypt-key), it must be a
47 # symmetric key. Therefore, confirm the passphrase

Subscribers

People subscribed via source and target branches

to all changes: