aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/test/java/org/sufficientlysecure/keychain
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-10-01 17:28:43 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-10-01 17:28:43 +0200
commit7c79902a82602ff4e25b03e1232faa1a1768ba16 (patch)
tree03ec60c97bd961436ffffe17ad6917db768bfafa /OpenKeychain/src/test/java/org/sufficientlysecure/keychain
parent7f1dbccb5b1640482e9b83391400506f4ad40e04 (diff)
parent4f13dc4fc5e9be78a73fcc4bbafbc025baaf3aa0 (diff)
downloadopen-keychain-7c79902a82602ff4e25b03e1232faa1a1768ba16.tar.gz
open-keychain-7c79902a82602ff4e25b03e1232faa1a1768ba16.tar.bz2
open-keychain-7c79902a82602ff4e25b03e1232faa1a1768ba16.zip
Merge branch 'master' into encrypted-export
Diffstat (limited to 'OpenKeychain/src/test/java/org/sufficientlysecure/keychain')
-rw-r--r--OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringTest.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringTest.java
index 4cdcf0117..b870e5494 100644
--- a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringTest.java
+++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringTest.java
@@ -28,6 +28,7 @@ import org.robolectric.RobolectricTestRunner;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowLog;
import org.spongycastle.bcpg.sig.KeyFlags;
+import org.spongycastle.jce.provider.BouncyCastleProvider;
import org.sufficientlysecure.keychain.BuildConfig;
import org.sufficientlysecure.keychain.WorkaroundBuildConfig;
import org.sufficientlysecure.keychain.operations.results.PgpEditKeyResult;
@@ -41,6 +42,7 @@ import org.sufficientlysecure.keychain.util.Passphrase;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.security.Security;
import java.util.Iterator;
import java.util.Random;
@@ -53,6 +55,7 @@ public class UncachedKeyringTest {
@BeforeClass
public static void setUpOnce() throws Exception {
+ Security.insertProviderAt(new BouncyCastleProvider(), 1);
ShadowLog.stream = System.out;
SaveKeyringParcel parcel = new SaveKeyringParcel();