From 7c7b9d023cd466c1771068badc020dab36beb553 Mon Sep 17 00:00:00 2001 From: Endi Sukma Dewata Date: Thu, 5 Apr 2012 14:49:11 -0500 Subject: Removed whitespaces from Java code. Whitespaces in Java code have been removed with the following command: find . -not -path .git -name *.java -exec sed -i 's/[[:blank:]]\+$//' {} \; Ticket #134 --- base/kra/src/com/netscape/kra/EncryptionUnit.java | 2 +- .../src/com/netscape/kra/EnrollmentService.java | 30 +++---- base/kra/src/com/netscape/kra/KRANotify.java | 2 +- base/kra/src/com/netscape/kra/KRAPolicy.java | 4 +- base/kra/src/com/netscape/kra/KRAService.java | 4 +- .../src/com/netscape/kra/KeyRecoveryAuthority.java | 98 +++++++++++----------- .../src/com/netscape/kra/NetkeyKeygenService.java | 12 +-- base/kra/src/com/netscape/kra/RecoveryService.java | 8 +- base/kra/src/com/netscape/kra/StorageKeyUnit.java | 2 +- .../com/netscape/kra/TokenKeyRecoveryService.java | 10 +-- .../kra/src/com/netscape/kra/TransportKeyUnit.java | 4 +- 11 files changed, 88 insertions(+), 88 deletions(-) (limited to 'base/kra/src') diff --git a/base/kra/src/com/netscape/kra/EncryptionUnit.java b/base/kra/src/com/netscape/kra/EncryptionUnit.java index 1d06fd2d5..7d67a7b12 100644 --- a/base/kra/src/com/netscape/kra/EncryptionUnit.java +++ b/base/kra/src/com/netscape/kra/EncryptionUnit.java @@ -50,7 +50,7 @@ import com.netscape.cmscore.util.Debug; /** * A class represents the transport key pair. This key pair * is used to protected EE's private key in transit. - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/kra/src/com/netscape/kra/EnrollmentService.java b/base/kra/src/com/netscape/kra/EnrollmentService.java index c65a6ea62..1b6ffcebd 100644 --- a/base/kra/src/com/netscape/kra/EnrollmentService.java +++ b/base/kra/src/com/netscape/kra/EnrollmentService.java @@ -87,7 +87,7 @@ import com.netscape.cmsutil.util.Utils; * Upon processing, the incoming user key is unwrapped with the transport key of KRA, and then wrapped with the storage * key. The encrypted key is stored in the internal database for long term storage. *

- * + * * @author thomask (original) * @author cfu (non-RSA keys; private keys secure handling); * @version $Revision$, $Date$ @@ -100,7 +100,7 @@ public class EnrollmentService implements IService { public final static String ATTR_PROOF_OF_ARCHIVAL = "proofOfArchival"; - // private + // private private IKeyRecoveryAuthority mKRA = null; private ITransportKeyUnit mTransportUnit = null; private IStorageKeyUnit mStorageUnit = null; @@ -119,7 +119,7 @@ public class EnrollmentService implements IService { /** * Constructs request processor. *

- * + * * @param kra key recovery authority */ public EnrollmentService(IKeyRecoveryAuthority kra) { @@ -144,7 +144,7 @@ public class EnrollmentService implements IService { /** * Services an enrollment/archival request. *

- * + * * @param request enrollment request * @return serving successful or not * @exception EBaseException failed to serve @@ -650,7 +650,7 @@ public class EnrollmentService implements IService { /** * Retrieves PKIArchiveOptions from CRMF request. - * + * * @param crmfBlob CRMF request * @return PKIArchiveOptions * @exception EBaseException failed to extrace option @@ -732,7 +732,7 @@ public class EnrollmentService implements IService { /** * Retrieves public key from request. - * + * * @param request CRMF request * @return JSS public key * @exception EBaseException failed to retrieve public key @@ -791,7 +791,7 @@ public class EnrollmentService implements IService { /** * Retrieves key's owner name from request. - * + * * @param request CRMF request * @return owner name (subject name) * @exception EBaseException failed to retrieve public key @@ -834,11 +834,11 @@ public class EnrollmentService implements IService { /** * Signed Audit Log Public Key - * + * * This method is called to obtain the public key from the passed in * "KeyRecord" for a signed audit log message. *

- * + * * @param rec a Key Record * @return key string containing the certificate's public key */ @@ -886,11 +886,11 @@ public class EnrollmentService implements IService { /** * Signed Audit Log Subject ID - * + * * This method is called to obtain the "SubjectID" for * a signed audit log message. *

- * + * * @return id string containing the signed audit log message SubjectID */ @@ -923,11 +923,11 @@ public class EnrollmentService implements IService { /** * Signed Audit Log Requester ID - * + * * This method is called to obtain the "RequesterID" for * a signed audit log message. *

- * + * * @return id string containing the signed audit log message RequesterID */ private String auditRequesterID() { @@ -959,10 +959,10 @@ public class EnrollmentService implements IService { /** * Signed Audit Log - * + * * This method is called to store messages to the signed audit log. *

- * + * * @param msg signed audit log message */ private void audit(String msg) { diff --git a/base/kra/src/com/netscape/kra/KRANotify.java b/base/kra/src/com/netscape/kra/KRANotify.java index 29eaf477a..ccf8e664f 100644 --- a/base/kra/src/com/netscape/kra/KRANotify.java +++ b/base/kra/src/com/netscape/kra/KRANotify.java @@ -24,7 +24,7 @@ import com.netscape.certsrv.request.ARequestNotifier; * A class represents a KRA request queue notify. This * object will be invoked by the request subsystem * when a request is requested for processing. - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/kra/src/com/netscape/kra/KRAPolicy.java b/base/kra/src/com/netscape/kra/KRAPolicy.java index aa2b2c2de..eac3adb8c 100644 --- a/base/kra/src/com/netscape/kra/KRAPolicy.java +++ b/base/kra/src/com/netscape/kra/KRAPolicy.java @@ -31,7 +31,7 @@ import com.netscape.cmscore.util.Debug; /** * KRA Policy. - * + * * @deprecated * @version $Revision$, $Date$ */ @@ -55,7 +55,7 @@ public class KRAPolicy implements IPolicy { return mPolicies; } - /** + /** */ public PolicyResult apply(IRequest r) { if (Debug.ON) diff --git a/base/kra/src/com/netscape/kra/KRAService.java b/base/kra/src/com/netscape/kra/KRAService.java index 4858e286a..987d17b6b 100644 --- a/base/kra/src/com/netscape/kra/KRAService.java +++ b/base/kra/src/com/netscape/kra/KRAService.java @@ -35,7 +35,7 @@ import com.netscape.cmscore.util.Debug; * services. This service registration allows us to support * new request easier. *

- * + * * @author thomask * @version $Revision$, $Date$ */ @@ -70,7 +70,7 @@ public class KRAService implements IService { /** * Processes a KRA request. This method is invoked by * request subsystem. - * + * * @param r request from request subsystem * @exception EBaseException failed to serve */ diff --git a/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java b/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java index 8d8cafb84..41b5fdae8 100644 --- a/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java +++ b/base/kra/src/com/netscape/kra/KeyRecoveryAuthority.java @@ -79,7 +79,7 @@ import com.netscape.cmscore.request.RequestSubsystem; * escrowed. It provides archive and recovery key pairs * functionalities. *

- * + * * @author thomask * @version $Revision$, $Date$ */ @@ -161,7 +161,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Retrieves subsystem identifier. - * + * * @return subsystem id */ public String getId() { @@ -170,7 +170,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Sets subsystem identifier. - * + * * @param id subsystem id * @exception EBaseException failed to set id */ @@ -255,7 +255,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove * necessary components. This subsystem is started by * KRASubsystem. *

- * + * * @param owner owner of this subsystem * @param config configuration store for this subsystem * @exception EBaseException failed to start subsystem @@ -428,7 +428,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Starts this service. When this method is called, all * service - * + * * @exception EBaseException failed to startup this subsystem */ public void startup() throws EBaseException { @@ -471,7 +471,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Retrieves the configuration store of this subsystem. *

- * + * * @return configuration store */ public IConfigStore getConfigStore() { @@ -480,7 +480,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Changes the auto recovery state. - * + * * @param cs list of recovery agent credentials * @param on turn of auto recovery or not * @return operation success or not @@ -501,7 +501,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Retrieves the current auto recovery state. - * + * * @return enable or not */ public boolean getAutoRecoveryState() { @@ -512,7 +512,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Returns a list of users who are in auto * recovery mode. - * + * * @return list of user IDs that are accepted in the * auto recovery mode */ @@ -522,7 +522,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Adds auto recovery mode to the given user id. - * + * * @param id new identifier to the auto recovery mode * @param creds list of credentials */ @@ -532,7 +532,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Removes auto recovery mode from the given user id. - * + * * @param id id of user to be removed from auto * recovery mode */ @@ -542,7 +542,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Retrieves logger from escrow authority. - * + * * @return logger */ public ILogger getLogger() { @@ -552,7 +552,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Retrieves number of required agents for * recovery operation. - * + * * @return number of required agents * @exception EBaseException failed to retrieve info */ @@ -572,7 +572,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Sets number of required agents for * recovery operation - * + * * @return none * @exception EBaseException invalid setting */ @@ -727,14 +727,14 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove * Archives key. This creates a key record in the key * repository. *

- * + * *

- * + * * @param rec key record to be archived * @return executed request * @exception EBaseException failed to archive key @@ -975,14 +975,14 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove * Recovers key for administrators. This method is * invoked by the agent operation of the key recovery servlet. *

- * + * *

- * + * * @param kid key identifier * @param creds list of recovery agent credentials * @param password password of the PKCS12 package @@ -1114,14 +1114,14 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove * Async Recovers key for administrators. This method is * invoked by the agent operation of the key recovery servlet. *

- * + * *

- * + * * @param requestID request id * @param password password of the PKCS12 package * subsystem @@ -1208,7 +1208,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Constructs a recovery request and submits it * to the request subsystem for processing. - * + * * @param kid key identifier * @param creds list of recovery agent credentials * @param password password of the PKCS12 package @@ -1234,7 +1234,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Recovers key for end-entities. - * + * * @param creds list of credentials * @param encryptionChain certificate chain * @param signingCert signing cert @@ -1281,7 +1281,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove * Retrieves the storage key unit. The storage key * is used to wrap the user key for long term * storage. - * + * * @return storage key unit. */ public IStorageKeyUnit getStorageKeyUnit() { @@ -1290,7 +1290,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Retrieves the transport key unit. - * + * * @return transport key unit */ public ITransportKeyUnit getTransportKeyUnit() { @@ -1300,7 +1300,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Returns the name of this subsystem. This name is * extracted from the transport certificate. - * + * * @return KRA name */ public X500Name getX500Name() { @@ -1314,7 +1314,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Returns the nickname for the id cert of this * subsystem. - * + * * @return nickname of the transport certificate */ public String getNickname() { @@ -1347,7 +1347,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Retrieves KRA request repository. *

- * + * * @return request repository */ public IRequestQueue getRequestQueue() { @@ -1366,7 +1366,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Retrieves replica repository. *

- * + * * @return replica repository */ public IReplicaIDRepository getReplicaRepository() { @@ -1376,7 +1376,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Retrieves the DN of this escrow authority. *

- * + * * @return distinguished name */ protected String getDN() { @@ -1392,7 +1392,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Logs an event. - * + * * @param level log level * @param msg message to log */ @@ -1403,7 +1403,7 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Registers a request listener. - * + * * @param l request listener */ public void registerRequestListener(IRequestListener l) { @@ -1469,13 +1469,13 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove radn = new X500Name(raname); } } catch (IOException e) { - mLogger.log(ILogger.EV_SYSTEM, ILogger.S_KRA, - ILogger.LL_FAILURE, + mLogger.log(ILogger.EV_SYSTEM, ILogger.S_KRA, + ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_KRA_INVALID_RA_NAME", raname, e.toString())); } catch (EBaseException e) { // ignore - set to null. - mLogger.log(ILogger.EV_SYSTEM, ILogger.S_KRA, - ILogger.LL_FAILURE, + mLogger.log(ILogger.EV_SYSTEM, ILogger.S_KRA, + ILogger.LL_FAILURE, CMS.getLogMessage("CMSCORE_KRA_INVALID_RA_SETUP", e.toString())); } return new X500Name[] { radn }; @@ -1513,10 +1513,10 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Signed Audit Log - * + * * This method is called to store messages to the signed audit log. *

- * + * * @param msg signed audit log message */ private void audit(String msg) { @@ -1536,11 +1536,11 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Signed Audit Log Subject ID - * + * * This method is called to obtain the "SubjectID" for * a signed audit log message. *

- * + * * @return id string containing the signed audit log message SubjectID */ private String auditSubjectID() { @@ -1572,11 +1572,11 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Signed Audit Log Requester ID - * + * * This method is called to obtain the "RequesterID" for * a signed audit log message. *

- * + * * @return id string containing the signed audit log message RequesterID */ private String auditRequesterID() { @@ -1608,11 +1608,11 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Signed Audit Log Recovery ID - * + * * This method is called to obtain the "RecoveryID" for * a signed audit log message. *

- * + * * @return id string containing the signed audit log message RecoveryID */ private String auditRecoveryID() { @@ -1644,11 +1644,11 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Signed Audit Log Public Key - * + * * This method is called to obtain the public key from the passed in * "X509Certificate" for a signed audit log message. *

- * + * * @param cert an X509Certificate * @return key string containing the certificate's public key */ @@ -1684,11 +1684,11 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Signed Audit Log Public Key - * + * * This method is called to obtain the public key from the passed in * "KeyRecord" for a signed audit log message. *

- * + * * @param rec a Key Record * @return key string containing the certificate's public key */ @@ -1741,11 +1741,11 @@ public class KeyRecoveryAuthority implements IAuthority, IKeyService, IKeyRecove /** * Signed Audit Agents - * + * * This method is called to extract agent uids from the passed in * "Credentials[]" and return a string of comma-separated agent uids. *

- * + * * @param creds array of credentials * @return a comma-separated string of agent uids */ diff --git a/base/kra/src/com/netscape/kra/NetkeyKeygenService.java b/base/kra/src/com/netscape/kra/NetkeyKeygenService.java index ecce2eaa9..017538bd5 100644 --- a/base/kra/src/com/netscape/kra/NetkeyKeygenService.java +++ b/base/kra/src/com/netscape/kra/NetkeyKeygenService.java @@ -76,7 +76,7 @@ import com.netscape.cmscore.util.Debug; * the caller (netkey RA) ...netkey RA should already has kek-wrapped * des key from the TKS. They are to be sent together back to * the token. - * + * * @author Christina Fu (cfu) * @version $Revision$, $Date$ */ @@ -86,7 +86,7 @@ public class NetkeyKeygenService implements IService { public final static String ATTR_PROOF_OF_ARCHIVAL = "proofOfArchival"; - // private + // private private final static String LOGGING_SIGNED_AUDIT_PRIVATE_KEY_ARCHIVE_REQUEST = "LOGGING_SIGNED_AUDIT_PRIVATE_KEY_ARCHIVE_REQUEST_4"; private final static String LOGGING_SIGNED_AUDIT_PRIVATE_KEY_ARCHIVE_REQUEST_PROCESSED = @@ -110,7 +110,7 @@ public class NetkeyKeygenService implements IService { /** * Constructs request processor. *

- * + * * @param kra key recovery authority */ public NetkeyKeygenService(IKeyRecoveryAuthority kra) { @@ -219,7 +219,7 @@ public class NetkeyKeygenService implements IService { // 602548 NSS bug - to overcome it, we use isBadDSAKeyPair kp = kpGen.genKeyPair(); } - while (isBadDSAKeyPair(kp)); + while (isBadDSAKeyPair(kp)); */ return kp; } @@ -292,7 +292,7 @@ public class NetkeyKeygenService implements IService { /** * Services an archival request from netkey. *

- * + * * @param request enrollment request * @return serving successful or not * @exception EBaseException failed to serve @@ -588,7 +588,7 @@ public class NetkeyKeygenService implements IService { * y * This method is called to store messages to the signed audit log. *

- * + * * @param msg signed audit log message */ private void audit(String msg) { diff --git a/base/kra/src/com/netscape/kra/RecoveryService.java b/base/kra/src/com/netscape/kra/RecoveryService.java index 0cbe2009f..80f2fc711 100644 --- a/base/kra/src/com/netscape/kra/RecoveryService.java +++ b/base/kra/src/com/netscape/kra/RecoveryService.java @@ -77,7 +77,7 @@ import com.netscape.cmscore.util.Debug; * Administrator recovery will create a PKCS12 file where stores the certificate and the recovered key. *

* End Entity recovery will send RA or CA a response where stores the recovered key. - * + * * @author thomask (original) * @author cfu (non-RSA keys; private keys secure handling); * @version $Revision$, $Date$ @@ -122,7 +122,7 @@ public class RecoveryService implements IService { * (either Administrator or End-Entity), the method reads * the key record from the database, and tried to recover the * key with the storage key unit. - * + * * @param request recovery request * @return operation success or not * @exception EBaseException failed to serve @@ -433,7 +433,7 @@ public class RecoveryService implements IService { /** * Creates a PFX (PKCS12) file. (the unwrapping/wrapping way) * - used when allowEncDecrypt_recovery is false - * + * * @param request CRMF recovery request * @param priKey private key handle * @exception EBaseException failed to create P12 file @@ -558,7 +558,7 @@ public class RecoveryService implements IService { /** * Creates a PFX (PKCS12) file. * - used when allowEncDecrypt_recovery is true - * + * * @param request CRMF recovery request * @param priData decrypted private key (PrivateKeyInfo) * @exception EBaseException failed to create P12 file diff --git a/base/kra/src/com/netscape/kra/StorageKeyUnit.java b/base/kra/src/com/netscape/kra/StorageKeyUnit.java index c956bf8d8..510e2f328 100644 --- a/base/kra/src/com/netscape/kra/StorageKeyUnit.java +++ b/base/kra/src/com/netscape/kra/StorageKeyUnit.java @@ -66,7 +66,7 @@ import com.netscape.cmsutil.util.Utils; * A class represents a storage key unit. Currently, this * is implemented with cryptix, the final implementation * should be built on JSS/HCL. - * + * * @author thomask * @version $Revision$, $Date$ */ diff --git a/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java b/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java index 7575ea9f4..298988360 100644 --- a/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java +++ b/base/kra/src/com/netscape/kra/TokenKeyRecoveryService.java @@ -53,7 +53,7 @@ import com.netscape.cmsutil.util.Cert; /** * A class represents recovery request processor. - * + * * @author Christina Fu (cfu) * @version $Revision$, $Date$ */ @@ -99,7 +99,7 @@ public class TokenKeyRecoveryService implements IService { /** * Process the HTTP request. - * + * * @param s The URL to decode */ protected String URLdecode(String s) { @@ -189,7 +189,7 @@ public class TokenKeyRecoveryService implements IService { * - cuid may be used for additional validation check * - userid may be used for additional validation check * - wrappedDesKey is used for wrapping recovered private key - * + * * @param request recovery request * @return operation success or not * @exception EBaseException failed to serve @@ -320,7 +320,7 @@ public class TokenKeyRecoveryService implements IService { try { /* - CryptoToken internalToken = + CryptoToken internalToken = CryptoManager.getInstance().getInternalKeyStorageToken(); */ CryptoToken token = mStorageUnit.getToken(); @@ -606,7 +606,7 @@ public class TokenKeyRecoveryService implements IService { * y * This method is called to store messages to the signed audit log. *

- * + * * @param msg signed audit log message */ private void audit(String msg) { diff --git a/base/kra/src/com/netscape/kra/TransportKeyUnit.java b/base/kra/src/com/netscape/kra/TransportKeyUnit.java index 90ac2120f..e2077212a 100644 --- a/base/kra/src/com/netscape/kra/TransportKeyUnit.java +++ b/base/kra/src/com/netscape/kra/TransportKeyUnit.java @@ -37,7 +37,7 @@ import com.netscape.cmsutil.util.Cert; /** * A class represents the transport key pair. This key pair * is used to protected EE's private key in transit. - * + * * @author thomask * @version $Revision$, $Date$ */ @@ -113,7 +113,7 @@ public class TransportKeyUnit extends EncryptionUnit implements public CryptoToken getToken() { // 390148: returning the token that owns the private - // key. + // key. return getPrivateKey().getOwningToken(); } -- cgit