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

Upgraded Spongy Castle to 1.53, fixed tests. #146

Browse Source
This commit is contained in:
akwizgran
2015-12-03 11:12:16 +00:00
parent 427efdc7d6
commit 8ae3fb3e35
14 changed files with 22 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/.classpath
View File

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

14
briar-android/briar-android.iml
View File

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

3
briar-api/briar-api.iml
View File

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

2
briar-core/.classpath
View File

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

7
briar-core/briar-core.iml
View File

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

BIN
briar-core/libs/lcrypto-jdk15on-152.jar
View File

Binary file not shown.

BIN
briar-core/libs/source/lcrypto-jdk15on-152-src.jar
View File

Binary file not shown.

BIN
briar-core/libs/spongy-core-1.53.jar Normal file
View File

Binary file not shown.

2
briar-core/src/org/briarproject/db/H2Database.java
View File

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

7
briar-desktop/briar-desktop.iml
View File

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

2
briar-tests/.classpath
View File

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

6
briar-tests/briar-tests.iml
View File

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

8
briar-tests/src/org/briarproject/db/BasicH2Test.java
View File

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

17
patches/spongy.sh
View File

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