NO_HASHCODE_OVERRIDDEN

3 files changed, 24 insertions, 4 deletions

diff --git a/base/util/src/netscape/security/util/BigInt.java b/base/util/src/netscape/security/util/BigInt.java
index 62a03cef5..c930edf80 100644
--- a/base/util/src/netscape/security/util/BigInt.java
+++ b/base/util/src/netscape/security/util/BigInt.java
@@ -19,6 +19,7 @@ package netscape.security.util;
 
 import java.io.Serializable;
 import java.math.BigInteger;
+import java.util.Arrays;
 
 /**
  * A low-overhead arbitrary-precision <em>unsigned</em> integer.
@@ -192,6 +193,14 @@ public final class BigInt implements Serializable {
         return false;
     }
 
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + Arrays.hashCode(places);
+        return result;
+    }
+
     /**
      * Returns true iff the parameter is numerically equivalent.
      *
diff --git a/base/util/src/netscape/security/util/DerInputStream.java b/base/util/src/netscape/security/util/DerInputStream.java
index ff1c54ba2..40763a6ba 100644
--- a/base/util/src/netscape/security/util/DerInputStream.java
+++ b/base/util/src/netscape/security/util/DerInputStream.java
@@ -453,7 +453,7 @@ public class DerInputStream {
             if (Htmp >= 24 || Mtmp >= 60)
                 throw new IOException("Parse UTCtime, +hhmm");
 
-            utcTime += ((Htmp * 60) + Mtmp) * 60 * 1000;
+            utcTime += ((Htmp * 60) + Mtmp) * 60 * 1000L;
         }
             break;
 
@@ -466,7 +466,7 @@ public class DerInputStream {
             if (Htmp >= 24 || Mtmp >= 60)
                 throw new IOException("Parse UTCtime, -hhmm");
 
-            utcTime -= ((Htmp * 60) + Mtmp) * 60 * 1000;
+            utcTime -= ((Htmp * 60) + Mtmp) * 60 * 1000L;
         }
             break;
 
@@ -560,7 +560,7 @@ public class DerInputStream {
             if (Htmp >= 24 || Mtmp >= 60)
                 throw new IOException("Parse GeneralizedTime, +hhmm");
 
-            utcTime += ((Htmp * 60) + Mtmp) * 60 * 1000;
+            utcTime += ((Htmp * 60) + Mtmp) * 60 * 1000L;
         }
             break;
 
@@ -573,7 +573,7 @@ public class DerInputStream {
             if (Htmp >= 24 || Mtmp >= 60)
                 throw new IOException("Parse GeneralizedTime, -hhmm");
 
-            utcTime -= ((Htmp * 60) + Mtmp) * 60 * 1000;
+            utcTime -= ((Htmp * 60) + Mtmp) * 60 * 1000L;
         }
             break;
 
diff --git a/base/util/src/netscape/security/util/DerValue.java b/base/util/src/netscape/security/util/DerValue.java
index 40215626a..87a0a38a3 100644
--- a/base/util/src/netscape/security/util/DerValue.java
+++ b/base/util/src/netscape/security/util/DerValue.java
@@ -610,6 +610,17 @@ public class DerValue {
             return false;
     }
 
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((buffer == null) ? 0 : buffer.hashCode());
+        result = prime * result + ((data == null) ? 0 : data.hashCode());
+        result = prime * result + length;
+        result = prime * result + tag;
+        return result;
+    }
+
     /**
      * Bitwise equality comparison. DER encoded values have a single
      * encoding, so that bitwise equality of the encoded values is an