diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-01-11 08:13:51 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-01-11 08:13:51 +0100 |
commit | f691ef2a262012898c3f0b61fa9357a59292288b (patch) | |
tree | 5103c2a185e729f5b6acf46b921b2c642eb2b0a1 /OpenKeychain/src/main/java/org/sufficientlysecure | |
parent | aa924c25607faf7714232fd6b3aa920f899ff41a (diff) | |
download | open-keychain-f691ef2a262012898c3f0b61fa9357a59292288b.tar.gz open-keychain-f691ef2a262012898c3f0b61fa9357a59292288b.tar.bz2 open-keychain-f691ef2a262012898c3f0b61fa9357a59292288b.zip |
Error out when editing a stripped key
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java index 40a17a918..c42608a6b 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java @@ -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()) { log.add(LogType.MSG_MF_RESTRICTED_MODE, indent); return internalRestricted(sKR, saveParcel, log, indent + 1); @@ -1128,7 +1133,7 @@ public class PgpKeyOperation { 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()) { log.add(LogType.MSG_MF_ERROR_RESTRICTED, indent); return new PgpEditKeyResult(PgpEditKeyResult.RESULT_ERROR, log, null); |