From 4f13dc4fc5e9be78a73fcc4bbafbc025baaf3aa0 Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Thu, 1 Oct 2015 17:08:50 +0200 Subject: spongy: use version which doesn't skip bad signatures --- .../java/org/sufficientlysecure/keychain/pgp/UncachedKeyringTest.java | 3 +++ extern/spongycastle | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) 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(); diff --git a/extern/spongycastle b/extern/spongycastle index 1bbe17e66..432b7f1bf 160000 --- a/extern/spongycastle +++ b/extern/spongycastle @@ -1 +1 @@ -Subproject commit 1bbe17e6643aaeabe0a282b1ad66bef336951a5e +Subproject commit 432b7f1bfdc554f3b5e4e5ee1cac35bca0a6b496 -- cgit v1.2.3