Revert "Formatting"

This reverts commit 32150d3ee32f8ac27118af7c792794b538c78a2f.

1 files changed, 24 insertions, 14 deletions

diff --git a/pki/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java b/pki/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java
index b210ce7a2..ac7eb2ad9 100644
--- a/pki/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java
+++ b/pki/base/common/src/com/netscape/cmscore/security/SSLSelfSignedCert.java
@@ -17,6 +17,7 @@
 // --- END COPYRIGHT BLOCK ---
 package com.netscape.cmscore.security;
 
+
 import java.io.IOException;
 import java.security.KeyPair;
 
@@ -28,14 +29,16 @@ import com.netscape.certsrv.common.ConfigConstants;
 import com.netscape.certsrv.common.Constants;
 import com.netscape.certsrv.security.KeyCertData;
 
+
 /**
- * SSL server certificate
+ * SSL server certificate 
  * 
  * @author Christine Ho
  * @version $Revision$, $Date$
  */
 public class SSLSelfSignedCert extends CertificateInfo {
-    public static final String SUBJECT_NAME = "CN=SSL, O=Netscape Communications, C=US";
+    public static final String SUBJECT_NAME = 
+        "CN=SSL, O=Netscape Communications, C=US";
     private String mTokenname = Constants.PR_INTERNAL_TOKEN_NAME;
 
     public SSLSelfSignedCert(KeyCertData properties) {
@@ -46,7 +49,8 @@ public class SSLSelfSignedCert extends CertificateInfo {
         super(properties, pair);
         String tmp = (String) mProperties.get(Constants.PR_TOKEN_NAME);
 
-        if ((tmp != null) && (!tmp.equals(Constants.PR_INTERNAL_TOKEN)))
+        if ((tmp != null) && 
+            (!tmp.equals(Constants.PR_INTERNAL_TOKEN)))   
             mTokenname = tmp;
         mProperties.remove(Constants.PR_AKI);
 
@@ -75,8 +79,8 @@ public class SSLSelfSignedCert extends CertificateInfo {
 
     public String getNickname() {
         String name = (String) mProperties.get(Constants.PR_NICKNAME);
-        String instanceName = (String) mProperties
-                .get(ConfigConstants.PR_CERT_INSTANCE_NAME);
+        String instanceName =
+            (String) mProperties.get(ConfigConstants.PR_CERT_INSTANCE_NAME);
 
         if (name != null)
             return name;
@@ -84,14 +88,19 @@ public class SSLSelfSignedCert extends CertificateInfo {
     }
 
     /*
-     * public SignatureAlgorithm getSigningAlgorithm() { SignatureAlgorithm sAlg
-     * = (SignatureAlgorithm)mProperties.get(Constants.PR_SIGNATURE_ALGORITHM);
-     * if (sAlg != null) { return sAlg; } String alg =
-     * (String)mProperties.get(Constants.PR_KEY_TYPE);
-     * 
-     * if (alg.equals("RSA")) return
-     * SignatureAlgorithm.RSASignatureWithMD5Digest; else return
-     * SignatureAlgorithm.DSASignatureWithSHA1Digest; }
+     public SignatureAlgorithm getSigningAlgorithm() {
+     SignatureAlgorithm sAlg =
+     (SignatureAlgorithm)mProperties.get(Constants.PR_SIGNATURE_ALGORITHM);
+     if (sAlg != null) {
+     return sAlg;
+     }
+     String alg = (String)mProperties.get(Constants.PR_KEY_TYPE);
+     
+     if (alg.equals("RSA"))
+     return SignatureAlgorithm.RSASignatureWithMD5Digest;
+     else
+     return SignatureAlgorithm.DSASignatureWithSHA1Digest;
+     }
      */
 
     public String getKeyAlgorithm() {
@@ -105,8 +114,9 @@ public class SSLSelfSignedCert extends CertificateInfo {
         KeyUsageExtension extension = new KeyUsageExtension();
 
         extension.set(KeyUsageExtension.DIGITAL_SIGNATURE, new Boolean(true));
-        // extension.set(KeyUsageExtension.NON_REPUDIATION, new Boolean(true));
+        //extension.set(KeyUsageExtension.NON_REPUDIATION, new Boolean(true));
         extension.set(KeyUsageExtension.KEY_ENCIPHERMENT, new Boolean(true));
         return extension;
     }
 }
+