Author: nextgens
Date: 2006-02-13 10:57:25 +0000 (Mon, 13 Feb 2006)
New Revision: 8035
Modified:
branches/freenet-freejvms/run-bench.sh
branches/freenet-freejvms/run.sh
branches/freenet-freejvms/src/freenet/crypt/DSAGroupGenerator.java
branches/freenet-freejvms/src/freenet/crypt/DSAPublicKey.java
branches/freenet-freejvms/src/freenet/keys/CHKBlock.java
branches/freenet-freejvms/src/freenet/keys/ClientCHKBlock.java
branches/freenet-freejvms/src/freenet/keys/ClientKSK.java
branches/freenet-freejvms/src/freenet/keys/ClientSSK.java
branches/freenet-freejvms/src/freenet/keys/InsertableClientSSK.java
branches/freenet-freejvms/src/freenet/keys/NodeSSK.java
branches/freenet-freejvms/src/freenet/keys/SSKBlock.java
branches/freenet-freejvms/src/freenet/node/FNPPacketMangler.java
branches/freenet-freejvms/src/freenet/node/SSKInsertSender.java
branches/freenet-freejvms/src/freenet/support/BucketTools.java
branches/freenet-freejvms/src/net/i2p/util/NativeBigInteger.java
Log:
One step closer to a working freenet binary
Modified: branches/freenet-freejvms/run-bench.sh
===================================================================
--- branches/freenet-freejvms/run-bench.sh 2006-02-12 22:45:41 UTC (rev
8034)
+++ branches/freenet-freejvms/run-bench.sh 2006-02-13 10:57:25 UTC (rev
8035)
@@ -1,3 +1,7 @@
-gcj -c -O3 -fjni -Ifreenet-cvs-snapshot.jar -Ifreenet-ext.jar
-Ignu-crypto-der.jar -Ignu-crypto.jar -o bench-freenet-ext.o freenet-ext.jar
-gcj -c -O3 -fjni -Ifreenet-cvs-snapshot.jar -Ifreenet-ext.jar
-Ignu-crypto-der.jar -Ignu-crypto.jar -o bench-freenet.o
freenet-cvs-snapshot.jar
-gcj -fjni -combine -O3 -Ifreenet-cvs-snapshot.jar -Ifreenet-ext.jar
-Ignu-crypto-der.jar -Ignu-crypto.jar --main=net.i2p.util.NativeBigInteger -o
bench -Lbin/lib/linux/x86/ -Lbin/net/i2p/util/ -lfec16 -lfec8
-ljbigi-linux-athlon -lgmp bench-freenet-ext.o bench-freenet.o
+echo "Compiling freenet-ext.jar"
+gcj -c -O3 -fjni -Ifreenet-cvs-snapshot.jar -Ifreenet-ext.jar
-Ijavax-security.jar -Ijavax-crypto.jar -Ignu-crypto.jar -o bench-freenet-ext.o
freenet-ext.jar
+echo "Compiling freenet-cvs-snapshot.jar"
+gcj -c -O3 -fjni -Ifreenet-cvs-snapshot.jar -Ifreenet-ext.jar
-Ijavax-security.jar -Ijavax-crypto.jar -Ignu-crypto.jar -o bench-freenet.o
freenet-cvs-snapshot.jar
+echo "Linking"
+gcj -combine -O3 -Ifreenet-cvs-snapshot.jar -Ifreenet-ext.jar
-Ijavax-security.jar -Ijavax-crypto.jar -Ignu-crypto.jar
--main=net.i2p.util.NativeBigInteger -o bench -Lbin/lib/linux/x86/
-Lbin/net/i2p/util/ -lfec16 -lfec8 -ljbigi-linux-athlon -lgmp -lgnutls
bench-freenet-ext.o bench-freenet.o
+echo "Done"
Modified: branches/freenet-freejvms/run.sh
===================================================================
--- branches/freenet-freejvms/run.sh 2006-02-12 22:45:41 UTC (rev 8034)
+++ branches/freenet-freejvms/run.sh 2006-02-13 10:57:25 UTC (rev 8035)
@@ -1,7 +1,7 @@
echo "Compiling freenet-ext.jar"
-gcj -c -g -fjni -Ifreenet-cvs-snapshot.jar -Ifreenet-ext.jar
-Ignu-crypto-der.jar -Ignu-crypto.jar -o freenet-ext.o freenet-ext.jar
+gcj -c -g -fjni -Ifreenet-cvs-snapshot.jar -Ifreenet-ext.jar
-Ijavax-security.jar -Ijavax-crypto.jar -Ignu-crypto.jar -o freenet-ext.o
freenet-ext.jar
echo "Compiling freenet-cvs-snapshot.jar"
-gcj -c -g -fjni -Ifreenet-cvs-snapshot.jar -Ifreenet-ext.jar
-Ignu-crypto-der.jar -Ignu-crypto.jar -o freenet.o freenet-cvs-snapshot.jar
+gcj -c -g -fjni -Ifreenet-cvs-snapshot.jar -Ifreenet-ext.jar
-Ijavax-security.jar -Ijavax-crypto.jar -Ignu-crypto.jar -o freenet.o
freenet-cvs-snapshot.jar
echo "Linking"
-gcj -fjni -combine -g -Ifreenet-cvs-snapshot.jar -Ifreenet-ext.jar
-Ignu-crypto-der.jar -Ignu-crypto.jar --main=freenet.node.Node -o freenet
-Lbin/lib/linux/x86/ -Lbin/net/i2p/util/ -lfec16 -lfec8 -ljbigi-linux-athlon
-lgmp freenet-ext.o freenet.o
+gcj -combine -g -Ifreenet-cvs-snapshot.jar -Ifreenet-ext.jar
-Ijavax-security.jar -Ijavax-crypto.jar -Ignu-crypto.jar
--main=freenet.node.Node -o freenet -Lbin/lib/linux/x86/ -Lbin/net/i2p/util/
-lfec16 -lfec8 -ljbigi-linux-athlon -lgmp -lgnutls freenet-ext.o freenet.o
echo "Done"
Modified: branches/freenet-freejvms/src/freenet/crypt/DSAGroupGenerator.java
===================================================================
--- branches/freenet-freejvms/src/freenet/crypt/DSAGroupGenerator.java
2006-02-12 22:45:41 UTC (rev 8034)
+++ branches/freenet-freejvms/src/freenet/crypt/DSAGroupGenerator.java
2006-02-13 10:57:25 UTC (rev 8035)
@@ -1,9 +1,9 @@
package freenet.crypt;
+import gnu.crypto.jce.GnuSecurity;
import java.math.BigInteger;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
-
import net.i2p.util.NativeBigInteger;
import freenet.support.HexUtil;
Modified: branches/freenet-freejvms/src/freenet/crypt/DSAPublicKey.java
===================================================================
--- branches/freenet-freejvms/src/freenet/crypt/DSAPublicKey.java
2006-02-12 22:45:41 UTC (rev 8034)
+++ branches/freenet-freejvms/src/freenet/crypt/DSAPublicKey.java
2006-02-13 10:57:25 UTC (rev 8035)
@@ -1,6 +1,7 @@
/* -*- Mode: java; c-basic-indent: 4; tab-width: 4 -*- */
package freenet.crypt;
+import gnu.crypto.jce.GnuSecurity;
import java.math.BigInteger;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
Modified: branches/freenet-freejvms/src/freenet/keys/CHKBlock.java
===================================================================
--- branches/freenet-freejvms/src/freenet/keys/CHKBlock.java 2006-02-12
22:45:41 UTC (rev 8034)
+++ branches/freenet-freejvms/src/freenet/keys/CHKBlock.java 2006-02-13
10:57:25 UTC (rev 8035)
@@ -1,5 +1,6 @@
package freenet.keys;
+import gnu.crypto.jce.GnuSecurity;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
Modified: branches/freenet-freejvms/src/freenet/keys/ClientCHKBlock.java
===================================================================
--- branches/freenet-freejvms/src/freenet/keys/ClientCHKBlock.java
2006-02-12 22:45:41 UTC (rev 8034)
+++ branches/freenet-freejvms/src/freenet/keys/ClientCHKBlock.java
2006-02-13 10:57:25 UTC (rev 8035)
@@ -3,6 +3,7 @@
import java.io.IOException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
+import gnu.crypto.jce.GnuSecurity;
import java.util.Arrays;
import org.spaceroots.mantissa.random.MersenneTwister;
Modified: branches/freenet-freejvms/src/freenet/keys/ClientKSK.java
===================================================================
--- branches/freenet-freejvms/src/freenet/keys/ClientKSK.java 2006-02-12
22:45:41 UTC (rev 8034)
+++ branches/freenet-freejvms/src/freenet/keys/ClientKSK.java 2006-02-13
10:57:25 UTC (rev 8035)
@@ -1,5 +1,6 @@
package freenet.keys;
+import gnu.crypto.jce.GnuSecurity;
import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
import java.security.MessageDigest;
Modified: branches/freenet-freejvms/src/freenet/keys/ClientSSK.java
===================================================================
--- branches/freenet-freejvms/src/freenet/keys/ClientSSK.java 2006-02-12
22:45:41 UTC (rev 8034)
+++ branches/freenet-freejvms/src/freenet/keys/ClientSSK.java 2006-02-13
10:57:25 UTC (rev 8035)
@@ -1,5 +1,6 @@
package freenet.keys;
+import gnu.crypto.jce.GnuSecurity;
import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
import java.security.MessageDigest;
Modified: branches/freenet-freejvms/src/freenet/keys/InsertableClientSSK.java
===================================================================
--- branches/freenet-freejvms/src/freenet/keys/InsertableClientSSK.java
2006-02-12 22:45:41 UTC (rev 8034)
+++ branches/freenet-freejvms/src/freenet/keys/InsertableClientSSK.java
2006-02-13 10:57:25 UTC (rev 8035)
@@ -1,5 +1,6 @@
package freenet.keys;
+import gnu.crypto.jce.GnuSecurity;
import java.io.IOException;
import java.net.MalformedURLException;
import java.security.MessageDigest;
Modified: branches/freenet-freejvms/src/freenet/keys/NodeSSK.java
===================================================================
--- branches/freenet-freejvms/src/freenet/keys/NodeSSK.java 2006-02-12
22:45:41 UTC (rev 8034)
+++ branches/freenet-freejvms/src/freenet/keys/NodeSSK.java 2006-02-13
10:57:25 UTC (rev 8035)
@@ -1,5 +1,6 @@
package freenet.keys;
+import gnu.crypto.jce.GnuSecurity;
import java.io.DataInput;
import java.io.DataOutput;
import java.io.DataOutputStream;
Modified: branches/freenet-freejvms/src/freenet/keys/SSKBlock.java
===================================================================
--- branches/freenet-freejvms/src/freenet/keys/SSKBlock.java 2006-02-12
22:45:41 UTC (rev 8034)
+++ branches/freenet-freejvms/src/freenet/keys/SSKBlock.java 2006-02-13
10:57:25 UTC (rev 8035)
@@ -1,5 +1,6 @@
package freenet.keys;
+import gnu.crypto.jce.GnuSecurity;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
Modified: branches/freenet-freejvms/src/freenet/node/FNPPacketMangler.java
===================================================================
--- branches/freenet-freejvms/src/freenet/node/FNPPacketMangler.java
2006-02-12 22:45:41 UTC (rev 8034)
+++ branches/freenet-freejvms/src/freenet/node/FNPPacketMangler.java
2006-02-13 10:57:25 UTC (rev 8035)
@@ -1,5 +1,6 @@
package freenet.node;
+import gnu.crypto.jce.GnuSecurity;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
Modified: branches/freenet-freejvms/src/freenet/node/SSKInsertSender.java
===================================================================
--- branches/freenet-freejvms/src/freenet/node/SSKInsertSender.java
2006-02-12 22:45:41 UTC (rev 8034)
+++ branches/freenet-freejvms/src/freenet/node/SSKInsertSender.java
2006-02-13 10:57:25 UTC (rev 8035)
@@ -1,5 +1,6 @@
package freenet.node;
+import gnu.crypto.jce.GnuSecurity;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.util.Arrays;
Modified: branches/freenet-freejvms/src/freenet/support/BucketTools.java
===================================================================
--- branches/freenet-freejvms/src/freenet/support/BucketTools.java
2006-02-12 22:45:41 UTC (rev 8034)
+++ branches/freenet-freejvms/src/freenet/support/BucketTools.java
2006-02-13 10:57:25 UTC (rev 8035)
@@ -1,5 +1,6 @@
package freenet.support;
+import gnu.crypto.jce.GnuSecurity;
import java.io.DataInputStream;
import java.io.EOFException;
import java.io.File;
Modified: branches/freenet-freejvms/src/net/i2p/util/NativeBigInteger.java
===================================================================
--- branches/freenet-freejvms/src/net/i2p/util/NativeBigInteger.java
2006-02-12 22:45:41 UTC (rev 8034)
+++ branches/freenet-freejvms/src/net/i2p/util/NativeBigInteger.java
2006-02-13 10:57:25 UTC (rev 8035)
@@ -90,7 +90,7 @@
*/
public class NativeBigInteger extends BigInteger {
/** did we load the native lib correctly? */
- private static boolean _nativeOk = false;
+ private static boolean _nativeOk = true;
/**
* do we want to dump some basic success/failure info to stderr during
* initialization? this would otherwise use the Log component, but this
makes
