diff options
author | David Hook <dgh@cryptoworkshop.com> | 2013-06-13 06:11:02 +0400 |
---|---|---|
committer | David Hook <dgh@cryptoworkshop.com> | 2013-06-13 06:11:02 +0400 |
commit | 9e5645fb614647cb426e3ed54b88a5370bacf06c (patch) | |
tree | 2f8200207082637511bd979e40581f742c162ebd /mail | |
parent | 2fff24c5ca1e289f8652d891219e4cbc04e524ac (diff) |
minor cleanups
Diffstat (limited to 'mail')
-rw-r--r-- | mail/src/test/java/org/bouncycastle/mail/smime/test/NewSMIMESignedTest.java | 15 | ||||
-rw-r--r-- | mail/src/test/java/org/bouncycastle/mail/smime/test/SMIMESignedTest.java | 4 |
2 files changed, 11 insertions, 8 deletions
diff --git a/mail/src/test/java/org/bouncycastle/mail/smime/test/NewSMIMESignedTest.java b/mail/src/test/java/org/bouncycastle/mail/smime/test/NewSMIMESignedTest.java index 81213395..8622f980 100644 --- a/mail/src/test/java/org/bouncycastle/mail/smime/test/NewSMIMESignedTest.java +++ b/mail/src/test/java/org/bouncycastle/mail/smime/test/NewSMIMESignedTest.java @@ -46,10 +46,9 @@ import org.bouncycastle.asn1.smime.SMIMECapabilitiesAttribute; import org.bouncycastle.asn1.smime.SMIMECapability; import org.bouncycastle.asn1.smime.SMIMECapabilityVector; import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers; +import org.bouncycastle.cert.X509AttributeCertificateHolder; import org.bouncycastle.cert.X509CertificateHolder; -import org.bouncycastle.cert.jcajce.JcaAttrCertStore; import org.bouncycastle.cert.jcajce.JcaCertStore; -import org.bouncycastle.cert.jcajce.JcaX509AttributeCertificateHolder; import org.bouncycastle.cms.DefaultSignedAttributeTableGenerator; import org.bouncycastle.cms.SignerInformation; import org.bouncycastle.cms.SignerInformationStore; @@ -62,8 +61,8 @@ import org.bouncycastle.mail.smime.SMIMESignedParser; import org.bouncycastle.mail.smime.util.CRLFOutputStream; import org.bouncycastle.mail.smime.util.FileBackedMimeBodyPart; import org.bouncycastle.operator.jcajce.JcaDigestCalculatorProviderBuilder; +import org.bouncycastle.util.CollectionStore; import org.bouncycastle.util.Store; -import org.bouncycastle.x509.X509AttributeCertificate; public class NewSMIMESignedTest extends TestCase @@ -808,9 +807,13 @@ public class NewSMIMESignedTest gen.addCertificates(certs); - X509AttributeCertificate attrCert = CMSTestUtil.getAttributeCertificate(); + X509AttributeCertificateHolder attrCert = CMSTestUtil.getAttributeCertificate(); - Store store = new JcaAttrCertStore(attrCert); + List attrCertList = new ArrayList(); + + attrCertList.add(attrCert); + + Store store = new CollectionStore(attrCertList); gen.addAttributeCertificates(store); @@ -822,7 +825,7 @@ public class NewSMIMESignedTest Store attrCerts = s.getAttributeCertificates(); - assertTrue(attrCerts.getMatches(null).contains(new JcaX509AttributeCertificateHolder(attrCert))); + assertTrue(attrCerts.getMatches(null).contains(attrCert)); } private void rsaPSSTest(String digest, String digestOID) diff --git a/mail/src/test/java/org/bouncycastle/mail/smime/test/SMIMESignedTest.java b/mail/src/test/java/org/bouncycastle/mail/smime/test/SMIMESignedTest.java index aa2b7d41..cb2f265e 100644 --- a/mail/src/test/java/org/bouncycastle/mail/smime/test/SMIMESignedTest.java +++ b/mail/src/test/java/org/bouncycastle/mail/smime/test/SMIMESignedTest.java @@ -49,6 +49,7 @@ import org.bouncycastle.asn1.smime.SMIMECapabilitiesAttribute; import org.bouncycastle.asn1.smime.SMIMECapability; import org.bouncycastle.asn1.smime.SMIMECapabilityVector; import org.bouncycastle.asn1.teletrust.TeleTrusTObjectIdentifiers; +import org.bouncycastle.cert.X509AttributeCertificateHolder; import org.bouncycastle.cms.SignerInformation; import org.bouncycastle.cms.SignerInformationStore; import org.bouncycastle.cms.jcajce.JcaX509CertSelectorConverter; @@ -59,7 +60,6 @@ import org.bouncycastle.mail.smime.SMIMESignedParser; import org.bouncycastle.mail.smime.util.CRLFOutputStream; import org.bouncycastle.mail.smime.util.FileBackedMimeBodyPart; import org.bouncycastle.util.Store; -import org.bouncycastle.x509.X509AttributeCertificate; import org.bouncycastle.x509.X509CollectionStoreParameters; import org.bouncycastle.x509.X509Store; @@ -756,7 +756,7 @@ public class SMIMESignedTest gen.addCertificatesAndCRLs(certs); - X509AttributeCertificate attrCert = CMSTestUtil.getAttributeCertificate(); + X509AttributeCertificateHolder attrCert = CMSTestUtil.getAttributeCertificate(); X509Store store = X509Store.getInstance("AttributeCertificate/Collection", new X509CollectionStoreParameters(Collections.singleton(attrCert)), "BC"); |