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

Error out when editing a stripped key

Browse Source
This commit is contained in:
Dominik Schürmann
2016-01-11 08:13:51 +01:00
parent aa924c2560
commit f691ef2a26
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
View File

@@ -460,6 +460,11 @@ public class PgpKeyOperation {
} }
} }
if (isDummy(masterSecretKey) && ! saveParcel.isRestrictedOnly()) {
log.add(LogType.MSG_EK_ERROR_DUMMY, indent);
return new PgpEditKeyResult(PgpEditKeyResult.RESULT_ERROR, log, null);
}
if (isDummy(masterSecretKey) || saveParcel.isRestrictedOnly()) { if (isDummy(masterSecretKey) || saveParcel.isRestrictedOnly()) {
log.add(LogType.MSG_MF_RESTRICTED_MODE, indent); log.add(LogType.MSG_MF_RESTRICTED_MODE, indent);
return internalRestricted(sKR, saveParcel, log, indent + 1); return internalRestricted(sKR, saveParcel, log, indent + 1);
@@ -1128,7 +1133,7 @@ public class PgpKeyOperation {
progress(R.string.progress_modify, 0); progress(R.string.progress_modify, 0);
// Make sure the saveParcel includes only operations available without passphrae! // Make sure the saveParcel includes only operations available without passphrase!
if (!saveParcel.isRestrictedOnly()) { if (!saveParcel.isRestrictedOnly()) {
log.add(LogType.MSG_MF_ERROR_RESTRICTED, indent); log.add(LogType.MSG_MF_ERROR_RESTRICTED, indent);
return new PgpEditKeyResult(PgpEditKeyResult.RESULT_ERROR, log, null); return new PgpEditKeyResult(PgpEditKeyResult.RESULT_ERROR, log, null);