Merge pull request #6629 from tevans78/revertPKCS

Revert PR #6611 and PR # 5241 - Issue5019-Java11DefaultToPKCS12

Author: tevans78

dev/com.ibm.ws.config_fat/fat/src/test/server/config/FATSuite.java

@@ -26,7 +26,7 @@
                 VariableMergeTests.class,
                 MetatypeProviderTest.class,
                 WSConfigurationHelperTest.class,
-                //SchemaGeneratorMBeanTest.class,
+                SchemaGeneratorMBeanTest.class,
                 FeaturelistGeneratorMBeanTest.class,
                 ServerXMLConfigurationMBeanTest.class,
                 DropinsTest.class,

dev/com.ibm.ws.config_fat/fat/src/test/server/config/SchemaGeneratorMBeanTest.java

@@ -91,7 +91,7 @@ public static void setUp() throws Exception {
                       server.waitForStringInLog("CWWKO0219I.*ssl"));
 
         // Set up the trust store
-        System.setProperty("javax.net.ssl.trustStore", outputDir + "/resources/security/key.p12");
+        System.setProperty("javax.net.ssl.trustStore", outputDir + "/resources/security/key.jks");
         System.setProperty("javax.net.ssl.trustStorePassword", "Liberty");
 
         Map<String, Object> environment = new HashMap<String, Object>();

dev/com.ibm.ws.crypto.certificateutil/README

@@ -10,7 +10,7 @@ $ keytool -genkey -keystore myKS -storepass WebAS0 -keypass WebAS0 -validity 365
 # To view the contents of the created keystore:
 $ keytool -list -v -keystore myKS -storepass WebAS0
 
-Keystore type: pkcs12
+Keystore type: jks
 Keystore provider: IBMJCE
 
 Your keystore contains 1 entry

dev/com.ibm.ws.crypto.certificateutil/src/com/ibm/ws/crypto/certificateutil/DefaultSSLCertificateCreator.java

@@ -39,7 +39,7 @@ public interface DefaultSSLCertificateCreator {
     static final int DEFAULT_SIZE = 2048;
     static final String KEYALG = KEYALG_RSA_TYPE;
     static final String SIGALG = "SHA256withRSA";
-    static final String DEFAULT_KEYSTORE_TYPE = "PKCS12";
+    static final String DEFAULT_KEYSTORE_TYPE = "JKS";
 
     /**
      * These constants are not intended to be specified by the caller,
@@ -86,7 +86,7 @@ public interface DefaultSSLCertificateCreator {
     /**
      * Creates a default SSL certificate.
      *
-     * @param filePath The valid, complete path on the file system of the keystore to create. e.g. /tmp/key.p12
+     * @param filePath The valid, complete path on the file system of the keystore to create. e.g. /tmp/key.jks
      * @param password Minimum 6 characters
      * @param validity Minimum 365 days (?)
      * @param subjectDN The subjectDN. Use {@link DefaultSubjectDN} to construct the default value.

dev/com.ibm.ws.crypto.certificateutil/src/com/ibm/ws/crypto/certificateutil/keytool/KeytoolCommand.java

@@ -45,7 +45,6 @@ class KeytoolCommand {
      * @param ksType
      */
     KeytoolCommand(String filePath, String password, int validity, String subjectDN, int keySize, String keyType, String sigAlg, String ksType) {
-
         cmd = new ArrayList<String>();
         cmd.add(getAbsoluteKeytoolPath());
         cmd.add("-genkey");

dev/com.ibm.ws.crypto.certificateutil/src/com/ibm/ws/crypto/certificateutil/keytool/KeytoolSSLCertificateCreator.java

@@ -28,23 +28,11 @@ public class KeytoolSSLCertificateCreator implements DefaultSSLCertificateCreato
     @Override
     public File createDefaultSSLCertificate(String filePath, String password, int validity, String subjectDN, int keySize, String sigAlg) throws CertificateException {
 
-        String setKeyStoreType = null;
-        KeytoolCommand keytoolCmd = null;
-
         validateParameters(filePath, password, validity, subjectDN, keySize, sigAlg);
 
         String keyType = getKeyFromSigAlg(sigAlg);
 
-        if (filePath.lastIndexOf(".") != -1) {
-            setKeyStoreType = filePath.substring(filePath.lastIndexOf(".") + 1, filePath.length());
-        }
-
-        if (!setKeyStoreType.equals("p12") && (!setKeyStoreType.equals(DEFAULT_KEYSTORE_TYPE))) {
-            keytoolCmd = new KeytoolCommand(filePath, password, validity, subjectDN, keySize, keyType, sigAlg, setKeyStoreType);
-        } else {
-            keytoolCmd = new KeytoolCommand(filePath, password, validity, subjectDN, keySize, keyType, sigAlg, DEFAULT_KEYSTORE_TYPE);
-        }
-
+        KeytoolCommand keytoolCmd = new KeytoolCommand(filePath, password, validity, subjectDN, keySize, keyType, sigAlg, DEFAULT_KEYSTORE_TYPE);
         keytoolCmd.executeCommand();
         File f = new File(filePath);
         if (f.exists()) {

dev/com.ibm.ws.crypto.certificateutil/test/com/ibm/ws/crypto/certificateutil/keytool/KeytoolCommandTest.java

@@ -41,7 +41,7 @@ public class KeytoolCommandTest {
 
     @Test
     public void getCommand_justArguments() {
-        KeytoolCommand cmd = new KeytoolCommand("myLoc", "myPwd", 365, "CN=myName", 2048, "RSA", "SHA256withRSA", "PKCS12");
+        KeytoolCommand cmd = new KeytoolCommand("myLoc", "myPwd", 365, "CN=myName", 2048, "RSA", "SHA256withRSA", "JKS");
         List<String> cmdArgs = cmd.getCommandArgs();
         assertEquals("-genkey", cmdArgs.get(1));
         assertEquals("-keystore", cmdArgs.get(2));
@@ -66,7 +66,7 @@ public void getCommand_justArguments() {
 
     @Test
     public void getAbsoluteKeytoolPath() {
-        KeytoolCommand cmd = new KeytoolCommand("myLoc", "myPwd", 365, "CN=myName", 2048, "RSA", "SHA256withRSA", "PKCS12");
+        KeytoolCommand cmd = new KeytoolCommand("myLoc", "myPwd", 365, "CN=myName", 2048, "RSA", "SHA256withRSA", "JKS");
         String path = cmd.getAbsoluteKeytoolPath();
         assertTrue("keytool path does not start with this JVM's java.home directory",
                    path.startsWith(System.getProperty("java.home")));
@@ -88,7 +88,7 @@ public void getAbsoluteKeytoolPath() {
      */
     @Test
     public void test_toString() {
-        KeytoolCommand cmd = new KeytoolCommand("myLoc", "myPwd", 365, "CN=myName", 2048, "RSA", "SHA256withRSA", "PKCS12");
+        KeytoolCommand cmd = new KeytoolCommand("myLoc", "myPwd", 365, "CN=myName", 2048, "RSA", "SHA256withRSA", "JKS");
         assertFalse("The command line contained the password in plain text",
                     cmd.toString().contains("myPwd"));
 
@@ -135,7 +135,7 @@ public void test_toString() {
         cmdArgs.append(" ");
         cmdArgs.append("-storetype");
         cmdArgs.append(" ");
-        cmdArgs.append("PKCS12");
+        cmdArgs.append("JKS");
         assertEquals("The command line was not in the format expected",
                      cmdArgs.toString(),
                      cmd.toString());
@@ -152,7 +152,7 @@ public void getProcErrorOutput_readOnceEOF() throws Exception {
                 will(returnValue(-1));
             }
         });
-        KeytoolCommand cmd = new KeytoolCommand("myLoc", "myPwd", 365, "CN=myName", 2048, "RSA", "SHA256withRSA", "PKCS12");
+        KeytoolCommand cmd = new KeytoolCommand("myLoc", "myPwd", 365, "CN=myName", 2048, "RSA", "SHA256withRSA", "JKS");
         cmd.getProcErrorOutput(proc);
 
         mock.assertIsSatisfied();
@@ -169,7 +169,7 @@ public void getProcErrorOutput_readOnceEmpty() throws Exception {
                 will(returnValue(0));
             }
         });
-        KeytoolCommand cmd = new KeytoolCommand("myLoc", "myPwd", 365, "CN=myName", 2048, "RSA", "SHA256withRSA", "PKCS12");
+        KeytoolCommand cmd = new KeytoolCommand("myLoc", "myPwd", 365, "CN=myName", 2048, "RSA", "SHA256withRSA", "JKS");
         cmd.getProcErrorOutput(proc);
 
         mock.assertIsSatisfied();
@@ -186,7 +186,7 @@ public void getProcErrorOutput_readOnce() throws Exception {
                 will(returnValue(50));
             }
         });
-        KeytoolCommand cmd = new KeytoolCommand("myLoc", "myPwd", 365, "CN=myName", 2048, "RSA", "SHA256withRSA", "PKCS12");
+        KeytoolCommand cmd = new KeytoolCommand("myLoc", "myPwd", 365, "CN=myName", 2048, "RSA", "SHA256withRSA", "JKS");
         cmd.getProcErrorOutput(proc);
 
         mock.assertIsSatisfied();
@@ -206,7 +206,7 @@ public void getProcErrorOutput_readOnceFull() throws Exception {
                 will(returnValue(-1));
             }
         });
-        KeytoolCommand cmd = new KeytoolCommand("myLoc", "myPwd", 365, "CN=myName", 2048, "RSA", "SHA256withRSA", "PKCS12");
+        KeytoolCommand cmd = new KeytoolCommand("myLoc", "myPwd", 365, "CN=myName", 2048, "RSA", "SHA256withRSA", "JKS");
         cmd.getProcErrorOutput(proc);
 
         mock.assertIsSatisfied();
@@ -226,7 +226,7 @@ public void getProcErrorOutput_readTwice() throws Exception {
                 will(returnValue(50));
             }
         });
-        KeytoolCommand cmd = new KeytoolCommand("myLoc", "myPwd", 365, "CN=myName", 2048, "RSA", "SHA256withRSA", "PKCS12");
+        KeytoolCommand cmd = new KeytoolCommand("myLoc", "myPwd", 365, "CN=myName", 2048, "RSA", "SHA256withRSA", "JKS");
         cmd.getProcErrorOutput(proc);
 
         mock.assertIsSatisfied();
@@ -249,7 +249,7 @@ public void getProcErrorOutput_readTwiceFull() throws Exception {
                 will(returnValue(-1));
             }
         });
-        KeytoolCommand cmd = new KeytoolCommand("myLoc", "myPwd", 365, "CN=myName", 2048, "RSA", "SHA256withRSA", "PKCS12");
+        KeytoolCommand cmd = new KeytoolCommand("myLoc", "myPwd", 365, "CN=myName", 2048, "RSA", "SHA256withRSA", "JKS");
         cmd.getProcErrorOutput(proc);
 
         mock.assertIsSatisfied();

dev/com.ibm.ws.crypto.certificateutil/test/com/ibm/ws/crypto/certificateutil/keytool/KeytoolSSLCertificateCreatorTest.java

@@ -26,7 +26,7 @@
  */
 public class KeytoolSSLCertificateCreatorTest {
     private final KeytoolSSLCertificateCreator creator = new KeytoolSSLCertificateCreator();
-    private final String location = System.getProperty("user.dir") + "/build/testKS.p12";
+    private final String location = System.getProperty("user.dir") + "/build/testKS.jks";
 
     /**
      * Test method for {@link com.ibm.ws.crypto.certificateutil.keytool.KeytoolSSLCertificateCreator#KeytoolCommand(java.lang.String, int, java.lang.String)}.

dev/com.ibm.ws.jaxrs.2.0.client_fat/fat/src/com/ibm/ws/jaxrs20/client/fat/FATSuite.java

@@ -29,6 +29,7 @@
 import com.ibm.ws.jaxrs20.client.fat.test.JAXRSClientSSLDefaultTest;
 import com.ibm.ws.jaxrs20.client.fat.test.JAXRSClientSSLFiltersTest;
 import com.ibm.ws.jaxrs20.client.fat.test.JAXRSClientSSLProxyAuthTest;
+import com.ibm.ws.jaxrs20.client.fat.test.JAXRSClientSSLTest;
 import com.ibm.ws.jaxrs20.client.fat.test.JAXRSClientSSLTestNoLibertySSLCfg;
 import com.ibm.ws.jaxrs20.client.fat.test.JAXRSClientSSLTestNoLibertySSLFeature;
 import com.ibm.ws.jaxrs20.client.fat.test.JAXRSClientStandaloneTest;
@@ -50,7 +51,7 @@
                 HandleResponsesTest.class,
                 JAXRSClientStandaloneTest.class,
                 JAXRS20WithClientFeatureEnabledTest.class,
-                //JAXRSClientSSLTest.class,
+                JAXRSClientSSLTest.class,
                 JAXRSClientSSLDefaultTest.class,
                 JAXRSClientSSLFiltersTest.class,
                 JAXRSClientSSLTestNoLibertySSLCfg.class,

dev/com.ibm.ws.jaxrs.2.0.client_fat/fat/src/com/ibm/ws/jaxrs20/client/fat/test/JAXRSClientSSLDefaultTest.java

@@ -96,7 +96,7 @@ public void testClientBasicSSL_InvalidSSLRef() throws Exception {
         this.runTestOnServer(target, "testClientBasicSSL_InvalidSSLRef", p, "the SSL configuration reference \"invalidSSLConfig\" is invalid.");
     }
 
-    //@Test
+    @Test
     public void testClientBasicSSL_CustomizedSSLContext() throws Exception {
         Map<String, String> p = new HashMap<String, String>();
         p.put("param", "alex");