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
=== modified file 'Changelog.GNU'
--- Changelog.GNU 2011-08-19 15:57:23 +0000
+++ Changelog.GNU 2011-08-23 13:49:03 +0000
@@ -1,3 +1,8 @@
12011-08-23 edso
2
3 - usability enhancement: sign passphrase prompt has no second
4 verification prompt anymore, symmetric passphrases are still verified
5
12011-08-19 Kenneth Loafman <kenneth@loafman.com>62011-08-19 Kenneth Loafman <kenneth@loafman.com>
27
3 fixes to unit tests to support SIGN_PASSPHRASE.8 fixes to unit tests to support SIGN_PASSPHRASE.
49
=== modified file 'duplicity-bin'
--- duplicity-bin 2011-08-19 15:44:54 +0000
+++ duplicity-bin 2011-08-23 13:49:03 +0000
@@ -90,15 +90,15 @@
90 ## if signing key is also an encryption key assume that the passphrase is identical90 ## if signing key is also an encryption key assume that the passphrase is identical
91 if ( for_signing91 if ( for_signing
92 and globals.gpg_profile.sign_key in globals.gpg_profile.recipients92 and globals.gpg_profile.sign_key in globals.gpg_profile.recipients
93 and globals.gpg_profile.passphrase is not None ):93 and 'PASSPHRASE' in os.environ ):
94 log.Notice(_("Reuse already set PASSPHRASE as SIGNING_PASSPHRASE"))94 log.Notice(_("Reuse configured PASSPHRASE as SIGN_PASSPHRASE"))
95 return globals.gpg_profile.passphrase95 return os.environ['PASSPHRASE']
96 ## if one encryption key is also the signing key assume that the passphrase is identical96 ## if one encryption key is also the signing key assume that the passphrase is identical
97 if ( not for_signing97 if ( not for_signing
98 and globals.gpg_profile.sign_key in globals.gpg_profile.recipients98 and globals.gpg_profile.sign_key in globals.gpg_profile.recipients
99 and globals.gpg_profile.signing_passphrase is not None ):99 and 'SIGN_PASSPHRASE' in os.environ ):
100 log.Notice(_("Reuse already set SIGNING_PASSPHRASE as PASSPHRASE"))100 log.Notice(_("Reuse configured SIGN_PASSPHRASE as PASSPHRASE"))
101 return globals.gpg_profile.signing_passphrase101 return os.environ['SIGN_PASSPHRASE']
102102
103 # Next, verify we need to ask the user103 # Next, verify we need to ask the user
104104
@@ -1268,7 +1268,7 @@
1268 # the sign key can have a different passphrase than the encrypt1268 # the sign key can have a different passphrase than the encrypt
1269 # key, therefore request a passphrase1269 # key, therefore request a passphrase
1270 if globals.gpg_profile.sign_key:1270 if globals.gpg_profile.sign_key:
1271 globals.gpg_profile.signing_passphrase = get_passphrase(3, action, True)1271 globals.gpg_profile.signing_passphrase = get_passphrase(1, action, True)
12721272
1273 # if there are no recipients (no --encrypt-key), it must be a1273 # if there are no recipients (no --encrypt-key), it must be a
1274 # symmetric key. Therefore, confirm the passphrase1274 # symmetric key. Therefore, confirm the passphrase

Subscribers

People subscribed via source and target branches

to all changes: