cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Nicer RESULT_INSECURE fallback for old API versions

Browse Source
This commit is contained in:
Dominik Schürmann
2015-12-10 15:24:23 +01:00
parent 1b141c61e1
commit 8dd6313826
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
View File

@@ -573,18 +573,11 @@ public class OpenPgpService extends Service {
// case RESULT_NOT_ENCRYPTED, but a signature, fallback to deprecated signatureOnly variable // case RESULT_NOT_ENCRYPTED, but a signature, fallback to deprecated signatureOnly variable
if (decryptionResult.getResult() == OpenPgpDecryptionResult.RESULT_NOT_ENCRYPTED if (decryptionResult.getResult() == OpenPgpDecryptionResult.RESULT_NOT_ENCRYPTED
&& signatureResult.getResult() != OpenPgpSignatureResult.RESULT_NO_SIGNATURE) { && signatureResult.getResult() != OpenPgpSignatureResult.RESULT_NO_SIGNATURE) {
// noinspection deprecation, TODO // noinspection deprecation
signatureResult.setSignatureOnly(true); signatureResult.setSignatureOnly(true);
} }
// case RESULT_INSECURE, fallback to an error // case RESULT_INSECURE, simply accept as a fallback like in previous API versions
if (decryptionResult.getResult() == OpenPgpDecryptionResult.RESULT_INSECURE) {
Intent resultError = new Intent();
resultError.putExtra(OpenPgpApi.RESULT_ERROR, new OpenPgpError(OpenPgpError.GENERIC_ERROR,
"Insecure encryption: An outdated algorithm has been used!"));
resultError.putExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR);
return resultError;
}
// case RESULT_ENCRYPTED // case RESULT_ENCRYPTED
// nothing to do! // nothing to do!