diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-07-07 17:03:55 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-07-07 17:16:11 +0200 |
| commit | a320affe862a7ff38ae60bd65f7c73ac8ddcc337 (patch) | |
| tree | 1bae3a333215cc672462b4db98a8ce6d9b78f989 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java | |
| parent | f4d81bb5de6b9fbb6a520b7384bdfea6567bafda (diff) | |
| download | open-keychain-a320affe862a7ff38ae60bd65f7c73ac8ddcc337.tar.gz open-keychain-a320affe862a7ff38ae60bd65f7c73ac8ddcc337.tar.bz2 open-keychain-a320affe862a7ff38ae60bd65f7c73ac8ddcc337.zip | |
tests: make sure encryption happens to all enc-capable subkeys
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 a411292af..0448e1425 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncryptOperation.java @@ -279,7 +279,7 @@ public class PgpSignEncryptOperation extends BaseOperation { CanonicalizedPublicKey key = keyRing.getPublicKey(subKeyId); cPk.addMethod(key.getPubKeyEncryptionGenerator(input.isHiddenRecipients())); log.add(LogType.MSG_PSE_KEY_OK, indent + 1, - KeyFormattingUtils.convertKeyIdToHex(id)); + KeyFormattingUtils.convertKeyIdToHex(subKeyId)); } if (encryptSubKeyIds.isEmpty()) { log.add(LogType.MSG_PSE_KEY_WARN, indent + 1, |