diff --git a/briar-android/.classpath b/briar-android/.classpath
index 9651c7b62447d0aa4e15944e5951f6b9792bb209..589027c42d4a4275f0079c07808ca4b1a416689b 100644
--- a/briar-android/.classpath
+++ b/briar-android/.classpath
@@ -8,7 +8,7 @@
<classpathentry exported="true" kind="lib" path="/briar-api/libs/javax.inject.jar"/>
<classpathentry exported="true" kind="lib" path="/briar-core/libs/h2small-1.4.190.jar"/>
<classpathentry exported="true" kind="lib" path="/briar-core/libs/weupnp-0.1.3-SNAPSHOT-briar.jar"/>
- <classpathentry exported="true" kind="lib" path="/briar-core/libs/lcrypto-jdk15on-152.jar"/>
+ <classpathentry exported="true" kind="lib" path="/briar-core/libs/spongy-core-1.53.jar"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
diff --git a/briar-android/briar-android.iml b/briar-android/briar-android.iml
index 70b2d2d816429d973bf0c3a041f116e1a34c2334..4845d4a95f8c2991693bd01b6a91e95db88aa680 100644
--- a/briar-android/briar-android.iml
+++ b/briar-android/briar-android.iml
@@ -59,18 +59,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
- <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
@@ -81,7 +69,7 @@
<orderEntry type="library" exported="" name="roboguice-2.0" level="project" />
<orderEntry type="library" exported="" name="jsocks" level="project" />
<orderEntry type="library" exported="" name="guice-3.0-no_aop" level="project" />
- <orderEntry type="library" exported="" name="h2small-1.4.190" level="project" />
+ <orderEntry type="library" exported="" name="h2small-1.3.170" level="project" />
<orderEntry type="library" exported="" name="lcrypto-jdk15on-152" level="project" />
<orderEntry type="library" exported="" name="weupnp-0.1.3-SNAPSHOT-briar" level="project" />
<orderEntry type="library" exported="" name="javax.inject" level="project" />
diff --git a/briar-api/briar-api.iml b/briar-api/briar-api.iml
index 3d154955e7a70a77e4fb68e7ea73656de97d2456..c1ef8459b12109a50cde94e67b8f0d874a4e41bf 100644
--- a/briar-api/briar-api.iml
+++ b/briar-api/briar-api.iml
@@ -13,7 +13,7 @@
</configuration>
</facet>
</component>
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/classes/main" />
<output-test url="file://$MODULE_DIR$/build/classes/test" />
<exclude-output />
@@ -28,5 +28,6 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="guice-3.0-no_aop" level="project" />
<orderEntry type="library" exported="" name="javax.inject" level="project" />
+ <orderEntry type="library" exported="" name="briar-api.briar-api" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/briar-core/.classpath b/briar-core/.classpath
index db3b175cb43bea422993dff2a80a443a238999df..77c6f54614fcaa5cc5fb761b8f343f119becd68e 100644
--- a/briar-core/.classpath
+++ b/briar-core/.classpath
@@ -7,6 +7,6 @@
<classpathentry kind="lib" path="libs/h2small-1.4.190.jar"/>
<classpathentry kind="lib" path="libs/weupnp-0.1.3-SNAPSHOT-briar.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
- <classpathentry kind="lib" path="libs/lcrypto-jdk15on-152.jar" sourcepath="libs/source/lcrypto-jdk15on-152-src.jar"/>
+ <classpathentry kind="lib" path="libs/spongy-core-1.53.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/briar-core/briar-core.iml b/briar-core/briar-core.iml
index 3b5b4dce8d4112eee0b47a45da792b12e71d2e7a..e3d45a9dda448234886b575fedaf1d3b3e79ac24 100644
--- a/briar-core/briar-core.iml
+++ b/briar-core/briar-core.iml
@@ -13,7 +13,7 @@
</configuration>
</facet>
</component>
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/classes/main" />
<output-test url="file://$MODULE_DIR$/build/classes/test" />
<exclude-output />
@@ -29,8 +29,9 @@
<orderEntry type="module" module-name="briar-api" exported="" />
<orderEntry type="library" exported="" name="guice-3.0-no_aop" level="project" />
<orderEntry type="library" exported="" name="javax.inject" level="project" />
- <orderEntry type="library" exported="" name="h2small-1.4.190.jar" level="project" />
- <orderEntry type="library" exported="" name="lcrypto-jdk15on-152" level="project" />
+ <orderEntry type="library" exported="" name="_home_someone_workspace_briar_briar_core_libs_h2small_1_3_170_jar" level="project" />
+ <orderEntry type="library" exported="" name="_home_someone_workspace_briar_briar_core_libs_lcrypto_jdk15on_152_jar" level="project" />
<orderEntry type="library" exported="" name="weupnp-0.1.3-SNAPSHOT-briar" level="project" />
+ <orderEntry type="library" exported="" name="briar-core.briar-core" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/briar-core/libs/lcrypto-jdk15on-152.jar b/briar-core/libs/lcrypto-jdk15on-152.jar
deleted file mode 100644
index 3e5f8278b22f1d78a4f48874341e435c60fa63ac..0000000000000000000000000000000000000000
Binary files a/briar-core/libs/lcrypto-jdk15on-152.jar and /dev/null differ
diff --git a/briar-core/libs/source/lcrypto-jdk15on-152-src.jar b/briar-core/libs/source/lcrypto-jdk15on-152-src.jar
deleted file mode 100644
index f3419a5694607761f202fe8f356827c126bd59ab..0000000000000000000000000000000000000000
Binary files a/briar-core/libs/source/lcrypto-jdk15on-152-src.jar and /dev/null differ
diff --git a/briar-core/libs/spongy-core-1.53.jar b/briar-core/libs/spongy-core-1.53.jar
new file mode 100644
index 0000000000000000000000000000000000000000..5322c3625838725c4a10ef1c9284b08b75ff8ebd
Binary files /dev/null and b/briar-core/libs/spongy-core-1.53.jar differ
diff --git a/briar-core/src/org/briarproject/db/H2Database.java b/briar-core/src/org/briarproject/db/H2Database.java
index 4eb28f89e06a3b03c7587ad5b09109e9abc846f5..11d0df595230ae67a3e537b524a1c8cf9e62b90c 100644
--- a/briar-core/src/org/briarproject/db/H2Database.java
+++ b/briar-core/src/org/briarproject/db/H2Database.java
@@ -33,7 +33,7 @@ class H2Database extends JdbcDatabase {
super(HASH_TYPE, BINARY_TYPE, COUNTER_TYPE, SECRET_TYPE, clock);
this.config = config;
this.fileUtils = fileUtils;
- String path = new File(config.getDatabaseDirectory(), "db").getPath();
+ String path = new File(config.getDatabaseDirectory(), "db").getAbsolutePath();
// FIXME: Remove WRITE_DELAY=0 after implementing BTPv2?
url = "jdbc:h2:split:" + path + ";CIPHER=AES;MULTI_THREADED=1"
+ ";WRITE_DELAY=0;DB_CLOSE_ON_EXIT=false";
diff --git a/briar-desktop/briar-desktop.iml b/briar-desktop/briar-desktop.iml
index 84dc23fcfc830a8dc41226418433c896ebf273eb..4c554cbd78da1407b129deeaa8bcc16ce6143525 100644
--- a/briar-desktop/briar-desktop.iml
+++ b/briar-desktop/briar-desktop.iml
@@ -13,7 +13,7 @@
</configuration>
</facet>
</component>
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/classes/main" />
<output-test url="file://$MODULE_DIR$/build/classes/test" />
<exclude-output />
@@ -30,8 +30,8 @@
<orderEntry type="module" module-name="briar-core" exported="" />
<orderEntry type="library" exported="" name="guice-3.0-no_aop" level="project" />
<orderEntry type="library" exported="" name="javax.inject" level="project" />
- <orderEntry type="library" exported="" name="h2small-1.4.190.jar" level="project" />
- <orderEntry type="library" exported="" name="lcrypto-jdk15on-152" level="project" />
+ <orderEntry type="library" exported="" name="_home_someone_workspace_briar_briar_core_libs_h2small_1_3_170_jar" level="project" />
+ <orderEntry type="library" exported="" name="_home_someone_workspace_briar_briar_core_libs_lcrypto_jdk15on_152_jar" level="project" />
<orderEntry type="library" exported="" name="weupnp-0.1.3-SNAPSHOT-briar" level="project" />
<orderEntry type="library" exported="" name="bluecove-2.1.1-SNAPSHOT-briar" level="project" />
<orderEntry type="library" exported="" name="jna-4.1.0" level="project" />
@@ -39,5 +39,6 @@
<orderEntry type="library" exported="" name="jnotify-0.94" level="project" />
<orderEntry type="library" exported="" name="bluecove-gpl-2.1.1-SNAPSHOT" level="project" />
<orderEntry type="library" exported="" name="jssc-0.9-briar" level="project" />
+ <orderEntry type="library" exported="" name="briar-desktop.briar-desktop" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/briar-tests/.classpath b/briar-tests/.classpath
index a44f0f7d414b46c23fccd2c9e36961d137ee903b..86bc550fdbf9f8a030786ed2e82e51ab8f208adc 100644
--- a/briar-tests/.classpath
+++ b/briar-tests/.classpath
@@ -12,6 +12,6 @@
<classpathentry kind="lib" path="libs/jmock-2.5.1.jar"/>
<classpathentry kind="lib" path="libs/junit-4.9b3.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
- <classpathentry kind="lib" path="/briar-core/libs/lcrypto-jdk15on-152.jar"/>
+ <classpathentry kind="lib" path="/briar-core/libs/spongy-core-1.53.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/briar-tests/briar-tests.iml b/briar-tests/briar-tests.iml
index 54e209e64b4a3645c773183185858c0c6cdc5fe8..5105bc0230f87e7a30c48a5237c3b2448ab80aaa 100644
--- a/briar-tests/briar-tests.iml
+++ b/briar-tests/briar-tests.iml
@@ -13,7 +13,7 @@
</configuration>
</facet>
</component>
- <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/classes/main" />
<output-test url="file://$MODULE_DIR$/build/classes/test" />
<exclude-output />
@@ -30,8 +30,8 @@
<orderEntry type="module" module-name="briar-desktop" exported="" />
<orderEntry type="library" exported="" name="guice-3.0-no_aop" level="project" />
<orderEntry type="library" exported="" name="javax.inject" level="project" />
- <orderEntry type="library" exported="" name="h2small-1.4.190.jar" level="project" />
- <orderEntry type="library" exported="" name="lcrypto-jdk15on-152" level="project" />
+ <orderEntry type="library" exported="" name="_home_someone_workspace_briar_briar_core_libs_h2small_1_3_170_jar" level="project" />
+ <orderEntry type="library" exported="" name="_home_someone_workspace_briar_briar_core_libs_lcrypto_jdk15on_152_jar" level="project" />
<orderEntry type="library" exported="" name="weupnp-0.1.3-SNAPSHOT-briar" level="project" />
<orderEntry type="library" exported="" name="bluecove-2.1.1-SNAPSHOT-briar" level="project" />
<orderEntry type="library" exported="" name="jna-4.1.0" level="project" />
diff --git a/briar-tests/src/org/briarproject/db/BasicH2Test.java b/briar-tests/src/org/briarproject/db/BasicH2Test.java
index c5ca6af83b7ef65ee05f650cba90c03f04fe9e06..9ddcd6dec74c0b395e2eb8d6d6a162dd5ec28052 100644
--- a/briar-tests/src/org/briarproject/db/BasicH2Test.java
+++ b/briar-tests/src/org/briarproject/db/BasicH2Test.java
@@ -27,7 +27,7 @@ public class BasicH2Test extends BriarTestCase {
private final File testDir = TestUtils.getTestDirectory();
private final File db = new File(testDir, "db");
- private final String url = "jdbc:h2:" + db.getPath();
+ private final String url = "jdbc:h2:" + db.getAbsolutePath();
private Connection connection = null;
@@ -106,19 +106,19 @@ public class BasicH2Test extends BriarTestCase {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, -128
+ 0, 0, 0, 0, 0, 0, 0, 0
};
byte[] second = new byte[] {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0
+ 0, 0, 0, 0, 0, 0, 0, 127
};
byte[] third = new byte[] {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 127
+ 0, 0, 0, 0, 0, 0, 0, (byte) 255
};
// Create the table
createTable(connection);
diff --git a/patches/spongy.sh b/patches/spongy.sh
deleted file mode 100755
index a0d4043353110cecedbfde23156520195da44a0d..0000000000000000000000000000000000000000
--- a/patches/spongy.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-dirs=(ant core docs jce mail pg pkix prov)
-
-for file in `find ${dirs[@]} -name bouncycastle`
-do
- path=`dirname $file`
- echo "Moving $file to $path/spongycastle"
- mv $file $path/spongycastle
-done
-
-for file in `grep -Rl bouncycastle ${dirs[@]}`
-do
- echo "Replacing string bouncycastle in $file"
- sed -i 's/bouncycastle/spongycastle/g' $file
-done
-