diff options
Diffstat (limited to 'base/util')
12 files changed, 46 insertions, 32 deletions
diff --git a/base/util/src/com/netscape/cmsutil/http/JssSSLSocketFactory.java b/base/util/src/com/netscape/cmsutil/http/JssSSLSocketFactory.java index aca93b2f0..fcf5fc16e 100644 --- a/base/util/src/com/netscape/cmsutil/http/JssSSLSocketFactory.java +++ b/base/util/src/com/netscape/cmsutil/http/JssSSLSocketFactory.java @@ -169,7 +169,7 @@ public class JssSSLSocketFactory implements ISocketFactory { public void log(int level, String msg) { } - class ClientHandshakeCB implements SSLHandshakeCompletedListener { + static class ClientHandshakeCB implements SSLHandshakeCompletedListener { Object sc; public ClientHandshakeCB(Object sc) { diff --git a/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java b/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java index afde8b6c1..48fee56fc 100644 --- a/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java +++ b/base/util/src/com/netscape/cmsutil/scep/CRSPKIMessage.java @@ -255,32 +255,28 @@ public class CRSPKIMessage { // These functions are used to initialize the various blobs - public void makeSignedData(int version, - byte[] certificate, String hashAlgorithm) { + public void makeSignedData(int version, byte[] certificate, String hashAlgorithm) { - try { - SET digest_algs = new SET(); + SET digest_algs = new SET(); - digest_algs.addElement(new AlgorithmIdentifier(getAlgorithmOID(hashAlgorithm), new NULL())); + digest_algs.addElement(new AlgorithmIdentifier(getAlgorithmOID(hashAlgorithm), new NULL())); - // SET certs = new SET(); - // certs.addElement(new ANY(certificate)); + // SET certs = new SET(); + // certs.addElement(new ANY(certificate)); - SET sis = new SET(); + SET sis = new SET(); - sis.addElement(si); + sis.addElement(si); - ContentInfo data = this.data; + ContentInfo data = this.data; - this.sd = new SignedData( - digest_algs, - data, - null, // don't send the certs, he already has them - null, // crl's - sis); + this.sd = new SignedData( + digest_algs, + data, + null, // don't send the certs, he already has them + null, // crl's + sis); - } catch (Exception e) { - } } public byte[] getResponse() throws IOException, InvalidBERException { diff --git a/base/util/src/netscape/security/util/BigInt.java b/base/util/src/netscape/security/util/BigInt.java index 1bf00684e..62a03cef5 100644 --- a/base/util/src/netscape/security/util/BigInt.java +++ b/base/util/src/netscape/security/util/BigInt.java @@ -17,6 +17,7 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.util; +import java.io.Serializable; import java.math.BigInteger; /** @@ -34,8 +35,9 @@ import java.math.BigInteger; * @version 1.23 * @author David Brownell */ -public final class BigInt { +public final class BigInt implements Serializable { + private static final long serialVersionUID = 705094142021888265L; // Big endian -- MSB first. private byte[] places; diff --git a/base/util/src/netscape/security/util/PrettyPrintFormat.java b/base/util/src/netscape/security/util/PrettyPrintFormat.java index 30ae33b10..959eb28bf 100644 --- a/base/util/src/netscape/security/util/PrettyPrintFormat.java +++ b/base/util/src/netscape/security/util/PrettyPrintFormat.java @@ -17,6 +17,7 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.util; + /** * This class will display the certificate content in predefined * format. diff --git a/base/util/src/netscape/security/x509/DisplayText.java b/base/util/src/netscape/security/x509/DisplayText.java index 1c43d4946..f0e712ff4 100644 --- a/base/util/src/netscape/security/x509/DisplayText.java +++ b/base/util/src/netscape/security/x509/DisplayText.java @@ -18,6 +18,7 @@ package netscape.security.x509; import java.io.IOException; +import java.io.Serializable; import netscape.security.util.DerOutputStream; import netscape.security.util.DerValue; @@ -33,7 +34,9 @@ import netscape.security.util.DerValue; * * @author Thomas Kwan */ -public class DisplayText { +public class DisplayText implements Serializable { + + private static final long serialVersionUID = -6521458152495173328L; /** Tag value indicating an ASN.1 "BMPString" value. */ public final static byte tag_IA5String = 0x16; diff --git a/base/util/src/netscape/security/x509/GeneralSubtree.java b/base/util/src/netscape/security/x509/GeneralSubtree.java index 6a5cdc540..a49109846 100644 --- a/base/util/src/netscape/security/x509/GeneralSubtree.java +++ b/base/util/src/netscape/security/x509/GeneralSubtree.java @@ -18,6 +18,7 @@ package netscape.security.x509; import java.io.IOException; +import java.io.Serializable; import netscape.security.util.BigInt; import netscape.security.util.DerOutputStream; @@ -40,7 +41,9 @@ import netscape.security.util.PrettyPrintFormat; * @author Amit Kapoor * @author Hemma Prafullchandra */ -public class GeneralSubtree { +public class GeneralSubtree implements Serializable { + + private static final long serialVersionUID = -2835481424013062770L; private static final byte TAG_MIN = 0; private static final byte TAG_MAX = 1; private static final int MIN_DEFAULT = 0; diff --git a/base/util/src/netscape/security/x509/GeneralSubtrees.java b/base/util/src/netscape/security/x509/GeneralSubtrees.java index 66ccdba84..9d8c632a3 100644 --- a/base/util/src/netscape/security/x509/GeneralSubtrees.java +++ b/base/util/src/netscape/security/x509/GeneralSubtrees.java @@ -18,6 +18,7 @@ package netscape.security.x509; import java.io.IOException; +import java.io.Serializable; import java.util.Enumeration; import java.util.Vector; @@ -33,7 +34,9 @@ import netscape.security.util.PrettyPrintFormat; * @author Amit Kapoor * @author Hemma Prafullchandra */ -public class GeneralSubtrees { +public class GeneralSubtrees implements Serializable { + + private static final long serialVersionUID = 6308776640697100848L; private Vector<GeneralSubtree> trees; private PrettyPrintFormat pp = new PrettyPrintFormat(":"); diff --git a/base/util/src/netscape/security/x509/NSCCommentExtension.java b/base/util/src/netscape/security/x509/NSCCommentExtension.java index 8bf1d6882..6ba477504 100644 --- a/base/util/src/netscape/security/x509/NSCCommentExtension.java +++ b/base/util/src/netscape/security/x509/NSCCommentExtension.java @@ -36,8 +36,7 @@ import netscape.security.util.PrettyPrintFormat; * @see Extension * @see CertAttrSet */ -public class NSCCommentExtension extends Extension - implements CertAttrSet { +public class NSCCommentExtension extends Extension implements CertAttrSet { /** * @@ -60,7 +59,7 @@ public class NSCCommentExtension extends Extension // Private data members private Vector<Object> mInfos; - private PrettyPrintFormat pp = new PrettyPrintFormat(":"); + private transient PrettyPrintFormat pp = new PrettyPrintFormat(":"); // Encode this extension value private void encodeThis() throws IOException { diff --git a/base/util/src/netscape/security/x509/NameConstraintsExtension.java b/base/util/src/netscape/security/x509/NameConstraintsExtension.java index 018dd5074..87309080b 100644 --- a/base/util/src/netscape/security/x509/NameConstraintsExtension.java +++ b/base/util/src/netscape/security/x509/NameConstraintsExtension.java @@ -57,8 +57,7 @@ import netscape.security.util.PrettyPrintFormat; * @see Extension * @see CertAttrSet */ -public class NameConstraintsExtension extends Extension - implements CertAttrSet { +public class NameConstraintsExtension extends Extension implements CertAttrSet { /** * */ @@ -82,7 +81,7 @@ public class NameConstraintsExtension extends Extension private GeneralSubtrees permitted; private GeneralSubtrees excluded; - private PrettyPrintFormat pp = new PrettyPrintFormat(":"); + private transient PrettyPrintFormat pp = new PrettyPrintFormat(":"); // Encode this extension value. private void encodeThis() throws IOException { diff --git a/base/util/src/netscape/security/x509/NoticeReference.java b/base/util/src/netscape/security/x509/NoticeReference.java index d4703b200..66701518b 100644 --- a/base/util/src/netscape/security/x509/NoticeReference.java +++ b/base/util/src/netscape/security/x509/NoticeReference.java @@ -18,6 +18,7 @@ package netscape.security.x509; import java.io.IOException; +import java.io.Serializable; import java.util.Vector; import netscape.security.util.BigInt; @@ -34,8 +35,9 @@ import netscape.security.util.DerValue; * * @author Thomas Kwan */ -public class NoticeReference { +public class NoticeReference implements Serializable { + private static final long serialVersionUID = 1986080941078808200L; private DisplayText mOrg = null; private int mNumbers[] = null; diff --git a/base/util/src/netscape/security/x509/RevocationReason.java b/base/util/src/netscape/security/x509/RevocationReason.java index cbd7fe73d..ae68ec525 100644 --- a/base/util/src/netscape/security/x509/RevocationReason.java +++ b/base/util/src/netscape/security/x509/RevocationReason.java @@ -17,6 +17,8 @@ // --- END COPYRIGHT BLOCK --- package netscape.security.x509; +import java.io.Serializable; + /** * Represent the enumerated type used in CRLReason Extension of CRL entry. * @@ -25,7 +27,8 @@ package netscape.security.x509; * @version $Revision$, $Date$ */ -public final class RevocationReason { +public final class RevocationReason implements Serializable { + private static final long serialVersionUID = -2582403666913588806L; /** * Reasons */ diff --git a/base/util/src/netscape/security/x509/SerialNumber.java b/base/util/src/netscape/security/x509/SerialNumber.java index eee2f8169..857547a75 100644 --- a/base/util/src/netscape/security/x509/SerialNumber.java +++ b/base/util/src/netscape/security/x509/SerialNumber.java @@ -19,6 +19,7 @@ package netscape.security.x509; import java.io.IOException; import java.io.InputStream; +import java.io.Serializable; import java.math.BigInteger; import netscape.security.util.BigInt; @@ -33,7 +34,9 @@ import netscape.security.util.DerValue; * @author Hemma Prafullchandra * @version 1.5 */ -public class SerialNumber { +public class SerialNumber implements Serializable { + + private static final long serialVersionUID = 1600956411497203535L; private BigInt serialNum; // Construct the class from the DerValue |