View | Details | Raw Unified | Return to bug 54776
Collapse All | Expand All

(-)build.properties (-8 / +13 lines)
Lines 57-72 Link Here
57
beanshell.md5               = 02F72336919D06A8491E82346E10B4D5
57
beanshell.md5               = 02F72336919D06A8491E82346E10B4D5
58
58
59
# Bouncy Castle jars (compile and test only - not distributed)
59
# Bouncy Castle jars (compile and test only - not distributed)
60
bcmail.version              = 1.45
60
bcmail.version              = 1.48
61
bcmail.jar                  = bcmail-jdk15-${bcmail.version}.jar
61
bcmail.jar                  = bcmail-jdk15on-${bcmail.version}.jar
62
bcmail.loc                  = ${maven2.repo}/org/bouncycastle/bcmail-jdk15/${bcmail.version}
62
bcmail.loc                  = ${maven2.repo}/org/bouncycastle/bcmail-jdk15on/${bcmail.version}
63
bcmail.md5                  = 13321fc7eff7bcada7b4fedfb592025c
63
bcmail.md5                  = d21564a05cec19caea793f6c63c79b59
64
64
65
bcprov.version              = 1.45
65
bcprov.version              = 1.48
66
bcprov.jar                  = bcprov-jdk15-${bcprov.version}.jar
66
bcprov.jar                  = bcprov-jdk15on-${bcprov.version}.jar
67
bcprov.loc                  = ${maven2.repo}/org/bouncycastle/bcprov-jdk15/${bcprov.version}
67
bcprov.loc                  = ${maven2.repo}/org/bouncycastle/bcprov-jdk15on/${bcprov.version}
68
bcprov.md5                  = 2062f8e3d15748443ea60a94b266371c
68
bcprov.md5                  = c08b58e03da7d469b0e7df6f4dd99712
69
69
70
bcpkix.version              = 1.48
71
bcpkix.jar                  = bcpkix-jdk15on-${bcpkix.version}.jar
72
bcpkix.loc                  = ${maven2.repo}/org/bouncycastle/bcpkix-jdk15on/${bcpkix.version}
73
bcpkix.md5                  = f8fc0496846f567ec951ac0a0e25ed00
74
70
commons-codec.version       = 1.6
75
commons-codec.version       = 1.6
71
commons-codec.jar           = commons-codec-${commons-codec.version}.jar
76
commons-codec.jar           = commons-codec-${commons-codec.version}.jar
72
commons-codec.loc           = ${maven2.repo}/commons-codec/commons-codec/${commons-codec.version}
77
commons-codec.loc           = ${maven2.repo}/commons-codec/commons-codec/${commons-codec.version}
(-)build.xml (+1 lines)
Lines 2756-2761 Link Here
2756
        <process_jarfile jarname="avalon-framework"/>
2756
        <process_jarfile jarname="avalon-framework"/>
2757
        <process_jarfile jarname="bcmail" dest.dir="${lib.api}"/>
2757
        <process_jarfile jarname="bcmail" dest.dir="${lib.api}"/>
2758
        <process_jarfile jarname="bcprov" dest.dir="${lib.api}"/>
2758
        <process_jarfile jarname="bcprov" dest.dir="${lib.api}"/>
2759
        <process_jarfile jarname="bcpkix" dest.dir="${lib.api}"/>
2759
        <process_jarfile jarname="beanshell"/>
2760
        <process_jarfile jarname="beanshell"/>
2760
        <process_jarfile jarname="commons-codec"/>
2761
        <process_jarfile jarname="commons-codec"/>
2761
        <process_jarfile jarname="commons-collections"/>
2762
        <process_jarfile jarname="commons-collections"/>
(-)src/components/org/apache/jmeter/assertions/SMIMEAssertion.java (-1 / +2 lines)
Lines 52-57 Link Here
52
import org.bouncycastle.cms.CMSException;
52
import org.bouncycastle.cms.CMSException;
53
import org.bouncycastle.cms.SignerInformation;
53
import org.bouncycastle.cms.SignerInformation;
54
import org.bouncycastle.cms.SignerInformationStore;
54
import org.bouncycastle.cms.SignerInformationStore;
55
import org.bouncycastle.cms.jcajce.JcaX509CertSelectorConverter;
55
import org.bouncycastle.jce.PrincipalUtil;
56
import org.bouncycastle.jce.PrincipalUtil;
56
import org.bouncycastle.jce.X509Principal;
57
import org.bouncycastle.jce.X509Principal;
57
import org.bouncycastle.jce.provider.BouncyCastleProvider;
58
import org.bouncycastle.jce.provider.BouncyCastleProvider;
Lines 152-158 Link Here
152
            if (signerIt.hasNext()) {
153
            if (signerIt.hasNext()) {
153
154
154
                SignerInformation signer = (SignerInformation) signerIt.next();
155
                SignerInformation signer = (SignerInformation) signerIt.next();
155
                Iterator<?> certIt = certs.getCertificates(signer.getSID()).iterator();
156
                Iterator<?> certIt = certs.getCertificates(new JcaX509CertSelectorConverter().getCertSelector(signer.getSID())).iterator();
156
157
157
                if (certIt.hasNext()) {
158
                if (certIt.hasNext()) {
158
                    // the signer certificate
159
                    // the signer certificate

Return to bug 54776