Merge pull request #20 from DirectProjectJavaRI/RSA-OAEP-develop

Rsa oaep develop and RI 8.1.0 updates

Author: gm2552

pom.xml

@@ -48,9 +48,7 @@
       <shared-ldap.version>0.9.5.5</shared-ldap.version>
       <apache-ds.version>1.0.2</apache-ds.version>
       <mina-core.version>1.0.9</mina-core.version>
-      <bcprov-jdk15on.version>1.68</bcprov-jdk15on.version>
-      <bcmail-jdk15on.version>1.68</bcmail-jdk15on.version>
-      <bcpkix-jdk15on.version>1.68</bcpkix-jdk15on.version>
+      <bcpkix-jdk18on.version>1.81</bcpkix-jdk18on.version>
       <javax-mail-extension.version>3.1.0</javax-mail-extension.version>
    </properties>   	    
   <scm>
@@ -67,17 +65,17 @@
 		<dependency>
 		  <groupId>org.nhind</groupId>
 		  <artifactId>direct-policy</artifactId>
-		  <version>8.0.0</version>		  
+		  <version>8.1.0-SNAPSHOT</version>
 		</dependency>	  
 		<dependency>
 		  <groupId>org.nhind</groupId>
 		  <artifactId>direct-common</artifactId>	
-		  <version>8.0.0</version>		  	  
+		  <version>8.1.0-SNAPSHOT</version>
 		</dependency>	
 		<dependency>
 		  <groupId>org.nhind</groupId>
 		  <artifactId>direct-msg-monitor-model</artifactId>
-		  <version>8.0.0</version>
+		  <version>8.1.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>org.projectlombok</groupId>
@@ -112,18 +110,8 @@
 		</dependency>	
 		<dependency>
 		    <groupId>org.bouncycastle</groupId>
-		    <artifactId>bcprov-jdk15on</artifactId>
-		    <version>${bcprov-jdk15on.version}</version>    
-		</dependency>  
-		<dependency>
-		    <groupId>org.bouncycastle</groupId>
-		    <artifactId>bcmail-jdk15on</artifactId>
-		    <version>${bcmail-jdk15on.version}</version>	 		       
-		</dependency>		
-		<dependency>
-		    <groupId>org.bouncycastle</groupId>
-		    <artifactId>bcpkix-jdk15on</artifactId>
-		    <version>${bcpkix-jdk15on.version}</version>   			     
+		    <artifactId>bcpkix-jdk18on</artifactId>
+		    <version>${bcpkix-jdk18on.version}</version>
 		</dependency> 			
 		<dependency>
 		    <groupId>dnsjava</groupId>
@@ -164,6 +152,20 @@
 		    <groupId>org.springframework.boot</groupId>
 		    <artifactId>spring-boot-starter-test</artifactId>
 		    <scope>test</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>org.bouncycastle</groupId>
+					<artifactId>bcprov-jdk15on</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.bouncycastle</groupId>
+					<artifactId>bcmail-jdk15on</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.bouncycastle</groupId>
+					<artifactId>bcpkix-jdk15on</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>	
 		<!--  Needed for Apache DS Tests -->
 	    <dependency>

src/main/java/org/nhindirect/stagent/cryptography/EncryptionAlgorithm.java

@@ -23,6 +23,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 package org.nhindirect.stagent.cryptography;
 
 import org.apache.commons.lang3.StringUtils;
+import org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
 import org.bouncycastle.cms.CMSEnvelopedGenerator;
 import org.bouncycastle.cms.CMSSignedDataGenerator;
 import org.bouncycastle.mail.smime.SMIMEEnvelopedGenerator;
@@ -45,8 +46,10 @@ public enum EncryptionAlgorithm
     DES_EDE3_CBC("DESEDE/CBC/PKCS5Padding", CMSEnvelopedGenerator.DES_EDE3_CBC),
     AES128_CBC("AES/CBC/PKCS5Padding", CMSEnvelopedGenerator.AES128_CBC),
     AES192_CBC("AES/CBC/PKCS5Padding", CMSEnvelopedGenerator.AES192_CBC),
-    AES256_CBC("AES/CBC/PKCS5Padding", CMSEnvelopedGenerator.AES256_CBC);
-    
+    AES256_CBC("AES/CBC/PKCS5Padding", CMSEnvelopedGenerator.AES256_CBC),
+	RSA_OAEP("RSA_OAEP", PKCSObjectIdentifiers.id_RSAES_OAEP.getId()),
+	RSA_PKCS1_V15("RSA_PKCS1_V15", PKCSObjectIdentifiers.rsaEncryption.getId());
+
     protected final String algName;
     protected final String OID;
 
@@ -82,7 +85,9 @@ else if (algorithmName.equalsIgnoreCase(RSA.getAlgName()))
     	else if (algorithmName.equalsIgnoreCase(RSAandMGF1.getAlgName()))
     		return RSAandMGF1;  
     	else if (algorithmName.equalsIgnoreCase(ECDSA.getAlgName()))
-    		return ECDSA;        	
+    		return ECDSA;
+		else if (algorithmName.equalsIgnoreCase(RSA_PKCS1_V15.getAlgName()))
+			return RSA_PKCS1_V15;
     	else
     		return defaultAlgorithm;
     }