diff --git a/.classpath b/.classpath index 42509c4ea..90098a916 100644 --- a/.classpath +++ b/.classpath @@ -13,7 +13,6 @@ - @@ -21,5 +20,7 @@ + + diff --git a/components/net/sf/briar/crypto/CryptoComponentImpl.java b/components/net/sf/briar/crypto/CryptoComponentImpl.java index 226c99221..07fa0e371 100644 --- a/components/net/sf/briar/crypto/CryptoComponentImpl.java +++ b/components/net/sf/briar/crypto/CryptoComponentImpl.java @@ -23,13 +23,13 @@ import net.sf.briar.api.crypto.MessageDigest; import net.sf.briar.api.crypto.PseudoRandom; import net.sf.briar.util.ByteUtils; -import org.bouncycastle.jce.provider.BouncyCastleProvider; +import org.spongycastle.jce.provider.BouncyCastleProvider; import com.google.inject.Inject; class CryptoComponentImpl implements CryptoComponent { - private static final String PROVIDER = "BC"; + private static final String PROVIDER = "SC"; private static final String AGREEMENT_KEY_PAIR_ALGO = "ECDH"; private static final int AGREEMENT_KEY_PAIR_BITS = 384; private static final String AGREEMENT_ALGO = "ECDHC"; diff --git a/lib/bcprov-jdk15-146.jar b/lib/bcprov-jdk15-146.jar deleted file mode 100644 index daa0b54cc..000000000 Binary files a/lib/bcprov-jdk15-146.jar and /dev/null differ diff --git a/lib/sc-light-jdk15on-20120824.jar b/lib/sc-light-jdk15on-20120824.jar new file mode 100644 index 000000000..6bb5b3463 Binary files /dev/null and b/lib/sc-light-jdk15on-20120824.jar differ diff --git a/lib/scprov-jdk15on-20120824.jar b/lib/scprov-jdk15on-20120824.jar new file mode 100644 index 000000000..9f7397d69 Binary files /dev/null and b/lib/scprov-jdk15on-20120824.jar differ diff --git a/test/net/sf/briar/crypto/CounterModeTest.java b/test/net/sf/briar/crypto/CounterModeTest.java index 07475d7d2..96cde2001 100644 --- a/test/net/sf/briar/crypto/CounterModeTest.java +++ b/test/net/sf/briar/crypto/CounterModeTest.java @@ -13,14 +13,14 @@ import javax.crypto.spec.SecretKeySpec; import net.sf.briar.BriarTestCase; import net.sf.briar.api.Bytes; -import org.bouncycastle.jce.provider.BouncyCastleProvider; import org.junit.Test; +import org.spongycastle.jce.provider.BouncyCastleProvider; public class CounterModeTest extends BriarTestCase { private static final String CIPHER_ALGO = "AES"; private static final String CIPHER_MODE = "AES/CTR/NoPadding"; - private static final String PROVIDER = "BC"; + private static final String PROVIDER = "SC"; private static final int KEY_SIZE_BYTES = 32; // AES-256 private static final int BLOCK_SIZE_BYTES = 16;