diff options
author | Abhishek Koneru <akoneru@redhat.com> | 2012-07-09 15:12:11 -0400 |
---|---|---|
committer | Ade Lee <alee@redhat.com> | 2012-07-12 16:42:18 -0400 |
commit | 15ac6d2b8e83a73ac1f62ab0da0d6a85717f28fd (patch) | |
tree | f3bd2a816e816ad565f13ce90816a7fd7fb32454 /base/util | |
parent | 9e4e40b80de0ba47702392b9ad6ccecf67496db7 (diff) | |
download | pki-15ac6d2b8e83a73ac1f62ab0da0d6a85717f28fd.tar.gz pki-15ac6d2b8e83a73ac1f62ab0da0d6a85717f28fd.tar.xz pki-15ac6d2b8e83a73ac1f62ab0da0d6a85717f28fd.zip |
NO_HASHCODE_OVERRIDDEN
Diffstat (limited to 'base/util')
12 files changed, 95 insertions, 25 deletions
diff --git a/base/util/src/com/netscape/cmsutil/radius/UserPasswordAttribute.java b/base/util/src/com/netscape/cmsutil/radius/UserPasswordAttribute.java index 31c27cdfd..d87811d11 100644 --- a/base/util/src/com/netscape/cmsutil/radius/UserPasswordAttribute.java +++ b/base/util/src/com/netscape/cmsutil/radius/UserPasswordAttribute.java @@ -61,7 +61,7 @@ public class UserPasswordAttribute extends Attribute { if (i < up.length) { ret[i] = (byte) (sum[i % 16] ^ up[i]); } else { - ret[i] = (byte) (sum[i % 16] ^ 0); + ret[i] = sum[i % 16]; } md5.update(ret[i]); if ((i % 16) == 15) { diff --git a/base/util/src/netscape/security/acl/PermissionImpl.java b/base/util/src/netscape/security/acl/PermissionImpl.java index b20570a81..80b36e1da 100644 --- a/base/util/src/netscape/security/acl/PermissionImpl.java +++ b/base/util/src/netscape/security/acl/PermissionImpl.java @@ -54,6 +54,14 @@ public class PermissionImpl implements Permission { } } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((permission == null) ? 0 : permission.hashCode()); + return result; + } + /** * Prints a stringified version of the permission. * diff --git a/base/util/src/netscape/security/provider/DSA.java b/base/util/src/netscape/security/provider/DSA.java index 64575b870..9403475e0 100644 --- a/base/util/src/netscape/security/provider/DSA.java +++ b/base/util/src/netscape/security/provider/DSA.java @@ -311,11 +311,12 @@ public final class DSA extends Signature { */ private int compareSeeds(int[] seed1, int[] seed2) { - if ((seed1 == null && seed1 == null) || - (seed1 == null && seed2 != null) || - (seed1 != null && seed2 == null) || - seed1.length != seed2.length) + if (seed1 == null || seed2 == null) { return 1; + } + if (seed1.length != seed2.length) { + return 1; + } for (int i = 0; i < seed1.length; i++) { if (seed1[i] != seed2[i]) diff --git a/base/util/src/netscape/security/provider/RSAPublicKey.java b/base/util/src/netscape/security/provider/RSAPublicKey.java index 40f5583ac..bd5aa2fe4 100644 --- a/base/util/src/netscape/security/provider/RSAPublicKey.java +++ b/base/util/src/netscape/security/provider/RSAPublicKey.java @@ -150,23 +150,34 @@ public final class RSAPublicKey extends X509Key implements Serializable { } @Override - public boolean equals(Object object) { + public int hashCode() { + final int prime = 31; + int result = super.hashCode(); + result = prime * result + ((modulus == null) ? 0 : modulus.hashCode()); + result = prime * result + ((publicExponent == null) ? 0 : publicExponent.hashCode()); + return result; + } - if (object == null) { + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (!super.equals(obj)) return false; - } - if (object instanceof RSAPublicKey) { - RSAPublicKey rhs = (RSAPublicKey) object; - if (this == rhs) { - return true; - } - if (!(bigIntEquals(this.modulus, rhs.modulus) && bigIntEquals(this.publicExponent, rhs.publicExponent))) { + if (getClass() != obj.getClass()) + return false; + RSAPublicKey other = (RSAPublicKey) obj; + if (modulus == null) { + if (other.modulus != null) return false; - } - return super.equals(rhs); - } - - return false; + } else if (!modulus.equals(other.modulus)) + return false; + if (publicExponent == null) { + if (other.publicExponent != null) + return false; + } else if (!publicExponent.equals(other.publicExponent)) + return false; + return true; } public boolean bigIntEquals(BigInt x, BigInt y) { 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 diff --git a/base/util/src/netscape/security/x509/AVA.java b/base/util/src/netscape/security/x509/AVA.java index fc6601223..534f7c212 100644 --- a/base/util/src/netscape/security/x509/AVA.java +++ b/base/util/src/netscape/security/x509/AVA.java @@ -203,6 +203,15 @@ public final class AVA implements DerEncoder { return false; } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((oid == null) ? 0 : oid.hashCode()); + result = prime * result + ((value == null) ? 0 : value.hashCode()); + return result; + } + /** * Encodes the AVA to a Der output stream. * AVAs are encoded as a SEQUENCE of two elements. diff --git a/base/util/src/netscape/security/x509/AlgorithmId.java b/base/util/src/netscape/security/x509/AlgorithmId.java index 4b108ac4b..a027c19cc 100644 --- a/base/util/src/netscape/security/x509/AlgorithmId.java +++ b/base/util/src/netscape/security/x509/AlgorithmId.java @@ -498,6 +498,17 @@ public class AlgorithmId implements Serializable, DerEncoder { return false; } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((algParams == null) ? 0 : algParams.hashCode()); + result = prime * result + ((algid == null) ? 0 : algid.hashCode()); + result = prime * result + ((params == null) ? 0 : params.hashCode()); + result = prime * result + ((paramsString == null) ? 0 : paramsString.hashCode()); + return result; + } + /** * Compares two algorithm IDs for equality. Returns true iff * they are the same algorithm, ignoring algorithm parameters. @@ -506,6 +517,8 @@ public class AlgorithmId implements Serializable, DerEncoder { return algid.equals(id); } + + /*****************************************************************/ /* diff --git a/base/util/src/netscape/security/x509/CRLReasonExtension.java b/base/util/src/netscape/security/x509/CRLReasonExtension.java index 6a5fd6295..77339528e 100644 --- a/base/util/src/netscape/security/x509/CRLReasonExtension.java +++ b/base/util/src/netscape/security/x509/CRLReasonExtension.java @@ -231,4 +231,12 @@ public final class CRLReasonExtension extends Extension implements CertAttrSet { return false; } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((mReason == null) ? 0 : mReason.hashCode()); + return result; + } + } diff --git a/base/util/src/netscape/security/x509/GeneralSubtree.java b/base/util/src/netscape/security/x509/GeneralSubtree.java index a49109846..4c20bb4ba 100644 --- a/base/util/src/netscape/security/x509/GeneralSubtree.java +++ b/base/util/src/netscape/security/x509/GeneralSubtree.java @@ -52,7 +52,7 @@ public class GeneralSubtree implements Serializable { private int minimum = MIN_DEFAULT; private int maximum = -1; - private PrettyPrintFormat pp = new PrettyPrintFormat(":"); + private transient PrettyPrintFormat pp = new PrettyPrintFormat(":"); /** * The default constructor for the class. diff --git a/base/util/src/netscape/security/x509/GeneralSubtrees.java b/base/util/src/netscape/security/x509/GeneralSubtrees.java index 9d8c632a3..edbab7ee9 100644 --- a/base/util/src/netscape/security/x509/GeneralSubtrees.java +++ b/base/util/src/netscape/security/x509/GeneralSubtrees.java @@ -38,7 +38,7 @@ public class GeneralSubtrees implements Serializable { private static final long serialVersionUID = 6308776640697100848L; private Vector<GeneralSubtree> trees; - private PrettyPrintFormat pp = new PrettyPrintFormat(":"); + private transient PrettyPrintFormat pp = new PrettyPrintFormat(":"); /** * The default constructor for the class. |