changeset 1467:31922f65280b

Get rid of X509Factory class usage * netx/net/sourceforge/jnlp/security/CertificateUtils.java: removed import and usage of X509Factory (replaced by hardcoded string). Still better then reflection. * configure.ac: removed check for sun.security.provider.X509Factory
author Jiri Vanek <jvanek@redhat.com>
date Tue, 12 Sep 2017 09:56:48 +0200
parents b3564f5e62ff
children 0ef6f6c93476
files ChangeLog configure.ac netx/net/sourceforge/jnlp/security/CertificateUtils.java
diffstat 3 files changed, 9 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Sep 12 09:25:10 2017 +0200
+++ b/ChangeLog	Tue Sep 12 09:56:48 2017 +0200
@@ -1,3 +1,10 @@
+2017-09-12  Fridrich Strba  <fridrich.strba@suse.com>
+
+	Get rid of X509Factory class usage
+	* netx/net/sourceforge/jnlp/security/CertificateUtils.java: removed import and usage of
+	X509Factory (replaced by hardcoded string). Still better then reflection.
+	* configure.ac: removed check for sun.security.provider.X509Factory
+
 2017-09-12  Fridrich Strba  <fridrich.strba@suse.com>
 
 	Plugin made work again with jdk9
--- a/configure.ac	Tue Sep 12 09:25:10 2017 +0200
+++ b/configure.ac	Tue Sep 12 09:56:48 2017 +0200
@@ -95,7 +95,6 @@
 IT_CHECK_FOR_CLASS(JAVA_NET_HTTPCOOKIE, [java.net.HttpCookie], [some.pkg], [])
 IT_CHECK_FOR_CLASS(JAVA_NET_COOKIEHANDLER, [java.net.CookieHandler], [some.pkg], [])
 # in jdk9, those classes are using internal apis, must be enabled via module cheats
-IT_CHECK_FOR_CLASS(SUN_SECURITY_PROVIDER_X509FACTORY, [sun.security.provider.X509Factory], [some.pkg], [$JAVA_BASE])
 IT_CHECK_FOR_CLASS(SUN_SECURITY_UTIL_SECURITYCONSTANTS, [sun.security.util.SecurityConstants], [some.pkg], [$JAVA_BASE])
 IT_CHECK_FOR_CLASS(SUN_SECURITY_UTIL_HOSTNAMECHECKER, [sun.security.util.HostnameChecker], [some.pkg], [$JAVA_BASE])
 IT_CHECK_FOR_CLASS(SUN_SECURITY_X509_X500NAME, [sun.security.x509.X500Name], [some.pkg], [$JAVA_BASE])
--- a/netx/net/sourceforge/jnlp/security/CertificateUtils.java	Tue Sep 12 09:25:10 2017 +0200
+++ b/netx/net/sourceforge/jnlp/security/CertificateUtils.java	Tue Sep 12 09:56:48 2017 +0200
@@ -58,7 +58,6 @@
 import net.sourceforge.jnlp.runtime.Translator;
 import net.sourceforge.jnlp.util.logging.OutputController;
 import net.sourceforge.jnlp.util.replacements.BASE64Encoder;
-import sun.security.provider.X509Factory;
 
 /**
  * Common utilities to manipulate certificates. Provides methods to add
@@ -193,9 +192,9 @@
             CertificateException {
 
         BASE64Encoder encoder = new BASE64Encoder();
-        out.println(X509Factory.BEGIN_CERT);
+        out.println("-----BEGIN CERTIFICATE-----");
         encoder.encodeBuffer(cert.getEncoded(), out);
-        out.println(X509Factory.END_CERT);
+        out.println("-----END CERTIFICATE-----");
     }
 
     public static void dumpPKCS12(String alias, File file, KeyStore ks, char[] password)