Merge pull request #196 from SimoneTinella/fix_issue_194

Fixed issue #194 (RuntimeException caused by BC provider on Android)

Author: jouniaro

.gitignore

@@ -3,10 +3,11 @@ tmp/
 javadoc/
 bin/
 /test-output
-target
+target
+/.idea
 
-*.der
-*.pem
+*.der
+*.pem
 .settings
 .classpath
 .project

Changelog.txt

@@ -1,3 +1,6 @@
+1.4.1.1
+Fixed (#194): SpongyCastle provider is now automatically picked in BouncyCastleUtils class
+
 1.4.1
 New (#185): Support for ReverseHello (see the ReverseHelloClientServerExample)
 New: Better configuration of initial timeouts in opc.tcp connections (see OpcTcpSettings)

codegen/pom.xml

@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>opc-ua-stack-codegen</artifactId>
-  <version>1.4.1-SNAPSHOT</version>
+  <version>1.4.1.1-SNAPSHOT</version>
   <groupId>org.opcfoundation.ua</groupId>
   <build>
   	<plugins>

examples/basic/pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opcfoundation.ua</groupId>
   <artifactId>opc-ua-stack-examples</artifactId>
-  <version>1.4.1-SNAPSHOT</version>
+  <version>1.4.1.1-SNAPSHOT</version>
   <name>examples</name>
   <properties>
   	<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -64,12 +64,12 @@
   				</descriptors>
   			</configuration>
   			<executions>
-	  			<execution>
-	            	<id>make-assembly</id>
-	            	<phase>package</phase>
-	            	<goals>
-	              		<goal>single</goal>
-	            	</goals>
+	  			<execution>
+	            	<id>make-assembly</id>
+	            	<phase>package</phase>
+	            	<goals>
+	              		<goal>single</goal>
+	            	</goals>
 	          	</execution>
   			</executions>
   		</plugin>
@@ -120,12 +120,12 @@
   				</programs>
   			</configuration>
   			<executions>
-  				<execution>
-            	<id>app-assembly</id>
-            	<phase>package</phase>
-            	<goals>
-              		<goal>assemble</goal>
-            	</goals>
+  				<execution>
+            	<id>app-assembly</id>
+            	<phase>package</phase>
+            	<goals>
+              		<goal>assemble</goal>
+            	</goals>
           </execution>
   			</executions>
   		</plugin>

examples/publisher/pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.opcfoundation.ua</groupId>
     <artifactId>azure-client-publisher-sample</artifactId>
-<version>1.4.1-SNAPSHOT</version>
+<version>1.4.1.1-SNAPSHOT</version>
     <name>Azure IotHub Client Publisher Sample</name>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

graveyard/pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.opcfoundation.ua</groupId>
 	<artifactId>opc-ua-stack-extras</artifactId>
-	<version>1.4.1-SNAPSHOT</version>
+	<version>1.4.1.1-SNAPSHOT</version>
 	<name>extras</name>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

pom.xml

@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opcfoundation.ua</groupId>
   <artifactId>opc-ua-stack</artifactId>
-  <version>1.4.1-SNAPSHOT</version>
+  <version>1.4.1.1-SNAPSHOT</version>
   <name>OPC Foundation Unified Architecture Java Stack</name>
     <properties>
   		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -91,8 +91,11 @@
             			</additionalJOptions>   
             			-->
             			<!-- these are for javadoc:fix goal -->
-            			<fixTags>param,return,throws</fixTags>        	
-            			<additionalparam>${javadoc.arg}</additionalparam>
+            			<fixTags>param,return,throws</fixTags>
+
+						<additionalJOption>${javadoc.arg}</additionalJOption>
+
+<!--            			<additionalparam>${javadoc.arg}</additionalparam>-->
             	<archive>
             		<addMavenDescriptor>false</addMavenDescriptor>
             	</archive>
@@ -111,27 +114,27 @@
   			<artifactId>jacoco-maven-plugin</artifactId>
   			<version>0.7.6.201602180812</version>
   			<executions>
-  				<execution>
-           			<id>prepare-unit-tests</id>
-            		<goals>
-              			<goal>prepare-agent</goal>
+  				<execution>
+           			<id>prepare-unit-tests</id>
+            		<goals>
+              			<goal>prepare-agent</goal>
             		</goals>
             		<configuration>
             			<excludes>
             				<exclude>org.opcfoundation.ua.core.Identifiers</exclude>
             			</excludes>
-            		</configuration>            
+            		</configuration>            
           		</execution>
-  				<execution>
-            		<id>prepare-integration-tests</id>
-		            <goals>
-              			<goal>prepare-agent-integration</goal>
+  				<execution>
+            		<id>prepare-integration-tests</id>
+		            <goals>
+              			<goal>prepare-agent-integration</goal>
             		</goals>
             		<configuration>
             			<excludes>
             				<exclude>org.opcfoundation.ua.core.Identifiers</exclude>
             			</excludes>
-            		</configuration>
+            		</configuration>
           		</execution>
   			</executions>
   		</plugin>
@@ -270,11 +273,11 @@
   	</dependency>
   </dependencies>
   <profiles>
-  	<profile>
+  	<profile>
       <id>jdk6</id>
       <properties>
       	<javadoc.arg></javadoc.arg>
-      </properties>
+      </properties>
 	  <build>
 	  	<plugins>
 			<plugin>
@@ -311,7 +314,7 @@
 				</configuration>
 			</plugin>
 		</plugins>
-	</build>
+	</build>
 	</profile>
   </profiles>
 </project>

src/main/java/org/opcfoundation/ua/utils/BouncyCastleUtils.java

@@ -84,8 +84,8 @@ public class BouncyCastleUtils {
 //				startDate, expiryDate, dn,
 //				keyPair.getPublic());
 //		ContentSigner signer = new JcaContentSignerBuilder("SHA1withRSA")
-//				.setProvider("BC").build(keyPair.getPrivate());
-//		return new JcaX509CertificateConverter().setProvider("BC")
+//				.setProvider(CryptoUtil.getSecurityProviderName()).build(keyPair.getPrivate());
+//		return new JcaX509CertificateConverter().setProvider(CryptoUtil.getSecurityProviderName())
 //				.getCertificate(certBldr.build(signer));
 //	}
 
@@ -149,11 +149,11 @@ expiryDate, new X500Principal(commonName),
 		ContentSigner signer;
 		try {
 			signer = new JcaContentSignerBuilder(CertificateUtils.getCertificateSignatureAlgorithm())
-					.setProvider("BC").build(privateKey);
+					.setProvider(CryptoUtil.getSecurityProviderName()).build(privateKey);
 		} catch (OperatorCreationException e) {
 			throw new GeneralSecurityException("Failed to sign the certificate", e);
 		}
-		return new JcaX509CertificateConverter().setProvider("BC")
+		return new JcaX509CertificateConverter().setProvider(CryptoUtil.getSecurityProviderName())
 				.getCertificate(certBldr.build(signer));
 	}
 
@@ -299,9 +299,9 @@ public static X509Certificate generateCertificate(String domainName, PublicKey p
 		//***** generate certificate ***********/
 		try {
 			ContentSigner signer = new JcaContentSignerBuilder(
-					CertificateUtils.getCertificateSignatureAlgorithm()).setProvider("BC")
+					CertificateUtils.getCertificateSignatureAlgorithm()).setProvider(CryptoUtil.getSecurityProviderName())
 					.build(signerKey);
-			return new JcaX509CertificateConverter().setProvider("BC")
+			return new JcaX509CertificateConverter().setProvider(CryptoUtil.getSecurityProviderName())
 					.getCertificate(certBldr.build(signer));
 		} catch (OperatorCreationException e) {
 			throw new GeneralSecurityException(e);
@@ -326,7 +326,7 @@ public static void writeToPem(Object key, File savePath, String password, String
 			pemWrt.writeObject(key);
 		else {
 			char[] pw = password.toCharArray();
-			PEMEncryptor encryptor = new JcePEMEncryptorBuilder(algorithm).setProvider("BC").setSecureRandom(CryptoUtil.getRandom()).build(pw);
+			PEMEncryptor encryptor = new JcePEMEncryptorBuilder(algorithm).setProvider(CryptoUtil.getSecurityProviderName()).setSecureRandom(CryptoUtil.getRandom()).build(pw);
 
 			pemWrt.writeObject(key, encryptor);
 		}