diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-02-01 23:14:26 +0100 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-02-01 23:14:26 +0100 |
commit | 7b24ee7b55db99467dd63e631ba55a27d08587d5 (patch) | |
tree | 6a548fd15cb77882754e2355cf1f4c72660f4962 /OpenKeychain-Test/src/test/java/org/sufficientlysecure | |
parent | 0b6dc65c97b0fb5dae9bf1a06f9c7db0b65ea4ad (diff) | |
download | open-keychain-7b24ee7b55db99467dd63e631ba55a27d08587d5.tar.gz open-keychain-7b24ee7b55db99467dd63e631ba55a27d08587d5.tar.bz2 open-keychain-7b24ee7b55db99467dd63e631ba55a27d08587d5.zip |
rewrite PgpSignEncrypt data flow
- introduce high-level SignEncryptOperation for uri to uri signing/encryption
- use SignEncryptParcel for high-level operation parameters
- use PgpSignEncryptInput plus streams for low-level operation parameters
- get rid of all sign/encrypt logic in KeychainIntentService
Diffstat (limited to 'OpenKeychain-Test/src/test/java/org/sufficientlysecure')
-rw-r--r-- | OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpEncryptDecryptTest.java | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpEncryptDecryptTest.java b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpEncryptDecryptTest.java index b8205a792..568f04ab8 100644 --- a/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpEncryptDecryptTest.java +++ b/OpenKeychain-Test/src/test/java/org/sufficientlysecure/keychain/pgp/PgpEncryptDecryptTest.java @@ -29,13 +29,12 @@ import org.spongycastle.bcpg.sig.KeyFlags; import org.spongycastle.jce.provider.BouncyCastleProvider; import org.spongycastle.openpgp.PGPEncryptedData; import org.sufficientlysecure.keychain.operations.results.PgpEditKeyResult; -import org.sufficientlysecure.keychain.pgp.PgpSignEncrypt.Builder; +import org.sufficientlysecure.keychain.operations.results.PgpSignEncryptResult; import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRingData; import org.sufficientlysecure.keychain.provider.ProviderHelper; import org.sufficientlysecure.keychain.service.SaveKeyringParcel; import org.sufficientlysecure.keychain.service.SaveKeyringParcel.Algorithm; import org.sufficientlysecure.keychain.operations.results.DecryptVerifyResult; -import org.sufficientlysecure.keychain.operations.results.SignEncryptResult; import org.sufficientlysecure.keychain.service.SaveKeyringParcel.ChangeUnlockParcel; import org.sufficientlysecure.keychain.support.KeyringTestingHelper; import org.sufficientlysecure.keychain.util.InputData; @@ -132,14 +131,14 @@ public class PgpEncryptDecryptTest { ByteArrayInputStream in = new ByteArrayInputStream(plaintext.getBytes()); InputData data = new InputData(in, in.available()); - Builder b = new PgpSignEncrypt.Builder(Robolectric.application, + Builder b = new PgpSignEncryptOperation.Builder(Robolectric.application, new ProviderHelper(Robolectric.application), null, data, out); b.setSymmetricPassphrase(mPassphrase); b.setSymmetricEncryptionAlgorithm(PGPEncryptedData.AES_128); - SignEncryptResult result = b.build().execute(); + PgpSignEncryptResult result = b.build().execute(); Assert.assertTrue("encryption must succeed", result.success()); ciphertext = out.toByteArray(); @@ -211,7 +210,7 @@ public class PgpEncryptDecryptTest { ByteArrayInputStream in = new ByteArrayInputStream(plaintext.getBytes()); InputData data = new InputData(in, in.available()); - Builder b = new PgpSignEncrypt.Builder( + Builder b = new PgpSignEncryptOperation.Builder( Robolectric.application, new ProviderHelper(Robolectric.application), null, // new DummyPassphraseCache(mPassphrase, 0L), @@ -219,7 +218,7 @@ public class PgpEncryptDecryptTest { b.setEncryptionMasterKeyIds(new long[]{ mStaticRing1.getMasterKeyId() }); b.setSymmetricEncryptionAlgorithm(PGPEncryptedData.AES_128); - SignEncryptResult result = b.build().execute(); + PgpSignEncryptResult result = b.build().execute(); Assert.assertTrue("encryption must succeed", result.success()); ciphertext = out.toByteArray(); @@ -287,7 +286,7 @@ public class PgpEncryptDecryptTest { ByteArrayInputStream in = new ByteArrayInputStream(plaintext.getBytes()); InputData data = new InputData(in, in.available()); - Builder b = new PgpSignEncrypt.Builder( + Builder b = new PgpSignEncryptOperation.Builder( Robolectric.application, new ProviderHelper(Robolectric.application), null, // new DummyPassphraseCache(mPassphrase, 0L), @@ -298,7 +297,7 @@ public class PgpEncryptDecryptTest { mStaticRing2.getMasterKeyId() }); b.setSymmetricEncryptionAlgorithm(PGPEncryptedData.AES_128); - SignEncryptResult result = b.build().execute(); + PgpSignEncryptResult result = b.build().execute(); Assert.assertTrue("encryption must succeed", result.success()); ciphertext = out.toByteArray(); @@ -376,7 +375,7 @@ public class PgpEncryptDecryptTest { ByteArrayInputStream in = new ByteArrayInputStream(plaintext.getBytes()); InputData data = new InputData(in, in.available()); - Builder b = new PgpSignEncrypt.Builder( + Builder b = new PgpSignEncryptOperation.Builder( Robolectric.application, new ProviderHelper(Robolectric.application), null, // new DummyPassphraseCache(mPassphrase, 0L), @@ -390,7 +389,7 @@ public class PgpEncryptDecryptTest { b.setSignatureSubKeyId(KeyringTestingHelper.getSubkeyId(mStaticRing1, 1)); b.setSignaturePassphrase(mKeyPhrase1); b.setSymmetricEncryptionAlgorithm(PGPEncryptedData.AES_128); - SignEncryptResult result = b.build().execute(); + PgpSignEncryptResult result = b.build().execute(); Assert.assertTrue("encryption must succeed", result.success()); ciphertext = out.toByteArray(); @@ -454,7 +453,7 @@ public class PgpEncryptDecryptTest { ByteArrayInputStream in = new ByteArrayInputStream(plaindata); InputData data = new InputData(in, in.available()); - Builder b = new PgpSignEncrypt.Builder( + Builder b = new PgpSignEncryptOperation.Builder( Robolectric.application, new ProviderHelper(Robolectric.application), null, // new DummyPassphraseCache(mPassphrase, 0L), @@ -465,7 +464,7 @@ public class PgpEncryptDecryptTest { // this only works with ascii armored output! b.setEnableAsciiArmorOutput(true); b.setCharset("iso-2022-jp"); - SignEncryptResult result = b.build().execute(); + PgpSignEncryptResult result = b.build().execute(); Assert.assertTrue("encryption must succeed", result.success()); ciphertext = out.toByteArray(); |