diff options
author | Christina Fu <cfu@redhat.com> | 2015-07-08 17:45:59 -0700 |
---|---|---|
committer | Christina Fu <cfu@redhat.com> | 2015-07-13 18:21:22 -0700 |
commit | 8c9e59cfaff9ecda1483c07238ad0b58ea4f5f73 (patch) | |
tree | d1a10b6d2aae99744fa56f5acfee96b4015892d3 | |
parent | d48dbcb710bde0df445ab190fe4dc77c4fe3861d (diff) | |
download | pki-8c9e59cfaff9ecda1483c07238ad0b58ea4f5f73.tar.gz pki-8c9e59cfaff9ecda1483c07238ad0b58ea4f5f73.tar.xz pki-8c9e59cfaff9ecda1483c07238ad0b58ea4f5f73.zip |
ecc Console - 1. clean up the tabs in the JSSConnection constructor
-rw-r--r-- | base/console/src/com/netscape/admin/certsrv/connection/JSSConnection.java | 90 |
1 files changed, 45 insertions, 45 deletions
diff --git a/base/console/src/com/netscape/admin/certsrv/connection/JSSConnection.java b/base/console/src/com/netscape/admin/certsrv/connection/JSSConnection.java index a686a5af1..43d1c234b 100644 --- a/base/console/src/com/netscape/admin/certsrv/connection/JSSConnection.java +++ b/base/console/src/com/netscape/admin/certsrv/connection/JSSConnection.java @@ -55,24 +55,24 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac * variables *==========================================================*/ - /* static variables */ - static CryptoManager cryptoManager; - static CertificateFactory cf; - static SelectCertDialog selectCertDialog = null; - static PromptForTrustDialog promptForTrustDialog = null; - - /* private valiable */ - private InputStream httpIn; - private OutputStream httpOut; - private byte[] body; - private int bodyLen; - private String header; - private int available; - private int totalRead; - private boolean endOfHeader = false; - - private static int HTTP_OK_RESPONSE = 200; - private static final String PANELNAME = "SSLCLIENT"; + /* static variables */ + static CryptoManager cryptoManager; + static CertificateFactory cf; + static SelectCertDialog selectCertDialog = null; + static PromptForTrustDialog promptForTrustDialog = null; + + /* private valiable */ + private InputStream httpIn; + private OutputStream httpOut; + private byte[] body; + private int bodyLen; + private String header; + private int available; + private int totalRead; + private boolean endOfHeader = false; + + private static int HTTP_OK_RESPONSE = 200; + private static final String PANELNAME = "SSLCLIENT"; private boolean abort = false;; private boolean mClientAuth = false; private boolean mCertAccepted = true; @@ -81,46 +81,46 @@ public class JSSConnection implements IConnection, SSLCertificateApprovalCallbac private boolean mTokenPasswordInit = true; private boolean mTokenPasswdSame = true; - protected SSLSocket s = null; + protected SSLSocket s = null; - /*========================================================== - * constructors - *==========================================================*/ - public JSSConnection(String host, int port) - throws IOException, UnknownHostException { + /*========================================================== + * constructors + *==========================================================*/ + public JSSConnection(String host, int port) + throws IOException, UnknownHostException { - UtilConsoleGlobals.initJSS(); - cf = UtilConsoleGlobals.getX509CertificateFactory(); + UtilConsoleGlobals.initJSS(); + cf = UtilConsoleGlobals.getX509CertificateFactory(); try { cryptoManager = CryptoManager.getInstance(); } catch (Exception e) { } - org.mozilla.jss.ssl.SSLSocket.SSLVersionRange stream_range = - new org.mozilla.jss.ssl.SSLSocket.SSLVersionRange( - org.mozilla.jss.ssl.SSLSocket.SSLVersionRange.tls1_0, - org.mozilla.jss.ssl.SSLSocket.SSLVersionRange.tls1_2); + org.mozilla.jss.ssl.SSLSocket.SSLVersionRange stream_range = + new org.mozilla.jss.ssl.SSLSocket.SSLVersionRange( + org.mozilla.jss.ssl.SSLSocket.SSLVersionRange.tls1_0, + org.mozilla.jss.ssl.SSLSocket.SSLVersionRange.tls1_2); - SSLSocket.setSSLVersionRangeDefault( - org.mozilla.jss.ssl.SSLSocket.SSLProtocolVariant.STREAM, - stream_range); + SSLSocket.setSSLVersionRangeDefault( + org.mozilla.jss.ssl.SSLSocket.SSLProtocolVariant.STREAM, + stream_range); - org.mozilla.jss.ssl.SSLSocket.SSLVersionRange datagram_range = - new org.mozilla.jss.ssl.SSLSocket.SSLVersionRange( - org.mozilla.jss.ssl.SSLSocket.SSLVersionRange.tls1_1, - org.mozilla.jss.ssl.SSLSocket.SSLVersionRange.tls1_2); + org.mozilla.jss.ssl.SSLSocket.SSLVersionRange datagram_range = + new org.mozilla.jss.ssl.SSLSocket.SSLVersionRange( + org.mozilla.jss.ssl.SSLSocket.SSLVersionRange.tls1_1, + org.mozilla.jss.ssl.SSLSocket.SSLVersionRange.tls1_2); - SSLSocket.setSSLVersionRangeDefault( - org.mozilla.jss.ssl.SSLSocket.SSLProtocolVariant.DATA_GRAM, - datagram_range); - s = new SSLSocket(host, port, null, 0, this, this); + SSLSocket.setSSLVersionRangeDefault( + org.mozilla.jss.ssl.SSLSocket.SSLProtocolVariant.DATA_GRAM, + datagram_range); + s = new SSLSocket(host, port, null, 0, this, this); - // Initialze Http Input and Output Streams - httpIn = s.getInputStream(); - httpOut = s.getOutputStream(); + // Initialze Http Input and Output Streams + httpIn = s.getInputStream(); + httpOut = s.getOutputStream(); cryptoManager.setPasswordCallback(new pwcb()); Debug.println("JSSConnection Debug: end of JSSConnection constructor"); - } + } public boolean approve(org.mozilla.jss.crypto.X509Certificate serverCert, ValidityStatus status) |