diff --git a/idm-console-framework.spec b/idm-console-framework.spec index bbc3108..378f394 100755 --- a/idm-console-framework.spec +++ b/idm-console-framework.spec @@ -36,7 +36,7 @@ BuildRequires: git BuildRequires: java-devel >= 1.8.0 BuildRequires: ant >= 1.6.2 -BuildRequires: jss >= 4.2.6-35 +BuildRequires: jss >= 4.5.0-0.6 BuildRequires: ldapjdk ################################################################################ @@ -45,7 +45,7 @@ BuildRequires: ldapjdk # Urge use of OpenJDK for runtime Requires: java >= 1.8.0 -Requires: jss >= 4.2.6-35 +Requires: jss >= 4.5.0-0.6 Requires: ldapjdk %description diff --git a/src/com/netscape/management/client/comm/HttpsChannel.java b/src/com/netscape/management/client/comm/HttpsChannel.java index 7a54360..22bc6f3 100644 --- a/src/com/netscape/management/client/comm/HttpsChannel.java +++ b/src/com/netscape/management/client/comm/HttpsChannel.java @@ -96,6 +96,7 @@ executing any jss code. JSS is also a provider (broken one) cf = UtilConsoleGlobals.getX509CertificateFactory(); cryptoManager = CryptoManager.getInstance(); } catch (Exception e) { + e.printStackTrace(); } } @@ -407,13 +408,13 @@ private int getSSLVersionRangeEnum (String rangeString) { if (rangeString == null) return -1; if (rangeString.equalsIgnoreCase("ssl3")) - return org.mozilla.jss.ssl.SSLSocket.SSLVersionRange.ssl3; + return org.mozilla.jss.ssl.SSLVersionRange.ssl3; else if (rangeString.equalsIgnoreCase("tls1.0")) - return org.mozilla.jss.ssl.SSLSocket.SSLVersionRange.tls1_0; + return org.mozilla.jss.ssl.SSLVersionRange.tls1_0; else if (rangeString.equalsIgnoreCase("tls1.1")) - return org.mozilla.jss.ssl.SSLSocket.SSLVersionRange.tls1_1; + return org.mozilla.jss.ssl.SSLVersionRange.tls1_1; else if (rangeString.equalsIgnoreCase("tls1.2")) - return org.mozilla.jss.ssl.SSLSocket.SSLVersionRange.tls1_2; + return org.mozilla.jss.ssl.SSLVersionRange.tls1_2; return -1; } @@ -424,8 +425,8 @@ public void open(Preferences pref) throws IOException { nthPrompt = 0; // Set our defaults - int min = org.mozilla.jss.ssl.SSLSocket.SSLVersionRange.tls1_0; - int max = org.mozilla.jss.ssl.SSLSocket.SSLVersionRange.tls1_2; + int min = org.mozilla.jss.ssl.SSLVersionRange.tls1_0; + int max = org.mozilla.jss.ssl.SSLVersionRange.tls1_2; Debug.println("CREATE JSS SSLSocket"); @@ -441,10 +442,10 @@ public void open(Preferences pref) throws IOException { } } - org.mozilla.jss.ssl.SSLSocket.SSLVersionRange range = - new org.mozilla.jss.ssl.SSLSocket.SSLVersionRange(min, max); + org.mozilla.jss.ssl.SSLVersionRange range = + new org.mozilla.jss.ssl.SSLVersionRange(min, max); - SSLSocket.setSSLVersionRangeDefault(org.mozilla.jss.ssl.SSLSocket.SSLProtocolVariant.STREAM, range); + SSLSocket.setSSLVersionRangeDefault(org.mozilla.jss.ssl.SSLProtocolVariant.STREAM, range); socket = new SSLSocket(InetAddress.getByName(getHost()), getPort(), null, 0, true, this, diff --git a/src/com/netscape/management/client/util/UtilConsoleGlobals.java b/src/com/netscape/management/client/util/UtilConsoleGlobals.java index 5b5419a..5d989b6 100644 --- a/src/com/netscape/management/client/util/UtilConsoleGlobals.java +++ b/src/com/netscape/management/client/util/UtilConsoleGlobals.java @@ -128,20 +128,12 @@ executing any jss code. JSS is also a provider (broken one) CryptoManager.initialize(homePath); } catch (AlreadyInitializedException initialized) {} - - } catch (Exception e) {} - try { - if (Debug.isTraceTypeEnabled(Debug.TYPE_JSS)) { - org.mozilla.jss.util.Debug.setLevel(org.mozilla.jss.util.Debug.VERBOSE); - } - else { - //604378 Must explicitely disable JSS Debug, as by default the - // JSS Debug level is set to Debug.ERROR. - org.mozilla.jss.util.Debug.setLevel(org.mozilla.jss.util.Debug.QUIET); - } + } catch (RuntimeException e) { + throw e; + } catch (Exception e) { - Debug.println(0 , "Error jss.util.Debug.setLevel " + e); + throw new RuntimeException(e); } }