From a3c83b5f63c9ced5c527cb3b9306d390c3d192ec Mon Sep 17 00:00:00 2001 From: Abhishek Koneru Date: Thu, 5 Jul 2012 10:22:37 -0400 Subject: SE_BAD_FIELD, MIGHT_IGNORE , STATIC_INNER_CLASS --- .../src/com/netscape/certsrv/request/IRequest.java | 3 +- .../com/netscape/certsrv/request/RequestId.java | 3 +- .../netscape/certsrv/request/RequestStatus.java | 6 +- .../src/com/netscape/certsrv/usrgrp/IUsrGrp.java | 4 +- .../cmscore/dbs/CertificateRepository.java | 2 +- .../netscape/cmscore/ldap/PublisherProcessor.java | 3 +- .../cmscore/ldapconn/LdapJssSSLSocketFactory.java | 2 +- .../netscape/cmscore/request/ARequestQueue.java | 13 +- .../com/netscape/cmscore/usrgrp/UGSubsystem.java | 5 +- .../netscape/cmscore/util/ProfileSubsystem.java | 6 +- .../certsrv/authentication/AuthTokenTest.java | 2 +- .../netscape/cmscore/dbs/CertRecordListTest.java | 2 +- .../com/netscape/cmscore/dbs/DBRegistryTest.java | 2 +- .../cmscore/request/ExtAttrDynMapperTest.java | 2 +- .../cmscore/request/RequestDefaultStub.java | 2 + .../netscape/cmscore/request/RequestQueueTest.java | 4 +- .../cmscore/request/RequestRecordTest.java | 2 +- .../com/netscape/cmscore/request/RequestTest.java | 2 +- .../src/com/netscape/cmstools/HttpClient.java | 2 +- .../src/com/netscape/cmstools/PKCS10Client.java | 134 ++++++++++----------- .../com/netscape/pkisilent/common/ParseXML.java | 1 + .../com/netscape/pkisilent/http/HTMLDocument.java | 11 +- .../netscape/cmsutil/http/JssSSLSocketFactory.java | 2 +- .../com/netscape/cmsutil/scep/CRSPKIMessage.java | 32 +++-- base/util/src/netscape/security/util/BigInt.java | 4 +- .../netscape/security/util/PrettyPrintFormat.java | 1 + .../src/netscape/security/x509/DisplayText.java | 5 +- .../src/netscape/security/x509/GeneralSubtree.java | 5 +- .../netscape/security/x509/GeneralSubtrees.java | 5 +- .../security/x509/NSCCommentExtension.java | 5 +- .../security/x509/NameConstraintsExtension.java | 5 +- .../netscape/security/x509/NoticeReference.java | 4 +- .../netscape/security/x509/RevocationReason.java | 5 +- .../src/netscape/security/x509/SerialNumber.java | 5 +- 34 files changed, 158 insertions(+), 133 deletions(-) (limited to 'base') diff --git a/base/common/src/com/netscape/certsrv/request/IRequest.java b/base/common/src/com/netscape/certsrv/request/IRequest.java index ded0145ab..3459af602 100644 --- a/base/common/src/com/netscape/certsrv/request/IRequest.java +++ b/base/common/src/com/netscape/certsrv/request/IRequest.java @@ -19,6 +19,7 @@ package com.netscape.certsrv.request; //import java.io.Serializable; +import java.io.Serializable; import java.math.BigInteger; import java.util.Date; import java.util.Enumeration; @@ -40,7 +41,7 @@ import com.netscape.certsrv.base.IAttrSet; * * @version $Revision$, $Date$ */ -public interface IRequest { +public interface IRequest extends Serializable { public static final String REQ_VERSION = "requestVersion"; diff --git a/base/common/src/com/netscape/certsrv/request/RequestId.java b/base/common/src/com/netscape/certsrv/request/RequestId.java index 8cd8c5711..8e67ca481 100644 --- a/base/common/src/com/netscape/certsrv/request/RequestId.java +++ b/base/common/src/com/netscape/certsrv/request/RequestId.java @@ -17,6 +17,7 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.request; +import java.io.Serializable; import java.math.BigInteger; /** @@ -27,7 +28,7 @@ import java.math.BigInteger; * * @version $Revision$ $Date$ */ -public class RequestId { +public class RequestId implements Serializable { protected BigInteger value; diff --git a/base/common/src/com/netscape/certsrv/request/RequestStatus.java b/base/common/src/com/netscape/certsrv/request/RequestStatus.java index fd501ef0f..4aec1b56a 100644 --- a/base/common/src/com/netscape/certsrv/request/RequestStatus.java +++ b/base/common/src/com/netscape/certsrv/request/RequestStatus.java @@ -17,6 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.request; +import java.io.Serializable; + /** * The RequestStatus class represents the current state of a request * in a request queue. The state of the request changes as actions @@ -33,7 +35,9 @@ package com.netscape.certsrv.request; * * @version $Revision$ $Date$ */ -public final class RequestStatus { +public final class RequestStatus implements Serializable { + + private static final long serialVersionUID = -8176052970922133411L; public static String BEGIN_STRING = "begin"; public static String PENDING_STRING = "pending"; public static String APPROVED_STRING = "approved"; diff --git a/base/common/src/com/netscape/certsrv/usrgrp/IUsrGrp.java b/base/common/src/com/netscape/certsrv/usrgrp/IUsrGrp.java index d5d37614e..db9c1539f 100644 --- a/base/common/src/com/netscape/certsrv/usrgrp/IUsrGrp.java +++ b/base/common/src/com/netscape/certsrv/usrgrp/IUsrGrp.java @@ -17,6 +17,8 @@ // --- END COPYRIGHT BLOCK --- package com.netscape.certsrv.usrgrp; +import java.io.Serializable; + import netscape.ldap.LDAPException; /** @@ -25,7 +27,7 @@ import netscape.ldap.LDAPException; * * @version $Revision$, $Date$ */ -public interface IUsrGrp extends IIdEvaluator { +public interface IUsrGrp extends IIdEvaluator , Serializable { /** * Retrieves usr/grp manager identifier. diff --git a/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java b/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java index 14e06aeb3..2d3dead75 100644 --- a/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java +++ b/base/common/src/com/netscape/cmscore/dbs/CertificateRepository.java @@ -1042,7 +1042,7 @@ public class CertificateRepository extends Repository /** * temp solution... */ - public class RenewableCertificateCollection { + public static class RenewableCertificateCollection { Vector mToRenew = null; Vector mToNotify = null; diff --git a/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java b/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java index ab99b4f06..50ed7c3c2 100644 --- a/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java +++ b/base/common/src/com/netscape/cmscore/ldap/PublisherProcessor.java @@ -443,8 +443,9 @@ public class PublisherProcessor implements //mLdapRequestListener.shutdown(); mAuthority.removeRequestListener(mLdapRequestListener); } - } catch (Exception e) { + } catch (ELdapException e) { // ignore + CMS.debug(e); } } diff --git a/base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java b/base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java index 38651d0ba..4d9e60251 100644 --- a/base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java +++ b/base/common/src/com/netscape/cmscore/ldapconn/LdapJssSSLSocketFactory.java @@ -102,7 +102,7 @@ public class LdapJssSSLSocketFactory implements LDAPSSLSocketFactoryExt { 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/common/src/com/netscape/cmscore/request/ARequestQueue.java b/base/common/src/com/netscape/cmscore/request/ARequestQueue.java index 0a156b003..446c3b18d 100644 --- a/base/common/src/com/netscape/cmscore/request/ARequestQueue.java +++ b/base/common/src/com/netscape/cmscore/request/ARequestQueue.java @@ -750,8 +750,10 @@ public abstract class ARequestQueue // Request - implementation of the IRequest interface. This // version is returned by ARequestQueue (and its derivatives) // -class Request - implements IRequest { +class Request implements IRequest { + + private static final long serialVersionUID = -1510479502681392568L; + // IRequest.getRequestId public RequestId getRequestId() { return mRequestId; @@ -1460,9 +1462,10 @@ class RequestIAttrSetWrapper implements IAttrSet { /** * Example of a specialized request class. */ -class EnrollmentRequest - extends Request - implements IEnrollmentRequest { +class EnrollmentRequest extends Request implements IEnrollmentRequest { + + private static final long serialVersionUID = 8214498908217267555L; + EnrollmentRequest(RequestId id) { super(id); } diff --git a/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java b/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java index ee53708ec..0489fa30a 100644 --- a/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java +++ b/base/common/src/com/netscape/cmscore/usrgrp/UGSubsystem.java @@ -63,6 +63,7 @@ import com.netscape.cmscore.util.Debug; */ public final class UGSubsystem implements IUGSubsystem { + private static final long serialVersionUID = 8080165044652629774L; public static final String ID = "usrgrp"; private String mId = ID; @@ -77,11 +78,11 @@ public final class UGSubsystem implements IUGSubsystem { protected static final String PROP_BASEDN = "basedn"; protected IConfigStore mConfig = null; - protected LdapBoundConnFactory mLdapConnFactory = null; + protected transient LdapBoundConnFactory mLdapConnFactory = null; protected String mBaseDN = null; protected static UGSubsystem mUG = null; - private ILogger mLogger = null; + private transient ILogger mLogger = null; // singleton enforcement diff --git a/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java b/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java index 40499577e..296aadea5 100644 --- a/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java +++ b/base/common/src/com/netscape/cmscore/util/ProfileSubsystem.java @@ -48,9 +48,6 @@ import com.netscape.certsrv.base.ISubsystem; */ public class ProfileSubsystem extends Frame implements ISubsystem, Runnable { - /** - * - */ private static final long serialVersionUID = -7411549542009497317L; private String mId = null; private Thread mMonitoring = new Thread(this); @@ -207,7 +204,8 @@ public class ProfileSubsystem extends Frame implements ISubsystem, Runnable { updateThreadPanel(); // update every second Thread.sleep(1000); - } catch (Exception e) { + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); } } } diff --git a/base/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java b/base/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java index 370973f0a..1a5d999f6 100644 --- a/base/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java +++ b/base/common/test/com/netscape/certsrv/authentication/AuthTokenTest.java @@ -255,7 +255,7 @@ public class AuthTokenTest extends CMSBaseTestCase { * getting a value out. It assumes BtoA is always called first, stores * the value passed in, and then returns that value for BtoA. */ - class CMSMemoryStub extends CMSEngineDefaultStub { + static class CMSMemoryStub extends CMSEngineDefaultStub { boolean bToACalled = false; byte[] bToACalledWith = null; diff --git a/base/common/test/com/netscape/cmscore/dbs/CertRecordListTest.java b/base/common/test/com/netscape/cmscore/dbs/CertRecordListTest.java index d3177f62c..d9c24106c 100644 --- a/base/common/test/com/netscape/cmscore/dbs/CertRecordListTest.java +++ b/base/common/test/com/netscape/cmscore/dbs/CertRecordListTest.java @@ -80,7 +80,7 @@ public class CertRecordListTest extends CMSBaseTestCase { } } - public class ElementProcessorStub implements IElementProcessor { + public static class ElementProcessorStub implements IElementProcessor { public void process(Object o) throws EBaseException { } } diff --git a/base/common/test/com/netscape/cmscore/dbs/DBRegistryTest.java b/base/common/test/com/netscape/cmscore/dbs/DBRegistryTest.java index c74f66ba1..4a52bbcef 100644 --- a/base/common/test/com/netscape/cmscore/dbs/DBRegistryTest.java +++ b/base/common/test/com/netscape/cmscore/dbs/DBRegistryTest.java @@ -118,7 +118,7 @@ public class DBRegistryTest extends CMSBaseTestCase { } } - class DBDynAttrMapperStub extends DBDynAttrMapperDefaultStub { + static class DBDynAttrMapperStub extends DBDynAttrMapperDefaultStub { boolean mapObjectCalled = false; Object mapObjectCalledWithObject = null; boolean mapLDAPAttrsCalled = false; diff --git a/base/common/test/com/netscape/cmscore/request/ExtAttrDynMapperTest.java b/base/common/test/com/netscape/cmscore/request/ExtAttrDynMapperTest.java index a0ad0a8a3..35f999de7 100644 --- a/base/common/test/com/netscape/cmscore/request/ExtAttrDynMapperTest.java +++ b/base/common/test/com/netscape/cmscore/request/ExtAttrDynMapperTest.java @@ -259,7 +259,7 @@ public class ExtAttrDynMapperTest extends CMSBaseTestCase { } - class RequestRecordStub extends RequestRecordDefaultStub { + static class RequestRecordStub extends RequestRecordDefaultStub { private static final long serialVersionUID = 4106967075497999274L; Hashtable extAttrData = new Hashtable(); int setCallCounter = 0; diff --git a/base/common/test/com/netscape/cmscore/request/RequestDefaultStub.java b/base/common/test/com/netscape/cmscore/request/RequestDefaultStub.java index fd53c2ea9..7a6bde408 100644 --- a/base/common/test/com/netscape/cmscore/request/RequestDefaultStub.java +++ b/base/common/test/com/netscape/cmscore/request/RequestDefaultStub.java @@ -23,6 +23,8 @@ import com.netscape.certsrv.request.RequestStatus; * Default testing stub for the IRequest interface. */ public class RequestDefaultStub implements IRequest { + private static final long serialVersionUID = -8466522941927034614L; + public RequestId getRequestId() { return null; } diff --git a/base/common/test/com/netscape/cmscore/request/RequestQueueTest.java b/base/common/test/com/netscape/cmscore/request/RequestQueueTest.java index a66326d03..6a0527572 100644 --- a/base/common/test/com/netscape/cmscore/request/RequestQueueTest.java +++ b/base/common/test/com/netscape/cmscore/request/RequestQueueTest.java @@ -40,7 +40,9 @@ public class RequestQueueTest extends CMSBaseTestCase { assertTrue(request.getExtDataKeysCalled); } - class RequestStub extends RequestDefaultStub { + static class RequestStub extends RequestDefaultStub { + private static final long serialVersionUID = -9058189963961484835L; + String[] keys = new String[] { "key1", "key2" }; boolean getExtDataKeysCalled = false; diff --git a/base/common/test/com/netscape/cmscore/request/RequestRecordTest.java b/base/common/test/com/netscape/cmscore/request/RequestRecordTest.java index 0ebf3beab..025684853 100644 --- a/base/common/test/com/netscape/cmscore/request/RequestRecordTest.java +++ b/base/common/test/com/netscape/cmscore/request/RequestRecordTest.java @@ -138,7 +138,7 @@ public class RequestRecordTest extends CMSBaseTestCase { } } - class DBRegistryStub extends DBRegistryDefaultStub { + static class DBRegistryStub extends DBRegistryDefaultStub { boolean registerCalledWithExtAttr = false; IDBAttrMapper extAttrMapper = null; diff --git a/base/common/test/com/netscape/cmscore/request/RequestTest.java b/base/common/test/com/netscape/cmscore/request/RequestTest.java index 1de96a203..b3a8c6ee5 100644 --- a/base/common/test/com/netscape/cmscore/request/RequestTest.java +++ b/base/common/test/com/netscape/cmscore/request/RequestTest.java @@ -667,7 +667,7 @@ public class RequestTest extends CMSBaseTestCase { } - class RevokedCertImplStub extends RevokedCertImpl { + static class RevokedCertImplStub extends RevokedCertImpl { /** * */ diff --git a/base/java-tools/src/com/netscape/cmstools/HttpClient.java b/base/java-tools/src/com/netscape/cmstools/HttpClient.java index a3e27c70e..fe89dd428 100644 --- a/base/java-tools/src/com/netscape/cmstools/HttpClient.java +++ b/base/java-tools/src/com/netscape/cmstools/HttpClient.java @@ -415,7 +415,7 @@ public class HttpClient { } } - class ClientHandshakeCB implements SSLHandshakeCompletedListener { + static class ClientHandshakeCB implements SSLHandshakeCompletedListener { Object sc; public ClientHandshakeCB(Object sc) { diff --git a/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java b/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java index 1e60a1c0e..95acc53cf 100644 --- a/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java +++ b/base/java-tools/src/com/netscape/cmstools/PKCS10Client.java @@ -69,7 +69,7 @@ public class PKCS10Client { "Usage: PKCS10Client -p -d -o -s \n"); } - public static void main(String args[]) { + public static void main(String args[]) throws Exception { String dbdir = null, ofilename = null, password = null, subjectName = null; if (args.length != 8) { @@ -99,73 +99,71 @@ public class PKCS10Client { if (dbdir == null) dbdir = "."; - try { - String mPrefix = ""; - CryptoManager.InitializationValues vals = - new CryptoManager.InitializationValues(dbdir, mPrefix, - mPrefix, "secmod.db"); - - CryptoManager.initialize(vals); - CryptoManager cm = CryptoManager.getInstance(); - CryptoToken token = cm.getInternalKeyStorageToken(); - Password pass = new Password(password.toCharArray()); - - token.login(pass); - KeyPairGenerator kg = token.getKeyPairGenerator(KeyPairAlgorithm.RSA); - kg.initialize(1024); - KeyPair pair = kg.genKeyPair(); - - // Add idPOPLinkWitness control - String secretValue = "testing"; - byte[] key1 = null; - byte[] finalDigest = null; - MessageDigest SHA1Digest = MessageDigest.getInstance("SHA1"); - key1 = SHA1Digest.digest(secretValue.getBytes()); - - /* seed */ - byte[] b = - { 0x10, 0x53, 0x42, 0x24, 0x1a, 0x2a, 0x35, 0x3c, - 0x7a, 0x52, 0x54, 0x56, 0x71, 0x65, 0x66, 0x4c, - 0x51, 0x34, 0x35, 0x23, 0x3c, 0x42, 0x43, 0x45, - 0x61, 0x4f, 0x6e, 0x43, 0x1e, 0x2a, 0x2b, 0x31, - 0x32, 0x34, 0x35, 0x36, 0x55, 0x51, 0x48, 0x14, - 0x16, 0x29, 0x41, 0x42, 0x43, 0x7b, 0x63, 0x44, - 0x6a, 0x12, 0x6b, 0x3c, 0x4c, 0x3f, 0x00, 0x14, - 0x51, 0x61, 0x15, 0x22, 0x23, 0x5f, 0x5e, 0x69 }; - - HMACDigest hmacDigest = new HMACDigest(SHA1Digest, key1); - hmacDigest.update(b); - finalDigest = hmacDigest.digest(); - - OCTET_STRING ostr = new OCTET_STRING(finalDigest); - Attribute attr = new Attribute(OBJECT_IDENTIFIER.id_cmc_idPOPLinkWitness, ostr); - - SET attributes = new SET(); - attributes.addElement(attr); - Name n = getJssName(subjectName); - SubjectPublicKeyInfo subjectPub = new SubjectPublicKeyInfo(pair.getPublic()); - CertificationRequestInfo certReqInfo = - new CertificationRequestInfo(new INTEGER(0), n, subjectPub, attributes); - CertificationRequest certRequest = new CertificationRequest(certReqInfo, - pair.getPrivate(), SignatureAlgorithm.RSASignatureWithMD5Digest); - - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - certRequest.encode(bos); - byte[] bb = bos.toByteArray(); - - String b64E = Utils.base64encode(bb); - - System.out.println(""); - System.out.println(b64E); - System.out.println(""); - - PrintStream ps = null; - ps = new PrintStream(new FileOutputStream(ofilename)); - ps.println(b64E); - ps.flush(); - ps.close(); - } catch (Exception e) { - } + String mPrefix = ""; + CryptoManager.InitializationValues vals = + new CryptoManager.InitializationValues(dbdir, mPrefix, + mPrefix, "secmod.db"); + + CryptoManager.initialize(vals); + CryptoManager cm = CryptoManager.getInstance(); + CryptoToken token = cm.getInternalKeyStorageToken(); + Password pass = new Password(password.toCharArray()); + + token.login(pass); + KeyPairGenerator kg = token.getKeyPairGenerator(KeyPairAlgorithm.RSA); + kg.initialize(1024); + KeyPair pair = kg.genKeyPair(); + + // Add idPOPLinkWitness control + String secretValue = "testing"; + byte[] key1 = null; + byte[] finalDigest = null; + MessageDigest SHA1Digest = MessageDigest.getInstance("SHA1"); + key1 = SHA1Digest.digest(secretValue.getBytes()); + + /* seed */ + byte[] b = + { 0x10, 0x53, 0x42, 0x24, 0x1a, 0x2a, 0x35, 0x3c, + 0x7a, 0x52, 0x54, 0x56, 0x71, 0x65, 0x66, 0x4c, + 0x51, 0x34, 0x35, 0x23, 0x3c, 0x42, 0x43, 0x45, + 0x61, 0x4f, 0x6e, 0x43, 0x1e, 0x2a, 0x2b, 0x31, + 0x32, 0x34, 0x35, 0x36, 0x55, 0x51, 0x48, 0x14, + 0x16, 0x29, 0x41, 0x42, 0x43, 0x7b, 0x63, 0x44, + 0x6a, 0x12, 0x6b, 0x3c, 0x4c, 0x3f, 0x00, 0x14, + 0x51, 0x61, 0x15, 0x22, 0x23, 0x5f, 0x5e, 0x69 }; + + HMACDigest hmacDigest = new HMACDigest(SHA1Digest, key1); + hmacDigest.update(b); + finalDigest = hmacDigest.digest(); + + OCTET_STRING ostr = new OCTET_STRING(finalDigest); + Attribute attr = new Attribute(OBJECT_IDENTIFIER.id_cmc_idPOPLinkWitness, ostr); + + SET attributes = new SET(); + attributes.addElement(attr); + Name n = getJssName(subjectName); + SubjectPublicKeyInfo subjectPub = new SubjectPublicKeyInfo(pair.getPublic()); + CertificationRequestInfo certReqInfo = + new CertificationRequestInfo(new INTEGER(0), n, subjectPub, attributes); + CertificationRequest certRequest = new CertificationRequest(certReqInfo, + pair.getPrivate(), SignatureAlgorithm.RSASignatureWithMD5Digest); + + ByteArrayOutputStream bos = new ByteArrayOutputStream(); + certRequest.encode(bos); + byte[] bb = bos.toByteArray(); + + String b64E = Utils.base64encode(bb); + + System.out.println(""); + System.out.println(b64E); + System.out.println(""); + + PrintStream ps = null; + ps = new PrintStream(new FileOutputStream(ofilename)); + ps.println(b64E); + ps.flush(); + ps.close(); + } static Name getJssName(String dn) { diff --git a/base/silent/src/com/netscape/pkisilent/common/ParseXML.java b/base/silent/src/com/netscape/pkisilent/common/ParseXML.java index 3e434498f..cee867740 100644 --- a/base/silent/src/com/netscape/pkisilent/common/ParseXML.java +++ b/base/silent/src/com/netscape/pkisilent/common/ParseXML.java @@ -113,6 +113,7 @@ public class ParseXML { writer.write(dom, output); } catch (Exception e) { + e.printStackTrace(); } } diff --git a/base/silent/src/com/netscape/pkisilent/http/HTMLDocument.java b/base/silent/src/com/netscape/pkisilent/http/HTMLDocument.java index 75610c15b..ac935674c 100644 --- a/base/silent/src/com/netscape/pkisilent/http/HTMLDocument.java +++ b/base/silent/src/com/netscape/pkisilent/http/HTMLDocument.java @@ -328,13 +328,10 @@ public class HTMLDocument { while (tokenizer.hasMoreTokens()) { token = tokenizer.nextToken(); if (token.equalsIgnoreCase("href")) { - try { - Matcher matcher = hrefPattern.matcher(tag); - lastURL = uriToURL(matcher.replaceAll("$1")); - if (lastURL != null) { - lastElementIsLink = true; - } - } catch (Exception e) { + Matcher matcher = hrefPattern.matcher(tag); + lastURL = uriToURL(matcher.replaceAll("$1")); + if (lastURL != null) { + lastElementIsLink = true; } break; } 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 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 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 -- cgit