Merge pull request #5 from DirectProjectJavaRI/develop

6.0.1 Release

Author: Greg Meyer

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <artifactId>agent</artifactId>    
     <name>Direct Project Security And Trust Agent</name>
-    <version>6.0</version>
+    <version>6.0.1</version>
     <description>Direct Project Security And Trust Agent</description>
     <inceptionYear>2010</inceptionYear>
     <url>https://github.com/DirectProjectJavaRI/agent</url> 
@@ -49,17 +49,17 @@
         <name>New BSD License</name>
         <url>http://nhindirect.org/BSDLicense</url>
      </license>
-  </licenses>         
+  </licenses>          
   <dependencies>  
 		<dependency>
 		  <groupId>org.nhind</groupId>
 		  <artifactId>direct-policy</artifactId>
-		  <version>6.0</version>
+		  <version>6.0</version>		  
 		</dependency>	  
 		<dependency>
 		  <groupId>org.nhind</groupId>
-		  <artifactId>direct-common</artifactId>
-		  <version>6.0</version>		  
+		  <artifactId>direct-common</artifactId>	
+		  <version>6.0</version>		  	  
 		</dependency>	
 		<dependency>
 		  <groupId>org.nhind</groupId>
@@ -105,12 +105,12 @@
 		<dependency>
 		    <groupId>org.bouncycastle</groupId>
 		    <artifactId>bcmail-jdk15on</artifactId>
-		    <version>1.60</version>	    
-		</dependency>
+		    <version>1.60</version>	 		       
+		</dependency>		
 		<dependency>
 		    <groupId>org.bouncycastle</groupId>
 		    <artifactId>bcpkix-jdk15on</artifactId>
-		    <version>1.60</version>    
+		    <version>1.60</version>   			     
 		</dependency> 			
 		<dependency>
 		    <groupId>dnsjava</groupId>
@@ -338,7 +338,7 @@
 				<source>1.8</source>
 				<show>public</show>
 	            <excludePackageNames>
-	              org.nhindirect.stagent.annotation:org.nhindirect.stagent.cert.impl:org.nhindirect.stagent.cert.impl.annotation:org.nhindirect.stagent.cert.impl.module:org.nhindirect.stagent.cert.impl.provider:org.nhindirect.stagent.cryptography.annotation:org.nhindirect.stagent.module:org.nhindirect.stagent.provider:org.nhindirect.stagent.trust.annotation:org.nhindirect.stagent.trust.provider:org.nhindirect.stagent.utils:org.nhindirect.stagent.policy.impl
+	              org.nhindirect.stagent.annotation:org.nhindirect.stagent.cert.impl:org.nhindirect.stagent.cert.impl.annotation:org.nhindirect.stagent.cert.impl.module:org.nhindirect.stagent.cert.impl.provider:org.nhindirect.stagent.cryptography.annotation:org.nhindirect.stagent.module:org.nhindirect.stagent.provider:org.nhindirect.stagent.trust.annotation:org.nhindirect.stagent.trust.provider:org.nhindirect.stagent.utils:org.nhindirect.stagent.policy.impl:org.nhindirect.stagent.cryptography.bc
 	            </excludePackageNames>          	          
 	        </configuration>
             <executions>
@@ -389,7 +389,7 @@
 				<source>1.8</source>
 				<show>public</show>
 	            <excludePackageNames>
-	              org.nhindirect.stagent.annotation:org.nhindirect.stagent.cert.impl:org.nhindirect.stagent.cert.impl.annotation:org.nhindirect.stagent.cert.impl.module:org.nhindirect.stagent.cert.impl.provider:org.nhindirect.stagent.cryptography.annotation:org.nhindirect.stagent.module:org.nhindirect.stagent.provider:org.nhindirect.stagent.trust.annotation:org.nhindirect.stagent.trust.provider:org.nhindirect.stagent.utils:org.nhindirect.stagent.policy.impl
+	              org.nhindirect.stagent.annotation:org.nhindirect.stagent.cert.impl:org.nhindirect.stagent.cert.impl.annotation:org.nhindirect.stagent.cert.impl.module:org.nhindirect.stagent.cert.impl.provider:org.nhindirect.stagent.cryptography.annotation:org.nhindirect.stagent.module:org.nhindirect.stagent.provider:org.nhindirect.stagent.trust.annotation:org.nhindirect.stagent.trust.provider:org.nhindirect.stagent.utils:org.nhindirect.stagent.policy.impl:org.nhindirect.stagent.cryptography.bc
 	            </excludePackageNames>          	          
 	        </configuration>
 	      </plugin>

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

@@ -78,6 +78,7 @@ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 import org.nhindirect.stagent.NHINDException;
 import org.nhindirect.stagent.SignatureValidationException;
 import org.nhindirect.stagent.cert.X509CertificateEx;
+import org.nhindirect.stagent.cryptography.bc.DirectJceKeyTransEnvelopedRecipient;
 import org.nhindirect.stagent.mail.Message;
 import org.nhindirect.stagent.mail.MimeEntity;
 import org.nhindirect.stagent.mail.MimeError;
@@ -497,7 +498,7 @@ public MimeEntity decrypt(MimeEntity encryptedEntity, Collection<X509Certificate
 		        if (recipient == null)
 		        	continue;
 
-		        final JceKeyTransEnvelopedRecipient recip = new JceKeyTransEnvelopedRecipient(decryptCert.getPrivateKey());
+		        final JceKeyTransEnvelopedRecipient recip = new DirectJceKeyTransEnvelopedRecipient(decryptCert.getPrivateKey());
 		        recip.setProvider(CryptoExtensions.getJCESensitiveProviderName());
 		        recip.setContentProvider(CryptoExtensions.getJCEProviderName());