Skip to content

Commit 22781ad

Browse files
author
jester
committed
Updating for Java RI 8.1.0
1 parent d67ab82 commit 22781ad

File tree

3 files changed

+16
-49
lines changed

3 files changed

+16
-49
lines changed

‎pom.xml‎

Lines changed: 4 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,7 @@
4848
<shared-ldap.version>0.9.5.5</shared-ldap.version>
4949
<apache-ds.version>1.0.2</apache-ds.version>
5050
<mina-core.version>1.0.9</mina-core.version>
51-
<bcprov-jdk15on.version>1.68</bcprov-jdk15on.version>
52-
<bcmail-jdk15on.version>1.68</bcmail-jdk15on.version>
53-
<bcpkix-jdk15on.version>1.68</bcpkix-jdk15on.version>
51+
<bcpkix-jdk18on.version>1.81</bcpkix-jdk18on.version>
5452
<javax-mail-extension.version>3.1.0</javax-mail-extension.version>
5553
</properties>
5654
<scm>
@@ -67,40 +65,12 @@
6765
<dependency>
6866
<groupId>org.nhind</groupId>
6967
<artifactId>direct-policy</artifactId>
70-
<version>8.0.0</version>
71-
<exclusions>
72-
<exclusion>
73-
<groupId>org.bouncycastle</groupId>
74-
<artifactId>bcprov-jdk15on</artifactId>
75-
</exclusion>
76-
<exclusion>
77-
<groupId>org.bouncycastle</groupId>
78-
<artifactId>bcmail-jdk15on</artifactId>
79-
</exclusion>
80-
<exclusion>
81-
<groupId>org.bouncycastle</groupId>
82-
<artifactId>bcpkix-jdk15on</artifactId>
83-
</exclusion>
84-
</exclusions>
68+
<version>8.1.0-SNAPSHOT</version>
8569
</dependency>
8670
<dependency>
8771
<groupId>org.nhind</groupId>
8872
<artifactId>direct-common</artifactId>
8973
<version>8.1.0-SNAPSHOT</version>
90-
<exclusions>
91-
<exclusion>
92-
<groupId>org.bouncycastle</groupId>
93-
<artifactId>bcprov-jdk15on</artifactId>
94-
</exclusion>
95-
<exclusion>
96-
<groupId>org.bouncycastle</groupId>
97-
<artifactId>bcmail-jdk15on</artifactId>
98-
</exclusion>
99-
<exclusion>
100-
<groupId>org.bouncycastle</groupId>
101-
<artifactId>bcpkix-jdk15on</artifactId>
102-
</exclusion>
103-
</exclusions>
10474
</dependency>
10575
<dependency>
10676
<groupId>org.nhind</groupId>
@@ -140,18 +110,8 @@
140110
</dependency>
141111
<dependency>
142112
<groupId>org.bouncycastle</groupId>
143-
<artifactId>bcprov-debug-jdk18on</artifactId>
144-
<version>1.78</version>
145-
</dependency>
146-
<dependency>
147-
<groupId>org.bouncycastle</groupId>
148-
<artifactId>bcmail-jdk15on</artifactId>
149-
<version>${bcmail-jdk15on.version}</version>
150-
</dependency>
151-
<dependency>
152-
<groupId>org.bouncycastle</groupId>
153-
<artifactId>bcpkix-jdk15on</artifactId>
154-
<version>${bcpkix-jdk15on.version}</version>
113+
<artifactId>bcpkix-jdk18on</artifactId>
114+
<version>${bcpkix-jdk18on.version}</version>
155115
</dependency>
156116
<dependency>
157117
<groupId>dnsjava</groupId>

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -516,8 +516,8 @@ private MimeBodyPart createEncryptedEnvelope(MimeBodyPart bodyPart, Collection<X
516516
// ensure the certificates key is allowed
517517
if (isAllowedCertKey(cert)) {
518518
if (log.isDebugEnabled()) {
519-
log.info("Encrypting: Encryption algorithm is " + this.m_encryptionAlgorithm.algName + "(" + m_encryptionAlgorithm.getOID().toString() + ")");
520-
log.info("Encrypting: Key encryption algorithm is " + this.m_keyEncryptionAlgorithm.algName + "(" + this.m_keyEncryptionAlgorithm.getOID().toString() + ")");
519+
log.debug("Encrypting: Encryption algorithm is " + this.m_encryptionAlgorithm.algName + "(" + m_encryptionAlgorithm.getOID().toString() + ")");
520+
log.debug("Encrypting: Key encryption algorithm is " + this.m_keyEncryptionAlgorithm.algName + "(" + this.m_keyEncryptionAlgorithm.getOID().toString() + ")");
521521
}
522522
JcaAlgorithmParametersConverter paramsConverter = new JcaAlgorithmParametersConverter();
523523
if( m_keyEncryptionAlgorithm == EncryptionAlgorithm.RSA_OAEP) {
@@ -539,7 +539,7 @@ private MimeBodyPart createEncryptedEnvelope(MimeBodyPart bodyPart, Collection<X
539539
if (log.isDebugEnabled()) {
540540
ASN1Encodable asn1Encodable = algorithmIdentifier.getParameters();
541541
RSAESOAEPparams rsaesoaePparams = (RSAESOAEPparams)asn1Encodable;
542-
log.info("Encrypting: Key encryption algorithm parameters: Hash Algorithm: " + rsaesoaePparams.getHashAlgorithm().getAlgorithm().getId() + " Mask Gen Algorithm: " + rsaesoaePparams.getMaskGenAlgorithm().getAlgorithm().getId() + " P Source Algorithm: " + rsaesoaePparams.getPSourceAlgorithm().getAlgorithm().getId());
542+
log.debug("Encrypting: Key encryption algorithm parameters: Hash Algorithm: " + rsaesoaePparams.getHashAlgorithm().getAlgorithm().getId() + " Mask Gen Algorithm: " + rsaesoaePparams.getMaskGenAlgorithm().getAlgorithm().getId() + " P Source Algorithm: " + rsaesoaePparams.getPSourceAlgorithm().getAlgorithm().getId());
543543
}
544544
// JceKeyTransRecipientInfoGenerator has at least 2 constructors
545545
// with just a cert as the arg, the algorithm defaults to new JceAsymmetricKeyWrapper(recipientCert) for the AsymmetricKeyWrapper, which is RSA PKCS15
@@ -668,8 +668,8 @@ public MimeEntity decrypt(MimeEntity encryptedEntity, Collection<X509Certificate
668668
if (recipient == null)
669669
continue;
670670
DefaultAlgorithmNameFinder defaultAlgorithmNameFinder = new DefaultAlgorithmNameFinder();
671-
log.info("Decrypting: Encryption algorithm is " + defaultAlgorithmNameFinder.getAlgorithmName(m.getContentEncryptionAlgorithm()) + "(" + m.getEncryptionAlgOID() + ")");
672-
log.info("Decrypting: Key encryption algorithm is " + defaultAlgorithmNameFinder.getAlgorithmName(recipient.getKeyEncryptionAlgorithm()) + "(" + recipient.getKeyEncryptionAlgorithm().getAlgorithm().getId() + ")");
671+
log.debug("Decrypting: Encryption algorithm is " + defaultAlgorithmNameFinder.getAlgorithmName(m.getContentEncryptionAlgorithm()) + "(" + m.getEncryptionAlgOID() + ")");
672+
log.debug("Decrypting: Key encryption algorithm is " + defaultAlgorithmNameFinder.getAlgorithmName(recipient.getKeyEncryptionAlgorithm()) + "(" + recipient.getKeyEncryptionAlgorithm().getAlgorithm().getId() + ")");
673673
if (recipient.getKeyEncryptionAlgorithm().getParameters() != null) {
674674

675675
ASN1Encodable asn1Encodable = recipient.getKeyEncryptionAlgorithm().getParameters();

‎src/test/java/org/nhindirect/stagent/cryptography/CryptographerTest.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
import org.junit.jupiter.api.Assertions;
99
import org.junit.jupiter.api.BeforeEach;
10+
import org.junit.jupiter.api.Disabled;
1011
import org.junit.jupiter.api.Test;
1112

1213
import java.io.ByteArrayOutputStream;
@@ -536,6 +537,8 @@ public void testEncryptAndDecryptKeyEncryptionMimeEntityStrongEncryptionAlgKeyEn
536537
{
537538
testEncryptAndDecryptKeyEncryptionMimeEntity(null, EncryptionAlgorithm.RSA_OAEP, DigestAlgorithm.SHA512, true, false, false);
538539
}
540+
541+
@Disabled // SHA1 is allowed for now
539542
@Test
540543
public void testEncryptAndDecryptKeyEncryptionMimeEntityStrongEncryptionAlgWeakKeyEncryptionDigestAlg() throws Exception
541544
{
@@ -547,12 +550,16 @@ public void testEncryptAndDecryptKeyEncryptionMimeEntityWeakEncryptionAlgStrongK
547550
// This should throw an encryption exception, enforceStrongEncryption is set, SHA-1 is requested for key encryption digest
548551
testEncryptAndDecryptKeyEncryptionMimeEntity(null, EncryptionAlgorithm.RSA_PKCS1_V15, DigestAlgorithm.SHA256, true, true, false);
549552
}
553+
554+
@Disabled // PKCS1.5 is allowed for now
550555
@Test
551556
public void testEncryptAndDecryptKeyEncryptionMimeEntityWeakKeyEncryptionAlg() throws Exception
552557
{
553558
// This should throw an encryption exception, enforceStrongEncryption is set, PKCS#1 V1.5 is requested for key encryption
554559
testEncryptAndDecryptKeyEncryptionMimeEntity(null, EncryptionAlgorithm.RSA_PKCS1_V15, null, true, true, false);
555560
}
561+
562+
@Disabled // SHA1 is allowed for now
556563
@Test
557564
public void testEncryptAndDecryptKeyEncryptionMimeEntityWeakKeyEncryptionDigestAlg() throws Exception
558565
{

0 commit comments

Comments
 (0)