diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-02-09 00:24:46 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-02-09 00:24:46 +0100 |
commit | 79db5c0ebeeb6616dd04426927c40bef307ecdf3 (patch) | |
tree | fdaa796f370d961cf9e0b870852994120959091c /OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java | |
parent | 55b4790abd680635fda83d95a3197b2b18288a2a (diff) | |
download | open-keychain-79db5c0ebeeb6616dd04426927c40bef307ecdf3.tar.gz open-keychain-79db5c0ebeeb6616dd04426927c40bef307ecdf3.tar.bz2 open-keychain-79db5c0ebeeb6616dd04426927c40bef307ecdf3.zip |
Replace spongycastle with bouncycastle
Diffstat (limited to 'OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java')
-rw-r--r-- | OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java index 161c823da..0878d20aa 100644 --- a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java +++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/pgp/UncachedKeyringMergeTest.java @@ -27,13 +27,13 @@ import org.robolectric.RobolectricGradleTestRunner; import org.robolectric.RobolectricTestRunner; import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowLog; -import org.spongycastle.bcpg.BCPGInputStream; -import org.spongycastle.bcpg.PacketTags; -import org.spongycastle.bcpg.S2K; -import org.spongycastle.bcpg.SecretKeyPacket; -import org.spongycastle.bcpg.sig.KeyFlags; -import org.spongycastle.jce.provider.BouncyCastleProvider; -import org.spongycastle.util.Strings; +import org.bouncycastle.bcpg.BCPGInputStream; +import org.bouncycastle.bcpg.PacketTags; +import org.bouncycastle.bcpg.S2K; +import org.bouncycastle.bcpg.SecretKeyPacket; +import org.bouncycastle.bcpg.sig.KeyFlags; +import org.bouncycastle.jce.provider.BouncyCastleProvider; +import org.bouncycastle.util.Strings; import org.sufficientlysecure.keychain.BuildConfig; import org.sufficientlysecure.keychain.WorkaroundBuildConfig; import org.sufficientlysecure.keychain.operations.results.OperationResult; |