Adding Options for key encryption and key digest algorithms.

This is a back port for the OAEP feature added to 8.1.0 RI.

Author: jester

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>direct-common</artifactId>    
     <name>Direct Project common APIs</name>
-    <version>6.0.1</version>
+    <version>6.1.0-SNAPSHOT</version>
     <description>Direct Project common APIs.  Includes instrumentation, auditing, and other utility APIs</description>
     <inceptionYear>2010</inceptionYear>
     <url>http://api.nhindirect.org/x/www/api.nhindirect.org/java/site/direct-common/${project.version}</url> 
@@ -125,13 +125,13 @@
 		</dependency>	
 		<dependency>
 		    <groupId>org.bouncycastle</groupId>
-		    <artifactId>bcprov-jdk15on</artifactId>
-		    <version>1.60</version>    
+		    <artifactId>bcprov-jdk18on</artifactId>
+		    <version>1.81</version>    
 		</dependency>  
 		<dependency>
 		    <groupId>org.bouncycastle</groupId>
-		    <artifactId>bcmail-jdk15on</artifactId>
-		    <version>1.60</version>	    
+		    <artifactId>bcmail-jdk18on</artifactId>
+		    <version>1.81</version>	    
 		</dependency>	
 		<dependency>
 		  <groupId>org.springframework.boot</groupId>

src/main/java/org/nhindirect/common/crypto/tools/commands/PKCS11Commands.java

@@ -642,7 +642,7 @@ else if (keyUsage.compareToIgnoreCase("DigitalSignature") == 0)
 
 	        final ASN1EncodableVector attributes = new ASN1EncodableVector();
 	        final Attribute attribute = new Attribute(PKCSObjectIdentifiers.pkcs_9_at_extensionRequest,
-	                new DERSet(exts.toASN1Object()));
+	        		new DERSet(exts.toASN1Primitive()));
 
 	        attributes.add(attribute);
 

src/main/java/org/nhindirect/common/options/OptionsManager.java

@@ -107,6 +107,8 @@ public class OptionsManager
 		 */
 		JVM_PARAMS.put(OptionsParameter.CRYPTOGRAHPER_SMIME_ENCRYPTION_ALGORITHM, "org.nhindirect.stagent.cryptographer.smime.EncryptionAlgorithm");
 		JVM_PARAMS.put(OptionsParameter.CRYPTOGRAHPER_SMIME_DIGEST_ALGORITHM, "org.nhindirect.stagent.cryptographer.smime.DigestAlgorithm");
+		JVM_PARAMS.put(OptionsParameter.CRYPTOGRAHPER_KEY_ENCRYPTION_ALGORITHM, "org.nhindirect.stagent.cryptographer.smime.KeyEncryptionAlgorithm");
+		JVM_PARAMS.put(OptionsParameter.CRYPTOGRAHPER_KEY_ENCRYPTION_DIGEST_ALGORITHM, "org.nhindirect.stagent.cryptographer.smime.KeyEncryptionDigestAlgorithm");
 		JVM_PARAMS.put(OptionsParameter.ENFORCE_STRONG_DIGESTS, "org.nhindirect.stagent.cryptographer.smime.EnforceStrongDigests");
 		JVM_PARAMS.put(OptionsParameter.ENFORCE_STRONG_ENCRYPTION, "org.nhindirect.stagent.cryptographer.smime.EnforceStrongEncryption");
 		JVM_PARAMS.put(OptionsParameter.CRYPTOGRAHPER_LOG_DIGESTS, "org.nhindirect.stagent.cryptographer.smime.LogDigests");

src/main/java/org/nhindirect/common/options/OptionsParameter.java

@@ -158,7 +158,31 @@ public class OptionsParameter
 	 * <p><b>JVM Parameter/Options Name:</b> org.nhindirect.stagent.cryptographer.smime.EncryptionAlgorithm
 	 */
     public final static String CRYPTOGRAHPER_SMIME_ENCRYPTION_ALGORITHM = "CRYPTOGRAHPER_SMIME_ENCRYPTION_ALGORITHM";
-    
+
+	/**
+	 * String value that specifies the key encryption algorithm used to encrypt message keys by the SMIME cryptographer
+	 * <br>Valid option values:
+	 * <ul>
+	 * <li>RSA_OAEP</li>
+	 * <li>RSA_PKCS#1V15</li>
+	 * </ul>
+	 * <p><b>JVM Parameter/Options Name:</b> org.nhindirect.stagent.cryptographer.smime.EncryptionAlgorithm
+	 */
+	public final static String CRYPTOGRAHPER_KEY_ENCRYPTION_ALGORITHM = "CRYPTOGRAHPER_KEY_ENCRYPTION_ALGORITHM";
+
+	/**
+	 * String value that specifies the key encryption algorithm used to encrypt message keys by the SMIME cryptographer
+	 * <br>Valid option values:
+	 * <ul>
+	 * <li>SHA1</li>
+	 * <li>SHA256</li>
+	 * <li>SHA384</li>
+	 * <li>SHA512</li>
+	 * </ul>
+	 * <p><b>JVM Parameter/Options Name:</b> org.nhindirect.stagent.cryptographer.smime.EncryptionAlgorithm
+	 */
+	public final static String CRYPTOGRAHPER_KEY_ENCRYPTION_DIGEST_ALGORITHM = "CRYPTOGRAHPER_KEY_ENCRYPTION_DIGEST_ALGORITHM";
+
 	/**
 	 * String value that specifies the digest algorithm used to hash messages by the SMIME cryptographer
 	 * <br>Valid option values: