Update of /cvsroot/freenet/freenet/src/freenet/crypt
In directory sc8-pr-cvs1:/tmp/cvs-serv30900/src/freenet/crypt
Modified Files:
DLES.java DSSVerifyingInputStream.java
Log Message:
Continue hirvox's good (but occasionally disastrous) work eliminating eclipse warnings.
Index: DLES.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/crypt/DLES.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -w -r1.7 -r1.8
--- DLES.java 31 Oct 2003 17:54:42 -0000 1.7
+++ DLES.java 31 Oct 2003 17:58:42 -0000 1.8
@@ -69,7 +69,7 @@
public BigInteger[] encrypt(DSAPublicKey pub, byte[] M,
Random r) {
- boolean logDEBUG = Core.logger.shouldLog(Core.logger.DEBUG);
+ boolean logDEBUG = Core.logger.shouldLog(Logger.DEBUG);
long startTime = System.currentTimeMillis();
DSAGroup gr=pub.getGroup();
BigInteger [] C=new BigInteger[3];
@@ -81,7 +81,7 @@
// Our thread load makes precise timings meaningless
if(logDEBUG) Core.logger.log(this, "got stuff in "+gslen, /*gslen>400 ?
Core.logger.NORMAL:*/
- Core.logger.DEBUG);
+ Logger.DEBUG);
BigInteger gu=gr.getG().modPow(u, gr.getP());
BigInteger guv=pub.getY().modPow(u, gr.getP());
@@ -97,7 +97,7 @@
long gotHashTime = System.currentTimeMillis();
long hashlen = gotHashTime - powerTime;
if(logDEBUG) Core.logger.log(this, "Hash in "+hashlen,
/*hashlen>400?Core.logger.NORMAL:*/
- Core.logger.DEBUG);
+ Logger.DEBUG);
byte[][] t=deriveKeys(hv);
@@ -130,13 +130,13 @@
long initlen = initTime - inSyncTime;
if(logDEBUG) Core.logger.log(this, "Initialized in "+initlen,
/*initlen>400?
Core.logger.NORMAL:*/
- Core.logger.DEBUG);
+ Logger.DEBUG);
ctx.reset(allZeros);
long resetTime = System.currentTimeMillis();
long resetlen = resetTime - initTime;
if(logDEBUG) Core.logger.log(this, "Reset in "+resetlen, /*resetlen > 400 ?
Core.logger.NORMAL :*/
- Core.logger.DEBUG);
+ Logger.DEBUG);
encM=ctx.blockEncipher(encM, 0, encM.length);
encipheredTime = System.currentTimeMillis();
long ciphlen = encipheredTime - resetTime;
Index: DSSVerifyingInputStream.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/crypt/DSSVerifyingInputStream.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -r1.2 -r1.3
--- DSSVerifyingInputStream.java 21 May 2003 17:06:25 -0000 1.2
+++ DSSVerifyingInputStream.java 31 Oct 2003 17:58:42 -0000 1.3
@@ -65,7 +65,7 @@
public void checkPart(int cb) throws IOException, DataNotValidIOException {
super.checkPart(cb);
byte[] hash=ctx.digest();
- BigInteger m=Util.byteArrayToMPI(hash);
+ BigInteger m=new BigInteger(1, hash);
if (!DSA.verify(kp, signature, m)) {
Core.logger.log(this,"Failed verification",Logger.DEBUGGING);
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
