PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

fix symmetric decryption with backup code (fixes #1677)

Browse source
This commit is contained in:
Vincent Breitmoser 2016-01-13 03:12:24 +01:00
parent 808a9e4f54
commit e20e528f5e
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PassphraseDialogActivity.java
View file

@ -368,7 +368,6 @@ public class PassphraseDialogActivity extends FragmentActivity {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
final Passphrase passphrase;
if (mRequiredInput.mType == RequiredInputType.BACKUP_CODE) { if (mRequiredInput.mType == RequiredInputType.BACKUP_CODE) {
StringBuilder backupCodeInput = new StringBuilder(26); StringBuilder backupCodeInput = new StringBuilder(26);
for (EditText editText : mBackupCodeEditText) { for (EditText editText : mBackupCodeEditText) {
@ -380,16 +379,18 @@ public class PassphraseDialogActivity extends FragmentActivity {
} }
backupCodeInput.deleteCharAt(backupCodeInput.length() - 1); backupCodeInput.deleteCharAt(backupCodeInput.length() - 1);
passphrase = new Passphrase(backupCodeInput.toString()); Passphrase passphrase = new Passphrase(backupCodeInput.toString());
} else { finishCaching(passphrase);
passphrase = new Passphrase(mPassphraseEditText);
return;
} }
final Passphrase passphrase = new Passphrase(mPassphraseEditText);
final int timeToLiveSeconds = mTimeToLiveSpinner.getSelectedTimeToLive(); final int timeToLiveSeconds = mTimeToLiveSpinner.getSelectedTimeToLive();
// Early breakout if we are dealing with a symmetric key // Early breakout if we are dealing with a symmetric key
if (mSecretRing == null) { if (mSecretRing == null) {
if ( ! mRequiredInput.mSkipCaching) { if (!mRequiredInput.mSkipCaching) {
PassphraseCacheService.addCachedPassphrase(getActivity(), PassphraseCacheService.addCachedPassphrase(getActivity(),
Constants.key.symmetric, Constants.key.symmetric, passphrase, Constants.key.symmetric, Constants.key.symmetric, passphrase,
getString(R.string.passp_cache_notif_pwd), timeToLiveSeconds); getString(R.string.passp_cache_notif_pwd), timeToLiveSeconds);