diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-08 18:36:03 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-08 18:36:16 +0200 |
| commit | e29f9017f7a83198537df2e2f5279359e2d86118 (patch) | |
| tree | 964fac07cc3d3cde2e8509f4c008442ee49a7513 /OpenKeychain/src | |
| parent | d6076a998c729737fe6b96b74123e9e1af0a5a50 (diff) | |
| download | open-keychain-e29f9017f7a83198537df2e2f5279359e2d86118.tar.gz open-keychain-e29f9017f7a83198537df2e2f5279359e2d86118.tar.bz2 open-keychain-e29f9017f7a83198537df2e2f5279359e2d86118.zip | |
pgpsignencrypt: unsupported parameter combinations are a bug
Diffstat (limited to 'OpenKeychain/src')
3 files changed, 1 insertions, 5 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java index 3b65d9fb1..f959ddd76 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/operations/results/OperationResult.java @@ -705,7 +705,6 @@ public abstract class OperationResult implements Parcelable { // pgpsignencrypt MSG_PSE_ASYMMETRIC (LogLevel.INFO, R.string.msg_pse_asymmetric), - MSG_PSE_CLEARSIGN_ONLY (LogLevel.DEBUG, R.string.msg_pse_clearsign_only), MSG_PSE_COMPRESSING (LogLevel.DEBUG, R.string.msg_pse_compressing), MSG_PSE_ENCRYPTING (LogLevel.DEBUG, R.string.msg_pse_encrypting), MSG_PSE_ERROR_BAD_PASSPHRASE (LogLevel.ERROR, R.string.msg_pse_error_bad_passphrase), diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java index 29b2ef727..406c64ae8 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java @@ -491,9 +491,7 @@ public class PgpSignEncryptOperation extends BaseOperation { literalGen.close(); } else { - pOut = null; - // TODO: Is this log right? - log.add(LogType.MSG_PSE_CLEARSIGN_ONLY, indent); + throw new AssertionError("cannot clearsign in non-ascii armored text, this is a bug!"); } if (enableSignature) { diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index c3fabaa69..03493d697 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1221,7 +1221,6 @@ <!-- Messages for PgpSignEncrypt operation --> <string name="msg_pse_asymmetric">"Preparing public keys for encryption"</string> - <string name="msg_pse_clearsign_only">"Signing of cleartext input not supported!"</string> <string name="msg_pse_compressing">"Preparing compression"</string> <string name="msg_pse_encrypting">"Encrypting data"</string> <string name="msg_pse_error_bad_passphrase">"Bad password!"</string> |