diff options
Diffstat (limited to 'base/util/src/netscape/security/x509')
26 files changed, 57 insertions, 62 deletions
diff --git a/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java b/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java index 6ab962fae..327322b1c 100644 --- a/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java +++ b/base/util/src/netscape/security/x509/CRLDistributionPointsExtension.java @@ -85,7 +85,7 @@ public class CRLDistributionPointsExtension extends Extension this.extensionId = PKIXExtensions.CRLDistributionPoints_Id; this.critical = critical.booleanValue(); - this.extensionValue = (byte[]) ((byte[]) value).clone(); + this.extensionValue = ((byte[]) value).clone(); // decode the value try { diff --git a/base/util/src/netscape/security/x509/CRLExtensions.java b/base/util/src/netscape/security/x509/CRLExtensions.java index 4a567e173..3ebc72e41 100755 --- a/base/util/src/netscape/security/x509/CRLExtensions.java +++ b/base/util/src/netscape/security/x509/CRLExtensions.java @@ -198,7 +198,7 @@ public class CRLExtensions extends Vector<Extension> { name = alias.substring(index + 1); } else name = alias; - Extension ext = (Extension) map.get(name); + Extension ext = map.get(name); if (ext == null) throw new X509ExtensionException("No extension found with name: " + alias); diff --git a/base/util/src/netscape/security/x509/CRLReasonExtension.java b/base/util/src/netscape/security/x509/CRLReasonExtension.java index bd82ff2fc..6a5fd6295 100644 --- a/base/util/src/netscape/security/x509/CRLReasonExtension.java +++ b/base/util/src/netscape/security/x509/CRLReasonExtension.java @@ -113,7 +113,7 @@ public final class CRLReasonExtension extends Extension implements CertAttrSet { this.extensionId = PKIXExtensions.ReasonCode_Id; this.critical = critical.booleanValue(); - byte[] extValue = (byte[]) ((byte[]) value).clone(); + byte[] extValue = ((byte[]) value).clone(); this.extensionValue = extValue; DerValue val = new DerValue(extValue); int reasonCode = val.getEnumerated(); diff --git a/base/util/src/netscape/security/x509/CertAndKeyGen.java b/base/util/src/netscape/security/x509/CertAndKeyGen.java index 703585f36..d2a8f2b6f 100644 --- a/base/util/src/netscape/security/x509/CertAndKeyGen.java +++ b/base/util/src/netscape/security/x509/CertAndKeyGen.java @@ -234,7 +234,7 @@ public final class CertAndKeyGen { cert = new X509CertImpl(info); cert.sign(privateKey, algID.getName()); - return (X509Certificate) cert; + return cert; } catch (IOException e) { throw new CertificateEncodingException("getSelfCert: " + diff --git a/base/util/src/netscape/security/x509/CertificateChain.java b/base/util/src/netscape/security/x509/CertificateChain.java index 60df0ec65..346dcc740 100644 --- a/base/util/src/netscape/security/x509/CertificateChain.java +++ b/base/util/src/netscape/security/x509/CertificateChain.java @@ -47,7 +47,7 @@ public class CertificateChain implements Serializable { * @param chain a certificate array. */ public CertificateChain(X509Certificate[] chain) { - mChain = (X509Certificate[]) chain.clone(); + mChain = chain.clone(); } /** @@ -75,7 +75,7 @@ public class CertificateChain implements Serializable { * @return an array of X509 Certificates. */ public X509Certificate[] getChain() { - return (X509Certificate[]) mChain.clone(); + return mChain.clone(); } public void encode(OutputStream out) diff --git a/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java b/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java index 7fdd6ba02..8d45fd110 100644 --- a/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java +++ b/base/util/src/netscape/security/x509/CertificatePoliciesExtension.java @@ -78,7 +78,7 @@ public class CertificatePoliciesExtension extends Extension DerOutputStream tmp = new DerOutputStream(); for (int i = 0; i < mInfos.size(); i++) { - ((CertificatePolicyInfo) mInfos.elementAt(i)).encode(tmp); + mInfos.elementAt(i).encode(tmp); } os.write(DerValue.tag_Sequence, tmp); extensionValue = os.toByteArray(); diff --git a/base/util/src/netscape/security/x509/CertificatePolicySet.java b/base/util/src/netscape/security/x509/CertificatePolicySet.java index 68a5e3139..7b6558df1 100644 --- a/base/util/src/netscape/security/x509/CertificatePolicySet.java +++ b/base/util/src/netscape/security/x509/CertificatePolicySet.java @@ -79,7 +79,7 @@ public class CertificatePolicySet { DerOutputStream tmp = new DerOutputStream(); for (int i = 0; i < ids.size(); i++) { - ((CertificatePolicyId) ids.elementAt(i)).encode(tmp); + ids.elementAt(i).encode(tmp); } out.write(DerValue.tag_Sequence, tmp); } diff --git a/base/util/src/netscape/security/x509/EDIPartyName.java b/base/util/src/netscape/security/x509/EDIPartyName.java index eac5c0953..def86ffa5 100644 --- a/base/util/src/netscape/security/x509/EDIPartyName.java +++ b/base/util/src/netscape/security/x509/EDIPartyName.java @@ -88,7 +88,7 @@ public class EDIPartyName implements GeneralNameInterface { for (int i = 0; i < len; i++) { DerValue opt = seq[i]; - if (opt.isContextSpecific((byte) TAG_ASSIGNER) && + if (opt.isContextSpecific(TAG_ASSIGNER) && !opt.isConstructed()) { if (assigner != null) throw new IOException("Duplicate nameAssigner found in" @@ -96,7 +96,7 @@ public class EDIPartyName implements GeneralNameInterface { opt = opt.data.getDerValue(); assigner = opt.getAsString(); } - if (opt.isContextSpecific((byte) TAG_PARTYNAME) && + if (opt.isContextSpecific(TAG_PARTYNAME) && !opt.isConstructed()) { if (party != null) throw new IOException("Duplicate partyName found in" diff --git a/base/util/src/netscape/security/x509/FreshestCRLExtension.java b/base/util/src/netscape/security/x509/FreshestCRLExtension.java index 8e32bed66..b27f01a61 100644 --- a/base/util/src/netscape/security/x509/FreshestCRLExtension.java +++ b/base/util/src/netscape/security/x509/FreshestCRLExtension.java @@ -105,7 +105,7 @@ public class FreshestCRLExtension extends Extension try { this.extensionId = PKIXExtensions.FreshestCRL_Id; this.critical = critical.booleanValue(); - this.extensionValue = (byte[]) ((byte[]) value).clone(); + this.extensionValue = ((byte[]) value).clone(); // decode the value try { @@ -363,7 +363,7 @@ public class FreshestCRLExtension extends Extension int size = list.size(); Vector<Reason> result = new Vector<Reason>(); for (int i = 0; i < size; i++) { - Reason r = (Reason) list.elementAt(i); + Reason r = list.elementAt(i); byte b = r.getBitMask(); if ((first & b) != 0) { result.addElement(r); diff --git a/base/util/src/netscape/security/x509/GeneralSubtrees.java b/base/util/src/netscape/security/x509/GeneralSubtrees.java index 0c3c64cb2..720b6b225 100644 --- a/base/util/src/netscape/security/x509/GeneralSubtrees.java +++ b/base/util/src/netscape/security/x509/GeneralSubtrees.java @@ -79,7 +79,7 @@ public class GeneralSubtrees { GeneralSubtree element; for (Enumeration<GeneralSubtree> e = trees.elements(); e.hasMoreElements();) { - element = (GeneralSubtree) e.nextElement(); + element = e.nextElement(); s = s + pp.indent(indent + 4) + element.toPrint(indent) + "\n"; } @@ -95,7 +95,7 @@ public class GeneralSubtrees { DerOutputStream seq = new DerOutputStream(); for (int i = 0; i < trees.size(); i++) { - ((GeneralSubtree) trees.elementAt(i)).encode(seq); + trees.elementAt(i).encode(seq); } out.write(DerValue.tag_Sequence, seq); } diff --git a/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java b/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java index bcbaa2e3d..b1cf61180 100644 --- a/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java +++ b/base/util/src/netscape/security/x509/IssuingDistributionPointExtension.java @@ -131,7 +131,7 @@ public class IssuingDistributionPointExtension extends Extension this.extensionId = PKIXExtensions.IssuingDistributionPoint_Id; this.critical = critical.booleanValue(); - this.extensionValue = (byte[]) ((byte[]) value).clone(); + this.extensionValue = ((byte[]) value).clone(); byte[] extValue = this.extensionValue; issuingDistributionPoint = new IssuingDistributionPoint(); diff --git a/base/util/src/netscape/security/x509/KeyIdentifier.java b/base/util/src/netscape/security/x509/KeyIdentifier.java index c3d16030e..643e86a31 100644 --- a/base/util/src/netscape/security/x509/KeyIdentifier.java +++ b/base/util/src/netscape/security/x509/KeyIdentifier.java @@ -58,7 +58,7 @@ public class KeyIdentifier implements java.io.Serializable { * Return the value of the KeyIdentifier as byte array. */ public byte[] getIdentifier() { - return ((byte[]) octetString.clone()); + return octetString.clone(); } /** diff --git a/base/util/src/netscape/security/x509/KeyUsageExtension.java b/base/util/src/netscape/security/x509/KeyUsageExtension.java index 52cac0265..d116c4def 100644 --- a/base/util/src/netscape/security/x509/KeyUsageExtension.java +++ b/base/util/src/netscape/security/x509/KeyUsageExtension.java @@ -402,7 +402,7 @@ public class KeyUsageExtension extends Extension } public boolean[] getBits() { - return (boolean[]) bitString.clone(); + return bitString.clone(); } /** diff --git a/base/util/src/netscape/security/x509/LdapV3DNStrConverter.java b/base/util/src/netscape/security/x509/LdapV3DNStrConverter.java index f01da74ec..68bbeb2ad 100644 --- a/base/util/src/netscape/security/x509/LdapV3DNStrConverter.java +++ b/base/util/src/netscape/security/x509/LdapV3DNStrConverter.java @@ -198,7 +198,7 @@ public class LdapV3DNStrConverter extends LdapDNStrConverter { names = new RDN[rdnVector.size()]; for (i = 0, j = rdnVector.size() - 1; i < rdnVector.size(); i++, j--) - names[j] = (RDN) rdnVector.elementAt(i); + names[j] = rdnVector.elementAt(i); return new X500Name(names); } @@ -242,7 +242,7 @@ public class LdapV3DNStrConverter extends LdapDNStrConverter { assertion = new AVA[avaVector.size()]; for (int i = 0; i < avaVector.size(); i++) - assertion[i] = (AVA) avaVector.elementAt(i); + assertion[i] = avaVector.elementAt(i); return new RDN(assertion); } @@ -376,7 +376,7 @@ public class LdapV3DNStrConverter extends LdapDNStrConverter { "expecting escaped char."); if (hexDigits.indexOf((char) c) == -1) { in.unread(c); - in.unread((int) '\\'); + in.unread('\\'); break; } } while (true); diff --git a/base/util/src/netscape/security/x509/OIDMap.java b/base/util/src/netscape/security/x509/OIDMap.java index 41c1fa289..17573a019 100644 --- a/base/util/src/netscape/security/x509/OIDMap.java +++ b/base/util/src/netscape/security/x509/OIDMap.java @@ -245,7 +245,7 @@ public class OIDMap { * is registered for this oid. */ public static String getName(ObjectIdentifier oid) { - return (String) oid2Name.get(oid); + return oid2Name.get(oid); } /** @@ -256,7 +256,7 @@ public class OIDMap { * is registered for this name. */ public static ObjectIdentifier getOID(String name) { - return (ObjectIdentifier) name2OID.get(name); + return name2OID.get(name); } /** @@ -266,7 +266,7 @@ public class OIDMap { * @exception CertificateException if class cannot be instantiated. */ public static Class<?> getClass(String name) throws CertificateException { - String className = (String) name2Class.get(name); + String className = name2Class.get(name); if (className == null) return null; try { @@ -289,7 +289,7 @@ public class OIDMap { String name = getName(oid); if (name == null) return null; - String className = (String) name2Class.get(name); + String className = name2Class.get(name); if (className == null) return null; try { diff --git a/base/util/src/netscape/security/x509/OtherName.java b/base/util/src/netscape/security/x509/OtherName.java index b2533ecbb..ae8398344 100644 --- a/base/util/src/netscape/security/x509/OtherName.java +++ b/base/util/src/netscape/security/x509/OtherName.java @@ -201,7 +201,7 @@ public class OtherName implements GeneralNameInterface { if ((data[i] & 0xff) < 16) { b.append("0"); } - b.append(Integer.toString((int) (data[i] & 0xff), 0x10)); + b.append(Integer.toString((data[i] & 0xff), 0x10)); } return b.toString(); } diff --git a/base/util/src/netscape/security/x509/PolicyMappingsExtension.java b/base/util/src/netscape/security/x509/PolicyMappingsExtension.java index bb782ea52..458e32d4a 100644 --- a/base/util/src/netscape/security/x509/PolicyMappingsExtension.java +++ b/base/util/src/netscape/security/x509/PolicyMappingsExtension.java @@ -73,7 +73,7 @@ public class PolicyMappingsExtension extends Extension DerOutputStream tmp = new DerOutputStream(); for (int i = 0; i < maps.size(); i++) { - ((CertificatePolicyMap) maps.elementAt(i)).encode(tmp); + maps.elementAt(i).encode(tmp); } os.write(DerValue.tag_Sequence, tmp); extensionValue = os.toByteArray(); diff --git a/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java b/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java index 5544fdb75..80af3d1c4 100644 --- a/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java +++ b/base/util/src/netscape/security/x509/PrivateKeyUsageExtension.java @@ -149,7 +149,7 @@ public class PrivateKeyUsageExtension extends Extension for (int i = 0; i < seq.length; i++) { DerValue opt = seq[i]; - if (opt.isContextSpecific((byte) TAG_BEFORE) && + if (opt.isContextSpecific(TAG_BEFORE) && !opt.isConstructed()) { if (notBefore != null) { throw new CertificateParsingException( @@ -159,7 +159,7 @@ public class PrivateKeyUsageExtension extends Extension str = new DerInputStream(opt.toByteArray()); notBefore = str.getGeneralizedTime(); - } else if (opt.isContextSpecific((byte) TAG_AFTER) && + } else if (opt.isContextSpecific(TAG_AFTER) && !opt.isConstructed()) { if (notAfter != null) { throw new CertificateParsingException( diff --git a/base/util/src/netscape/security/x509/RDN.java b/base/util/src/netscape/security/x509/RDN.java index 6a4e7e1a9..dc26eb214 100644 --- a/base/util/src/netscape/security/x509/RDN.java +++ b/base/util/src/netscape/security/x509/RDN.java @@ -147,7 +147,7 @@ public class RDN { * @param avas a AVA Array. */ public RDN(AVA avas[]) { - assertion = (AVA[]) avas.clone(); + assertion = avas.clone(); } /** @@ -167,7 +167,7 @@ public class RDN { * @return array of AVA in this RDN. */ public AVA[] getAssertion() { - return (AVA[]) assertion.clone(); + return assertion.clone(); } /** diff --git a/base/util/src/netscape/security/x509/RevokedCertImpl.java b/base/util/src/netscape/security/x509/RevokedCertImpl.java index 45aa78920..866f1c0d9 100755 --- a/base/util/src/netscape/security/x509/RevokedCertImpl.java +++ b/base/util/src/netscape/security/x509/RevokedCertImpl.java @@ -29,7 +29,6 @@ import java.util.Enumeration; import java.util.LinkedHashSet; import java.util.Set; -import netscape.security.util.BigInt; import netscape.security.util.DerInputStream; import netscape.security.util.DerOutputStream; import netscape.security.util.DerValue; @@ -255,7 +254,7 @@ public class RevokedCertImpl extends RevokedCertificate implements Serializable * @return the serial number. */ public BigInteger getSerialNumber() { - return ((BigInt) serialNumber.getNumber()).toBigInteger(); + return serialNumber.getNumber().toBigInteger(); } /** @@ -290,7 +289,7 @@ public class RevokedCertImpl extends RevokedCertificate implements Serializable sb.append("\n"); for (int i = 0; i < extensions.size(); i++) sb.append("Entry Extension[" + i + "]: " - + ((Extension) (extensions.elementAt(i))).toString()); + + (extensions.elementAt(i)).toString()); } sb.append("\n"); return (sb.toString()); diff --git a/base/util/src/netscape/security/x509/X500Name.java b/base/util/src/netscape/security/x509/X500Name.java index abffbe7b1..c2886dab2 100644 --- a/base/util/src/netscape/security/x509/X500Name.java +++ b/base/util/src/netscape/security/x509/X500Name.java @@ -268,7 +268,7 @@ public class X500Name implements Principal, GeneralNameInterface { */ public X500Name(RDN[] rdns) throws IOException { - names = (RDN[]) rdns.clone(); + names = rdns.clone(); } /** @@ -281,7 +281,7 @@ public class X500Name implements Principal, GeneralNameInterface { int size = rdnVector.size(); names = new RDN[size]; for (int i = 0; i < size; i++) { - names[i] = (RDN) rdnVector.elementAt(i); + names[i] = rdnVector.elementAt(i); } } @@ -525,7 +525,7 @@ public class X500Name implements Principal, GeneralNameInterface { * @return array of RDN in this X500name. */ public RDN[] getNames() { - return (RDN[]) names.clone(); + return names.clone(); } /** diff --git a/base/util/src/netscape/security/x509/X500NameAttrMap.java b/base/util/src/netscape/security/x509/X500NameAttrMap.java index 8821c5e71..3947f0990 100644 --- a/base/util/src/netscape/security/x509/X500NameAttrMap.java +++ b/base/util/src/netscape/security/x509/X500NameAttrMap.java @@ -85,7 +85,7 @@ public class X500NameAttrMap { name2OID.get(name.toUpperCase()); if (oid == null) return null; - return (AVAValueConverter) oid2ValueConverter.get(oid); + return oid2ValueConverter.get(oid); } /** @@ -96,7 +96,7 @@ public class X500NameAttrMap { * @return An AVAValueConverter for the OID. */ public AVAValueConverter getValueConverter(ObjectIdentifier oid) { - return (AVAValueConverter) oid2ValueConverter.get(oid); + return oid2ValueConverter.get(oid); } /** diff --git a/base/util/src/netscape/security/x509/X509CRLImpl.java b/base/util/src/netscape/security/x509/X509CRLImpl.java index 05afe2653..9725db640 100755 --- a/base/util/src/netscape/security/x509/X509CRLImpl.java +++ b/base/util/src/netscape/security/x509/X509CRLImpl.java @@ -516,23 +516,22 @@ public class X509CRLImpl extends X509CRL { public String toString() { StringBuffer sb = new StringBuffer(); sb.append("X.509 CRL v" + (version + 1) + "\n"); - sb.append("Signature Algorithm: " + sigAlgId.toString() + - ", OID=" + (sigAlgId.getOID()).toString() + "\n"); - sb.append("Issuer: " + issuer.toString() + "\n"); - sb.append("\nThis Update: " + thisUpdate.toString() + "\n"); + sb.append("Signature Algorithm: " + sigAlgId + + ", OID=" + sigAlgId.getOID() + "\n"); + sb.append("Issuer: " + issuer + "\n"); + sb.append("\nThis Update: " + thisUpdate + "\n"); if (nextUpdate != null) - sb.append("Next Update: " + nextUpdate.toString() + "\n"); + sb.append("Next Update: " + nextUpdate + "\n"); if (revokedCerts.isEmpty()) sb.append("\nNO certificates have been revoked\n"); else { sb.append("\nRevoked Certificates:\n"); for (Enumeration<RevokedCertificate> e = revokedCerts.elements(); e.hasMoreElements();) - sb.append(((RevokedCertificate) e.nextElement()).toString()); + sb.append(e.nextElement()); } if (extensions != null) { for (int i = 0; i < extensions.size(); i++) { - sb.append("\nCRL Extension[" + i + "]: " + - ((Extension) (extensions.elementAt(i))).toString()); + sb.append("\nCRL Extension[" + i + "]: " + extensions.elementAt(i)); } } netscape.security.util.PrettyPrintFormat pp = @@ -614,7 +613,7 @@ public class X509CRLImpl extends X509CRL { * @return the issuer name. */ public Principal getIssuerDN() { - return (Principal) issuer; + return issuer; } /** @@ -650,9 +649,7 @@ public class X509CRLImpl extends X509CRL { public X509CRLEntry getRevokedCertificate(BigInteger serialNumber) { if (revokedCerts == null || revokedCerts.isEmpty()) return null; - RevokedCertificate badCert = - (RevokedCertificate) revokedCerts.get(serialNumber); - return badCert; + return revokedCerts.get(serialNumber); } /** @@ -806,7 +803,7 @@ public class X509CRLImpl extends X509CRL { for (Enumeration<Extension> e = extensions.getElements(); e.hasMoreElements();) { ex = e.nextElement(); if (ex.isCritical()) { - extSet.add(((ObjectIdentifier) ex.getExtensionId()).toString()); + extSet.add(ex.getExtensionId().toString()); } } return extSet; @@ -827,7 +824,7 @@ public class X509CRLImpl extends X509CRL { for (Enumeration<Extension> e = extensions.getElements(); e.hasMoreElements();) { ex = e.nextElement(); if (!ex.isCritical()) - extSet.add(((ObjectIdentifier) ex.getExtensionId()).toString()); + extSet.add(ex.getExtensionId().toString()); } return extSet; } @@ -884,7 +881,7 @@ public class X509CRLImpl extends X509CRL { return null; Enumeration<Extension> e = exts.getElements(); while (e.hasMoreElements()) { - Extension ext = (Extension) e.nextElement(); + Extension ext = e.nextElement(); if (ext instanceof CRLNumberExtension) { CRLNumberExtension numExt = (CRLNumberExtension) ext; return (BigInteger) numExt.get(CRLNumberExtension.NUMBER); @@ -902,7 +899,7 @@ public class X509CRLImpl extends X509CRL { return null; Enumeration<Extension> e = exts.getElements(); while (e.hasMoreElements()) { - Extension ext = (Extension) e.nextElement(); + Extension ext = e.nextElement(); if (ext instanceof DeltaCRLIndicatorExtension) { DeltaCRLIndicatorExtension numExt = (DeltaCRLIndicatorExtension) ext; return (BigInteger) numExt.get(DeltaCRLIndicatorExtension.NUMBER); @@ -920,7 +917,7 @@ public class X509CRLImpl extends X509CRL { return false; Enumeration<Extension> e = exts.getElements(); while (e.hasMoreElements()) { - Extension ext = (Extension) e.nextElement(); + Extension ext = e.nextElement(); if (ext instanceof DeltaCRLIndicatorExtension) { return true; } @@ -1049,7 +1046,7 @@ public class X509CRLImpl extends X509CRL { " not supported in CRL v1 entries."); revokedCerts.put(entry.getSerialNumber(), - (RevokedCertificate) entry); + entry); } } else { derStrm.skipSequence(4); diff --git a/base/util/src/netscape/security/x509/X509Cert.java b/base/util/src/netscape/security/x509/X509Cert.java index 5b6036049..9162cc92f 100644 --- a/base/util/src/netscape/security/x509/X509Cert.java +++ b/base/util/src/netscape/security/x509/X509Cert.java @@ -403,7 +403,7 @@ public class X509Cert implements Certificate, Serializable { Signature sig; if (privateKey instanceof Key) { - Key key = (Key) privateKey; + Key key = privateKey; algorithm = key.getAlgorithm(); } else { throw new InvalidKeyException("private key not a key!"); diff --git a/base/util/src/netscape/security/x509/X509CertImpl.java b/base/util/src/netscape/security/x509/X509CertImpl.java index f93fb9009..26b88fe3d 100755 --- a/base/util/src/netscape/security/x509/X509CertImpl.java +++ b/base/util/src/netscape/security/x509/X509CertImpl.java @@ -45,7 +45,6 @@ import java.util.LinkedHashSet; import java.util.Set; import java.util.Vector; -import netscape.security.util.BigInt; import netscape.security.util.DerEncoder; import netscape.security.util.DerOutputStream; import netscape.security.util.DerValue; @@ -707,7 +706,7 @@ public class X509CertImpl extends X509Certificate SerialNumber ser = (SerialNumber) info.get( CertificateSerialNumber.NAME + DOT + CertificateSerialNumber.NUMBER); - return ((BigInt) ser.getNumber()).toBigInteger(); + return ser.getNumber().toBigInteger(); } catch (Exception e) { return null; } @@ -915,7 +914,7 @@ public class X509CertImpl extends X509Certificate for (Enumeration<Extension> e = exts.getAttributes(); e.hasMoreElements();) { ex = e.nextElement(); if (ex.isCritical()) - extSet.add(((ObjectIdentifier) ex.getExtensionId()).toString()); + extSet.add(ex.getExtensionId().toString()); } return extSet; } catch (Exception e) { @@ -944,7 +943,7 @@ public class X509CertImpl extends X509Certificate for (Enumeration<Extension> e = exts.getAttributes(); e.hasMoreElements();) { ex = e.nextElement(); if (!ex.isCritical()) - extSet.add(((ObjectIdentifier) ex.getExtensionId()).toString()); + extSet.add(ex.getExtensionId().toString()); } return extSet; } catch (Exception e) { diff --git a/base/util/src/netscape/security/x509/X509CertInfo.java b/base/util/src/netscape/security/x509/X509CertInfo.java index 20ef2bd6a..314c3ad2b 100644 --- a/base/util/src/netscape/security/x509/X509CertInfo.java +++ b/base/util/src/netscape/security/x509/X509CertInfo.java @@ -356,7 +356,7 @@ public class X509CertInfo implements CertAttrSet, Serializable { new netscape.security.util.PrettyPrintFormat(" ", 20); for (int i = 0; i < extensions.size(); i++) { sb.append(" Extension[" + i + "] = "); - Extension ext = (Extension) extensions.elementAt(i); + Extension ext = extensions.elementAt(i); try { if (OIDMap.getClass(ext.getExtensionId()) == null) { sb.append(ext.toString()); |