password removed

pom.xml

@@ -145,10 +145,15 @@
 			<artifactId>slf4j-simple</artifactId>
 			<version>1.7.25</version>
 		</dependency>
+		<dependency>
+			<groupId>org.apache.httpcomponents</groupId>
+			<artifactId>httpcore-nio</artifactId>
+			<version>4.4.10</version>
+		</dependency>
 		<dependency>
 			<groupId>org.opcfoundation.ua</groupId>
 			<artifactId>opc-ua-stack</artifactId>
-			<version>1.3.345-SNAPSHOT</version>
+			<version>1.3.345a-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.osgi</groupId>

src/main/java/at/acdp/opcur/ExampleKeys.java

@@ -93,9 +93,6 @@ import org.opcfoundation.ua.utils.CryptoUtil;
  *
  */
 public class ExampleKeys {
-
-    private static final String PRIVKEY_PASSWORD = "Opc.Ua";
-
     /**
      * Load file certificate and private key from applicationName.der & .pfx - or create ones if they do not exist
      * @return the KeyPair composed of the certificate and private key
@@ -108,7 +105,7 @@ public class ExampleKeys {
         File privKeyFile =  new File(applicationName+ ".pem");
         try {
             Cert myCertificate = Cert.load( certFile );
-            PrivKey myPrivateKey = PrivKey.load( privKeyFile, PRIVKEY_PASSWORD );
+            PrivKey myPrivateKey = PrivKey.load( privKeyFile);
             return new KeyPair(myCertificate, myPrivateKey);
         } catch (CertificateException e) {
             throw new ServiceResultException( e );
@@ -125,20 +122,8 @@ public class ExampleKeys {
             }
         } catch (NoSuchAlgorithmException e) {
             throw new ServiceResultException( e );
-        } catch (InvalidKeyException e) {
-            throw new ServiceResultException( e );
         } catch (InvalidKeySpecException e) {
             throw new ServiceResultException( e );
-        } catch (NoSuchPaddingException e) {
-            throw new ServiceResultException( e );
-        } catch (InvalidAlgorithmParameterException e) {
-            throw new ServiceResultException( e );
-        } catch (IllegalBlockSizeException e) {
-            throw new ServiceResultException( e );
-        } catch (BadPaddingException e) {
-            throw new ServiceResultException( e );
-        } catch (InvalidParameterSpecException e) {
-            throw new ServiceResultException( e );
         }
     }
 
@@ -154,7 +139,7 @@ public class ExampleKeys {
         File privKeyFile =  new File("SampleCA.pem");
         try {
             Cert myCertificate = Cert.load( certFile );
-            PrivKey myPrivateKey = PrivKey.load( privKeyFile, PRIVKEY_PASSWORD );
+            PrivKey myPrivateKey = PrivKey.load( privKeyFile);
             return new KeyPair(myCertificate, myPrivateKey);
         } catch (CertificateException e) {
             throw new ServiceResultException( e );
@@ -162,27 +147,15 @@ public class ExampleKeys {
             try {
                 KeyPair keys = CertificateUtils.createIssuerCertificate("SampleCA", 3650, null);
                 keys.getCertificate().save(certFile);
-                keys.getPrivateKey().save(privKeyFile, PRIVKEY_PASSWORD);
+                keys.getPrivateKey().save(privKeyFile);
                 return keys;
             } catch (Exception e1) {
                 throw new ServiceResultException( e1 );
             }
         } catch (NoSuchAlgorithmException e) {
             throw new ServiceResultException( e );
-        } catch (InvalidKeyException e) {
-            throw new ServiceResultException( e );
         } catch (InvalidKeySpecException e) {
             throw new ServiceResultException( e );
-        } catch (NoSuchPaddingException e) {
-            throw new ServiceResultException( e );
-        } catch (InvalidAlgorithmParameterException e) {
-            throw new ServiceResultException( e );
-        } catch (IllegalBlockSizeException e) {
-            throw new ServiceResultException( e );
-        } catch (BadPaddingException e) {
-            throw new ServiceResultException( e );
-        } catch (InvalidParameterSpecException e) {
-            throw new ServiceResultException( e );
         }
     }
     /**
@@ -198,7 +171,7 @@ public class ExampleKeys {
         File privKeyFile =  new File(applicationName+ "_https.pem");
         try {
             Cert myCertificate = Cert.load( certFile );
-            PrivKey myPrivateKey = PrivKey.load( privKeyFile, PRIVKEY_PASSWORD );
+            PrivKey myPrivateKey = PrivKey.load( privKeyFile);
             return new KeyPair(myCertificate, myPrivateKey);
         } catch (CertificateException e) {
             throw new ServiceResultException( e );
@@ -207,29 +180,17 @@ public class ExampleKeys {
                 KeyPair caCert = getCACert();
                 String hostName = InetAddress.getLocalHost().getHostName();
                 String applicationUri = "urn:"+hostName+":"+applicationName;
-                KeyPair keys = CertificateUtils.createHttpsCertificate(hostName, applicationUri, 3650, caCert);
+                KeyPair keys =   CertificateUtils.createHttpsCertificate(hostName, applicationUri, 3650, caCert);
                 keys.getCertificate().save(certFile);
-                keys.getPrivateKey().save(privKeyFile, PRIVKEY_PASSWORD);
+                keys.getPrivateKey().save(privKeyFile);
                 return keys;
             } catch (Exception e1) {
                 throw new ServiceResultException( e1 );
             }
         } catch (NoSuchAlgorithmException e) {
             throw new ServiceResultException( e );
-        } catch (InvalidKeyException e) {
-            throw new ServiceResultException( e );
         } catch (InvalidKeySpecException e) {
             throw new ServiceResultException( e );
-        } catch (NoSuchPaddingException e) {
-            throw new ServiceResultException( e );
-        } catch (InvalidAlgorithmParameterException e) {
-            throw new ServiceResultException( e );
-        } catch (IllegalBlockSizeException e) {
-            throw new ServiceResultException( e );
-        } catch (BadPaddingException e) {
-            throw new ServiceResultException( e );
-        } catch (InvalidParameterSpecException e) {
-            throw new ServiceResultException( e );
         }
     }
     /**
@@ -247,47 +208,47 @@ public class ExampleKeys {
      * @throws NoSuchAlgorithmException
      * @throws UnrecoverableKeyException
      */
-    public static KeyPair getKeyPair(String alias, int keysize) throws ServiceResultException {
-        try {
-            Certificate cert = ks.getCertificate(alias+"_"+keysize);
-            Key key = ks.getKey(alias+"_"+keysize, "password".toCharArray());
-            KeyPair pair = new KeyPair( new Cert( (X509Certificate) cert ), new PrivKey( (RSAPrivateKey) key ) );
-            return pair;
-        } catch (KeyStoreException e) {
-            throw new ServiceResultException( e );
-        } catch (UnrecoverableKeyException e) {
-            throw new ServiceResultException( e );
-        } catch (NoSuchAlgorithmException e) {
-            throw new ServiceResultException( e );
-        } catch (CertificateEncodingException e) {
-            throw new ServiceResultException( e );
-        }
-    }
+//    public static KeyPair getKeyPair(String alias, int keysize) throws ServiceResultException {
+//        try {
+//            Certificate cert = ks.getCertificate(alias+"_"+keysize);
+//            Key key = ks.getKey(alias+"_"+keysize, "password".toCharArray());
+//            KeyPair pair = new KeyPair( new Cert( (X509Certificate) cert ), new PrivKey( (RSAPrivateKey) key ) );
+//            return pair;
+//        } catch (KeyStoreException e) {
+//            throw new ServiceResultException( e );
+//        } catch (UnrecoverableKeyException e) {
+//            throw new ServiceResultException( e );
+//        } catch (NoSuchAlgorithmException e) {
+//            throw new ServiceResultException( e );
+//        } catch (CertificateEncodingException e) {
+//            throw new ServiceResultException( e );
+//        }
+//    }
 
-    static KeyStore ks;
+    //static KeyStore ks;
 
-    static {
-        try {
-            ks = KeyStore.getInstance("pkcs12");
-            InputStream is = ExampleKeys.class.getResourceAsStream("keystore.p12");
-            try {
-                ks.load( is, "password".toCharArray() );
-            } catch (NoSuchAlgorithmException e) {
-                throw new RuntimeException(e);
-            } catch (CertificateException e) {
-                throw new RuntimeException(e);
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            } finally {
-                try {
-                    is.close();
-                } catch (IOException e) {
-                }
-            }
-        } catch (KeyStoreException e) {
-            throw new RuntimeException(e);
-        }
-    }
+//    static {
+//        try {
+//            ks = KeyStore.getInstance("pkcs12");
+//            InputStream is = ExampleKeys.class.getResourceAsStream("keystore.p12");
+//            try {
+//                ks.load( is, "password".toCharArray() );
+//            } catch (NoSuchAlgorithmException e) {
+//                throw new RuntimeException(e);
+//            } catch (CertificateException e) {
+//                throw new RuntimeException(e);
+//            } catch (IOException e) {
+//                throw new RuntimeException(e);
+//            } finally {
+//                try {
+//                    is.close();
+//                } catch (IOException e) {
+//                }
+//            }
+//        } catch (KeyStoreException e) {
+//            throw new RuntimeException(e);
+//        }
+//    }
 
 
 }

src/main/java/at/acdp/opcur/OPCTest.java

@@ -26,6 +26,8 @@ package at.acdp.opcur;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.security.KeyPairGenerator;
+import java.security.SecureRandom;
 import java.security.Security;
 import java.security.interfaces.RSAPrivateKey;
 import java.util.Random;
@@ -259,7 +261,10 @@ public class OPCTest {
             KeyPair myServerApplicationInstanceCertificate = ExampleKeys.getCert("ServerExample1");
             application.addApplicationInstanceCertificate(myServerApplicationInstanceCertificate);
             // ...and HTTPS certificate
+
+
             KeyPair myHttpsCertificate = ExampleKeys.getHttpsCert("ServerExample1");
+
             application.getHttpsSettings().setKeyPair(myHttpsCertificate);
 
             // Add User Token Policies
@@ -369,6 +374,7 @@ public class OPCTest {
     }
 
     public static void main(String[] args) throws Exception {
+        CryptoUtil.setSecurityProviderName("SunJCE");
         ////////////// SERVER //////////////
         // Create UA Server Application
         // Create UA Service Server