Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 19:29:06 +01:00
Code Issues Projects Releases Wiki Activity

Replaced BouncyCastle with SpongyCastle for Android compatibility.

Browse Source
This commit is contained in:
akwizgran
2012-08-24 12:22:40 +01:00
parent a9d196d511
commit b8b18add33
6 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.classpath
View File

@@ -13,7 +13,6 @@
<classpathentry kind="lib" path="lib/test/jmock-2.5.1.jar"/>
<classpathentry kind="lib" path="lib/commons-io-2.0.1.jar"/>
<classpathentry kind="lib" path="lib/test/junit-4.9b3.jar"/>
<classpathentry kind="lib" path="lib/bcprov-jdk15-146.jar" sourcepath="lib/source/bcprov-jdk15-146-src.zip"/>
<classpathentry kind="lib" path="lib/jna.jar"/>
<classpathentry kind="lib" path="lib/platform.jar"/>
<classpathentry kind="lib" path="lib/jnotify-0.93.jar"/>
@@ -21,5 +20,7 @@
<classpathentry kind="lib" path="lib/bluecove-2.1.0-briar.jar" sourcepath="lib/source/bluecove-2.1.0-briar-sources.jar"/>
<classpathentry kind="lib" path="lib/h2small-1.3.161.jar"/>
<classpathentry kind="lib" path="lib/silvertunnel.org_netlib.jar"/>
<classpathentry kind="lib" path="lib/sc-light-jdk15on-20120824.jar"/>
<classpathentry kind="lib" path="lib/scprov-jdk15on-20120824.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>

4
components/net/sf/briar/crypto/CryptoComponentImpl.java
View File

@@ -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";

BIN
lib/bcprov-jdk15-146.jar
View File

Binary file not shown.

BIN
lib/sc-light-jdk15on-20120824.jar Normal file
View File

Binary file not shown.

BIN
lib/scprov-jdk15on-20120824.jar Normal file
View File

Binary file not shown.

4
test/net/sf/briar/crypto/CounterModeTest.java
View File

@@ -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;