Findbugs and lint (thx zzz)

Author: str4d

src/net/i2p/crypto/eddsa/EdDSAPrivateKey.java

@@ -13,12 +13,12 @@
  */
 public class EdDSAPrivateKey implements EdDSAKey, PrivateKey {
     private static final long serialVersionUID = 23495873459878957L;
-    private transient final byte[] seed;
-    private transient final byte[] h;
-    private transient final byte[] a;
-    private transient final GroupElement A;
-    private transient final byte[] Abyte;
-    private transient final EdDSAParameterSpec edDsaSpec;
+    private final byte[] seed;
+    private final byte[] h;
+    private final byte[] a;
+    private final GroupElement A;
+    private final byte[] Abyte;
+    private final EdDSAParameterSpec edDsaSpec;
 
     public EdDSAPrivateKey(EdDSAPrivateKeySpec spec) {
         this.seed = spec.getSeed();

src/net/i2p/crypto/eddsa/math/FieldElement.java

@@ -1,6 +1,10 @@
 package net.i2p.crypto.eddsa.math;
 
-public abstract class FieldElement {
+import java.io.Serializable;
+
+public abstract class FieldElement implements Serializable {
+    private static final long serialVersionUID = 1239527465875676L;
+
     protected final Field f;
 
     public FieldElement(Field f) {

src/net/i2p/crypto/eddsa/math/GroupElement.java

@@ -720,7 +720,7 @@ public boolean equals(Object obj) {
         if (!this.repr.equals(ge.repr)) {
             try {
                 ge = ge.toRep(this.repr);
-            } catch (Exception e) {
+            } catch (RuntimeException e) {
                 return false;
             }
         }

src/net/i2p/crypto/eddsa/math/ed25519/Ed25519FieldElement.java

@@ -705,18 +705,11 @@ public FieldElement invert() {
         // 2 == 2 * 1
         t0 = square();
 
-        // TODO -CR BR: What is this? Is the author superstitious?
-        for (int i = 1; i < 1; ++i) { // Don't remove this
-            t0 = t0.square();
-        }
-
         // 4 == 2 * 2
         t1 = t0.square();
 
         // 8 == 2 * 4
-        for (int i = 1; i < 2; ++i) {
-            t1 = t1.square();
-        }
+        t1 = t1.square();
 
         // 9 == 8 + 1
         t1 = multiply(t1);
@@ -727,11 +720,6 @@ public FieldElement invert() {
         // 22 == 2 * 11
         t2 = t0.square();
 
-        // TODO -CR BR: see above
-        for (int i = 1; i < 1; ++i) { // Don't remove this
-            t2 = t2.square();
-        }
-
         // 31 == 22 + 9
         t1 = t1.multiply(t2);
 
@@ -838,18 +826,11 @@ public FieldElement pow22523() {
         // 2 == 2 * 1
         t0 = square();
 
-        // TODO -CR BR: see invert
-        for (int i = 1; i < 1; ++i) { // Don't remove this
-            t0 = t0.square();
-        }
-
         // 4 == 2 * 2
         t1 = t0.square();
 
         // 8 == 2 * 4
-        for (int i = 1; i < 2; ++i) {
-            t1 = t1.square();
-        }
+        t1 = t1.square();
 
         // z9 = z1*z8
         t1 = multiply(t1);
@@ -860,11 +841,6 @@ public FieldElement pow22523() {
         // 22 == 2 * 11
         t0 = t0.square();
 
-        // TODO -CR BR: see above
-        for (int i = 1; i < 1; ++i) { // Don't remove this
-            t0 = t0.square();
-        }
-
         // 31 == 22 + 9
         t0 = t1.multiply(t0);
 
@@ -949,9 +925,7 @@ public FieldElement pow22523() {
         t0 = t0.square();
 
         // 2^252 - 2^2
-        for (int i = 1; i < 2; ++i) {
-            t0 = t0.square();
-        }
+        t0 = t0.square();
 
         // 2^252 - 3
         return multiply(t0);

src/net/i2p/crypto/eddsa/math/ed25519/Ed25519LittleEndianEncoding.java

@@ -70,7 +70,7 @@ public byte[] encode(FieldElement x) {
 
         // Step 1:
         // Calculate q
-        q = (19 * h9 + (((int) 1) << 24)) >> 25;
+        q = (19 * h9 + (1 << 24)) >> 25;
         q = (h0 + q) >> 26;
         q = (h1 + q) >> 25;
         q = (h2 + q) >> 26;