[pkg-java] r18923 - in tags/jakarta-jmeter: . 2.11-5/debian 2.11-5/debian/patches
Markus Koschany
apo-guest at moszumanska.debian.org
Sun Dec 6 15:57:35 UTC 2015
Author: apo-guest
Date: 2015-12-06 15:57:35 +0000 (Sun, 06 Dec 2015)
New Revision: 18923
Added:
tags/jakarta-jmeter/2.11-5/
tags/jakarta-jmeter/2.11-5/debian/changelog
tags/jakarta-jmeter/2.11-5/debian/patches/08_bouncycastle-1.51.patch
Removed:
tags/jakarta-jmeter/2.11-5/debian/changelog
tags/jakarta-jmeter/2.11-5/debian/patches/08_bouncycastle-1.51.patch
Log:
[svn-buildpackage] Tagging jakarta-jmeter 2.11-5
Deleted: tags/jakarta-jmeter/2.11-5/debian/changelog
===================================================================
--- trunk/jakarta-jmeter/debian/changelog 2015-11-30 20:48:06 UTC (rev 18921)
+++ tags/jakarta-jmeter/2.11-5/debian/changelog 2015-12-06 15:57:35 UTC (rev 18923)
@@ -1,170 +0,0 @@
-jakarta-jmeter (2.11-4) unstable; urgency=medium
-
- * Team upload.
- * Rebuild jakarta-jmeter against libcommons-net-java (>= 3).
-
- -- Markus Koschany <apo at gambaru.de> Wed, 28 Oct 2015 14:22:11 +0100
-
-jakarta-jmeter (2.11-3) unstable; urgency=medium
-
- * Team upload.
- * Depend on libmail-java instead of libgeronimo-javamail-1.4-spec-java
- * Standards-Version updated to 3.9.6 (no changes)
-
- -- Emmanuel Bourg <ebourg at apache.org> Thu, 16 Jul 2015 12:12:24 +0200
-
-jakarta-jmeter (2.11-2) unstable; urgency=medium
-
- * debian/copyright: Documented the licenses of the Oxygen, Echo and Tango icon
- themes used by JMeter (Closes: #755794)
-
- -- Emmanuel Bourg <ebourg at apache.org> Thu, 18 Sep 2014 10:33:58 +0200
-
-jakarta-jmeter (2.11-1) unstable; urgency=medium
-
- * New upstream release (Closes: #690031)
- - Refreshed the patches
- - Added new dependencies on libjsoup-java, librsyntaxtextarea-java
- and libmongodb-java
- - Removed 03_bouncycastle_update.patch (fixed upstream)
- * Improved the application icon
- * Install ApacheJMeter_native.jar in the main jmeter package
- * Packaged the MongoDB testing module as jmeter-mongodb
- * Added keywords to the desktop shortcut
- * Split 02_disable_components.patch into 3 patches
- * Use XZ compression for the upstream tarball
- * debian/rules: Do not mount /usr/share/java in the classpath to avoid build
- failures on non clean systems
-
- -- Emmanuel Bourg <ebourg at apache.org> Fri, 18 Jul 2014 12:03:01 +0200
-
-jakarta-jmeter (2.8-2) unstable; urgency=low
-
- * Renamed the HashTree.replace(Object, Object) method to replaceKey().
- This avoids a conflict with the new Map.replace(Object, Object) method
- introduced in Java 8.
- * Updated the classpath of jorphan.jar to use Commons Collections 3
- * Standards-Version updated to 3.9.5 (no changes)
- * Switch to debhelper level 9
-
- -- Emmanuel Bourg <ebourg at apache.org> Fri, 11 Apr 2014 15:06:06 +0200
-
-jakarta-jmeter (2.8-1) unstable; urgency=low
-
- * New upstream release
- * Refreshed the patches
- * Added a patch improving the help on the command line
- * Added a manpage
- * Added new dependencies on libcommons-jexl2-java and libcommons-lang3-java
- * Locate the JRE in the Java wrapper to avoid the
- "No JAVA_CMD set for run_java" warning.
- * Install test.jar in /usr/share/jmeter/lib/junit/
-
- -- Emmanuel Bourg <ebourg at apache.org> Fri, 05 Jul 2013 16:48:12 +0200
-
-jakarta-jmeter (2.5.1-2) unstable; urgency=low
-
- * Patched to compile against Bouncy Castle 1.48 (Closes: #713151)
- * debian/watch: Updated the location of the archives following
- the graduation of JMeter to a top level project.
- * Removed the DMUA flag
- * Bump standards version to 3.9.4. No changes needed.
- * Use canonical URLs for the Vcs-* fields
- * debian/rules: Added a clean target to allow rebuilds
-
- -- Emmanuel Bourg <ebourg at apache.org> Wed, 03 Jul 2013 13:02:38 +0200
-
-jakarta-jmeter (2.5.1-1) unstable; urgency=low
-
- * New upstream release. (Closes: #641546, LP: #879463)
- * Change home page URL everywhere.
- * Add new build dependencies libhttpclient-java, libhttpmime-java for http
- module. Update build and runtime classpath accordingly.
- * Refreshed 02_disable_components.patch as per latest source.
- * Update 'Format' value in debian/copyright.
- * Point watch file to archive area until we used renamed upstream source.
-
- -- Onkar Shinde <onkarshinde at ubuntu.com> Thu, 03 May 2012 20:19:04 +0530
-
-jakarta-jmeter (2.4-3) unstable; urgency=low
-
- * Merge Ubuntu changes (gnumail -> geronimo-javamail).
- * Use javahelper, *.classpath files to set classpath and runtime
- dependencies.
- * Add libbcmail-java, libbcprov-java build dependencies for SMIMEAssetion.
- * Update 02_disable_components.patch to build SMIMEAssertion* again.
- * Remove few unneeded/unused dependencies - batik, bsh, gnumail, jboss-j2ee.
- * Minimize jar lookup in launcher script because classpath has been set in
- all jar files.
- * Bump standards version to 3.9.3. No changes needed.
-
- -- Onkar Shinde <onkarshinde at ubuntu.com> Sat, 21 Apr 2012 16:17:45 +0530
-
-jakarta-jmeter (2.4-2) unstable; urgency=low
-
- * Team upload.
- * debian/control
- - Remove build unnecessary build dependency on quilt.
- - Update Section of jmeter-apidoc and jmeter-help to be 'doc'
- - Bump standards version to 3.9.2. No changes needed.
- * debian/rules
- - Remove patchsys-quilt.mk.
- * debian/copyright
- - Freshen DEP5 fields to address lintian warnings.
-
- -- tony mancill <tmancill at debian.org> Sat, 17 Sep 2011 20:27:46 -0700
-
-jakarta-jmeter (2.4-1) unstable; urgency=low
-
- * New upstream version.
- * debian/control
- - Add default-jdk-doc to build depends to link against java api docs.
- - Change build-dep junit -> junit4 as application supports junit4 features
- now. Change runtime dependency accordingly.
- - Update short description of all modules.
- - Standards version 3.9.1. No change needed.
- * debian/rules, debian/wrappers/jmeter
- - Updates and fixes for build dependencies/properties and runtime
- dependencies.
- * debian/jmeter.install, debian/jmeter.properties
- - Use upstream provided file. So our own blank file removed.
- * debian/patches/
- - 01_fix_batik_imports.patch - Remove. Not used since last version.
- - 02_disable_components.patch - Refreshed as per current source.
- - 03_fix_jtidy_call.patch - Remove. No needed anymore.
- - 04_files_from_upstream.patch - Remove. Not needed anymore.
- * debian/source/format
- - Source format 3.0 (quilt).
- * debian/README.source
- - Not needed anymore with source format 3.0.
-
- -- Onkar Shinde <onkarshinde at ubuntu.com> Sat, 16 Apr 2011 20:27:21 +0530
-
-jakarta-jmeter (2.3.4-2) unstable; urgency=low
-
- * debian/control
- - Remove libgeronimo-jms-1.1-spec-java from build dependencies.
- The package does not exist in Debian archive.
- - Add build dependencies libxmlgraphics-commons-java, rhino. Helps backport
- of the package to Lenny.
- - Add libxmlgraphics-commons-java dependency.
- - Add appropriate dependency to jmeter-jms package.
- * debian/rules
- - Add xmlgraphics-commons, js to DEB_JARS.
- * debian/patches/series
- - Drop 01_fix_batik_imports.patch from list. This patch is unnecessary with
- use of libxmlgraphics-commons-java build-dep.
- * debian/wrappers/jmeter
- - Add xmlgraphics-commons to classpath.
- - Add libraries needed by jmeter-jms to classpath.
- * Thanks to Jan Wagner for spotting most of the problems when doing backport
- to Lenny.
-
- -- Onkar Shinde <onkarshinde at ubuntu.com> Wed, 07 Oct 2009 14:17:01 +0530
-
-jakarta-jmeter (2.3.4-1) unstable; urgency=low
-
- * Initial version: Merge from Ubuntu. (Closes: #505877)
-
- -- Onkar Shinde <onkarshinde at ubuntu.com> Wed, 30 Sep 2009 10:49:06 +0530
-
Copied: tags/jakarta-jmeter/2.11-5/debian/changelog (from rev 18922, trunk/jakarta-jmeter/debian/changelog)
===================================================================
--- tags/jakarta-jmeter/2.11-5/debian/changelog (rev 0)
+++ tags/jakarta-jmeter/2.11-5/debian/changelog 2015-12-06 15:57:35 UTC (rev 18923)
@@ -0,0 +1,177 @@
+jakarta-jmeter (2.11-5) unstable; urgency=medium
+
+ * Team upload.
+ * Add bouncycastle-1.51.patch and fix FTBFS with bouncycastle >= 1.51.
+
+ -- Markus Koschany <apo at debian.org> Sun, 06 Dec 2015 16:30:41 +0100
+
+jakarta-jmeter (2.11-4) unstable; urgency=medium
+
+ * Team upload.
+ * Rebuild jakarta-jmeter against libcommons-net-java (>= 3).
+
+ -- Markus Koschany <apo at gambaru.de> Wed, 28 Oct 2015 14:22:11 +0100
+
+jakarta-jmeter (2.11-3) unstable; urgency=medium
+
+ * Team upload.
+ * Depend on libmail-java instead of libgeronimo-javamail-1.4-spec-java
+ * Standards-Version updated to 3.9.6 (no changes)
+
+ -- Emmanuel Bourg <ebourg at apache.org> Thu, 16 Jul 2015 12:12:24 +0200
+
+jakarta-jmeter (2.11-2) unstable; urgency=medium
+
+ * debian/copyright: Documented the licenses of the Oxygen, Echo and Tango icon
+ themes used by JMeter (Closes: #755794)
+
+ -- Emmanuel Bourg <ebourg at apache.org> Thu, 18 Sep 2014 10:33:58 +0200
+
+jakarta-jmeter (2.11-1) unstable; urgency=medium
+
+ * New upstream release (Closes: #690031)
+ - Refreshed the patches
+ - Added new dependencies on libjsoup-java, librsyntaxtextarea-java
+ and libmongodb-java
+ - Removed 03_bouncycastle_update.patch (fixed upstream)
+ * Improved the application icon
+ * Install ApacheJMeter_native.jar in the main jmeter package
+ * Packaged the MongoDB testing module as jmeter-mongodb
+ * Added keywords to the desktop shortcut
+ * Split 02_disable_components.patch into 3 patches
+ * Use XZ compression for the upstream tarball
+ * debian/rules: Do not mount /usr/share/java in the classpath to avoid build
+ failures on non clean systems
+
+ -- Emmanuel Bourg <ebourg at apache.org> Fri, 18 Jul 2014 12:03:01 +0200
+
+jakarta-jmeter (2.8-2) unstable; urgency=low
+
+ * Renamed the HashTree.replace(Object, Object) method to replaceKey().
+ This avoids a conflict with the new Map.replace(Object, Object) method
+ introduced in Java 8.
+ * Updated the classpath of jorphan.jar to use Commons Collections 3
+ * Standards-Version updated to 3.9.5 (no changes)
+ * Switch to debhelper level 9
+
+ -- Emmanuel Bourg <ebourg at apache.org> Fri, 11 Apr 2014 15:06:06 +0200
+
+jakarta-jmeter (2.8-1) unstable; urgency=low
+
+ * New upstream release
+ * Refreshed the patches
+ * Added a patch improving the help on the command line
+ * Added a manpage
+ * Added new dependencies on libcommons-jexl2-java and libcommons-lang3-java
+ * Locate the JRE in the Java wrapper to avoid the
+ "No JAVA_CMD set for run_java" warning.
+ * Install test.jar in /usr/share/jmeter/lib/junit/
+
+ -- Emmanuel Bourg <ebourg at apache.org> Fri, 05 Jul 2013 16:48:12 +0200
+
+jakarta-jmeter (2.5.1-2) unstable; urgency=low
+
+ * Patched to compile against Bouncy Castle 1.48 (Closes: #713151)
+ * debian/watch: Updated the location of the archives following
+ the graduation of JMeter to a top level project.
+ * Removed the DMUA flag
+ * Bump standards version to 3.9.4. No changes needed.
+ * Use canonical URLs for the Vcs-* fields
+ * debian/rules: Added a clean target to allow rebuilds
+
+ -- Emmanuel Bourg <ebourg at apache.org> Wed, 03 Jul 2013 13:02:38 +0200
+
+jakarta-jmeter (2.5.1-1) unstable; urgency=low
+
+ * New upstream release. (Closes: #641546, LP: #879463)
+ * Change home page URL everywhere.
+ * Add new build dependencies libhttpclient-java, libhttpmime-java for http
+ module. Update build and runtime classpath accordingly.
+ * Refreshed 02_disable_components.patch as per latest source.
+ * Update 'Format' value in debian/copyright.
+ * Point watch file to archive area until we used renamed upstream source.
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com> Thu, 03 May 2012 20:19:04 +0530
+
+jakarta-jmeter (2.4-3) unstable; urgency=low
+
+ * Merge Ubuntu changes (gnumail -> geronimo-javamail).
+ * Use javahelper, *.classpath files to set classpath and runtime
+ dependencies.
+ * Add libbcmail-java, libbcprov-java build dependencies for SMIMEAssetion.
+ * Update 02_disable_components.patch to build SMIMEAssertion* again.
+ * Remove few unneeded/unused dependencies - batik, bsh, gnumail, jboss-j2ee.
+ * Minimize jar lookup in launcher script because classpath has been set in
+ all jar files.
+ * Bump standards version to 3.9.3. No changes needed.
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com> Sat, 21 Apr 2012 16:17:45 +0530
+
+jakarta-jmeter (2.4-2) unstable; urgency=low
+
+ * Team upload.
+ * debian/control
+ - Remove build unnecessary build dependency on quilt.
+ - Update Section of jmeter-apidoc and jmeter-help to be 'doc'
+ - Bump standards version to 3.9.2. No changes needed.
+ * debian/rules
+ - Remove patchsys-quilt.mk.
+ * debian/copyright
+ - Freshen DEP5 fields to address lintian warnings.
+
+ -- tony mancill <tmancill at debian.org> Sat, 17 Sep 2011 20:27:46 -0700
+
+jakarta-jmeter (2.4-1) unstable; urgency=low
+
+ * New upstream version.
+ * debian/control
+ - Add default-jdk-doc to build depends to link against java api docs.
+ - Change build-dep junit -> junit4 as application supports junit4 features
+ now. Change runtime dependency accordingly.
+ - Update short description of all modules.
+ - Standards version 3.9.1. No change needed.
+ * debian/rules, debian/wrappers/jmeter
+ - Updates and fixes for build dependencies/properties and runtime
+ dependencies.
+ * debian/jmeter.install, debian/jmeter.properties
+ - Use upstream provided file. So our own blank file removed.
+ * debian/patches/
+ - 01_fix_batik_imports.patch - Remove. Not used since last version.
+ - 02_disable_components.patch - Refreshed as per current source.
+ - 03_fix_jtidy_call.patch - Remove. No needed anymore.
+ - 04_files_from_upstream.patch - Remove. Not needed anymore.
+ * debian/source/format
+ - Source format 3.0 (quilt).
+ * debian/README.source
+ - Not needed anymore with source format 3.0.
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com> Sat, 16 Apr 2011 20:27:21 +0530
+
+jakarta-jmeter (2.3.4-2) unstable; urgency=low
+
+ * debian/control
+ - Remove libgeronimo-jms-1.1-spec-java from build dependencies.
+ The package does not exist in Debian archive.
+ - Add build dependencies libxmlgraphics-commons-java, rhino. Helps backport
+ of the package to Lenny.
+ - Add libxmlgraphics-commons-java dependency.
+ - Add appropriate dependency to jmeter-jms package.
+ * debian/rules
+ - Add xmlgraphics-commons, js to DEB_JARS.
+ * debian/patches/series
+ - Drop 01_fix_batik_imports.patch from list. This patch is unnecessary with
+ use of libxmlgraphics-commons-java build-dep.
+ * debian/wrappers/jmeter
+ - Add xmlgraphics-commons to classpath.
+ - Add libraries needed by jmeter-jms to classpath.
+ * Thanks to Jan Wagner for spotting most of the problems when doing backport
+ to Lenny.
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com> Wed, 07 Oct 2009 14:17:01 +0530
+
+jakarta-jmeter (2.3.4-1) unstable; urgency=low
+
+ * Initial version: Merge from Ubuntu. (Closes: #505877)
+
+ -- Onkar Shinde <onkarshinde at ubuntu.com> Wed, 30 Sep 2009 10:49:06 +0530
+
Deleted: tags/jakarta-jmeter/2.11-5/debian/patches/08_bouncycastle-1.51.patch
===================================================================
--- trunk/jakarta-jmeter/debian/patches/08_bouncycastle-1.51.patch 2015-11-30 20:48:06 UTC (rev 18921)
+++ tags/jakarta-jmeter/2.11-5/debian/patches/08_bouncycastle-1.51.patch 2015-12-06 15:57:35 UTC (rev 18923)
@@ -1,114 +0,0 @@
-From: Markus Koschany <apo at debian.org>
-Date: Sun, 29 Nov 2015 18:42:07 +0100
-Subject: bouncycastle 1.51
-
----
- .../apache/jmeter/assertions/SMIMEAssertion.java | 22 +++++++++++++---------
- .../assertions/SMIMEAssertionTestElement.java | 5 +++++
- 2 files changed, 18 insertions(+), 9 deletions(-)
-
-diff --git a/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java b/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
-index b0baca9..abcb169 100644
---- a/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
-+++ b/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
-@@ -27,12 +27,12 @@ import java.io.InputStream;
- import java.math.BigInteger;
- import java.security.GeneralSecurityException;
- import java.security.Security;
--import java.security.cert.CertStore;
- import java.security.cert.CertificateException;
- import java.security.cert.CertificateFactory;
- import java.security.cert.X509Certificate;
- import java.util.ArrayList;
- import java.util.Iterator;
-+import java.util.Collection;
- import java.util.List;
- import java.util.Properties;
-
-@@ -53,6 +53,8 @@ import org.bouncycastle.cms.CMSException;
- import org.bouncycastle.cms.SignerInformation;
- import org.bouncycastle.cms.SignerInformationStore;
- import org.bouncycastle.cms.jcajce.JcaX509CertSelectorConverter;
-+import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder;
-+import org.bouncycastle.operator.OperatorCreationException;
- import org.bouncycastle.jce.PrincipalUtil;
- import org.bouncycastle.jce.X509Principal;
- import org.bouncycastle.jce.provider.BouncyCastleProvider;
-@@ -60,6 +62,7 @@ import org.bouncycastle.mail.smime.SMIMEException;
- import org.bouncycastle.mail.smime.SMIMESignedParser;
- import org.bouncycastle.operator.bc.BcDigestCalculatorProvider;
- import org.bouncycastle.x509.extension.X509ExtensionUtil;
-+import org.bouncycastle.util.Store;
-
- /**
- * Helper class which isolates the BouncyCastle code.
-@@ -73,7 +76,8 @@ class SMIMEAssertion {
- super();
- }
-
-- public static AssertionResult getResult(SMIMEAssertionTestElement testElement, SampleResult response, String name) {
-+ public static AssertionResult getResult(SMIMEAssertionTestElement testElement, SampleResult response, String name)
-+ throws OperatorCreationException {
- checkForBouncycastle();
- AssertionResult res = new AssertionResult(name);
- try {
-@@ -143,19 +147,19 @@ class SMIMEAssertion {
- }
-
- private static AssertionResult verifySignature(SMIMEAssertionTestElement testElement, SMIMESignedParser s, String name)
-- throws CMSException {
-+ throws CMSException, OperatorCreationException {
- AssertionResult res = new AssertionResult(name);
-
- try {
-- CertStore certs = s.getCertificatesAndCRLs("Collection", "BC"); // $NON-NLS-1$ // $NON-NLS-2$
-+ Store certStore = s.getCertificates(); // $NON-NLS-1$ // $NON-NLS-2$
- SignerInformationStore signers = s.getSignerInfos();
- Iterator<?> signerIt = signers.getSigners().iterator();
-
- if (signerIt.hasNext()) {
-
- SignerInformation signer = (SignerInformation) signerIt.next();
-- Iterator<?> certIt = certs.getCertificates(
-- (new JcaX509CertSelectorConverter()).getCertSelector(signer.getSID())).iterator();
-+ Collection certCollection = certStore.getMatches(signer.getSID());
-+ Iterator<?> certIt = certCollection.iterator();
-
- if (certIt.hasNext()) {
- // the signer certificate
-@@ -163,9 +167,9 @@ class SMIMEAssertion {
-
- if (testElement.isVerifySignature()) {
-
-- if (!signer.verify(cert.getPublicKey(), "BC")) { // $NON-NLS-1$
-- res.setFailure(true);
-- res.setFailureMessage("Signature is invalid");
-+ if (!signer.verify(new JcaSimpleSignerInfoVerifierBuilder().setProvider("BC").build(cert))) { // $NON-NLS-1$
-+ res.setFailure(true);
-+ res.setFailureMessage("Signature is invalid");
- }
- }
-
-diff --git a/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java b/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java
-index 9fbdd6f..4c9aea4 100644
---- a/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java
-+++ b/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java
-@@ -23,6 +23,7 @@ import java.io.Serializable;
- import org.apache.jmeter.samplers.SampleResult;
- import org.apache.jmeter.testelement.AbstractTestElement;
- import org.apache.jmeter.util.JMeterUtils;
-+import org.bouncycastle.operator.OperatorCreationException;
-
- public class SMIMEAssertionTestElement extends AbstractTestElement implements
- Serializable, Assertion {
-@@ -57,6 +58,10 @@ public class SMIMEAssertionTestElement extends AbstractTestElement implements
- assertionResult.setResultForFailure(JMeterUtils
- .getResString("bouncy_castle_unavailable_message")); //$NON-NLS-1$
- return assertionResult;
-+ } catch (OperatorCreationException e) {
-+ AssertionResult assertionResult = new AssertionResult(getName());
-+ assertionResult.setError(true);
-+ return assertionResult;
- }
- }
-
Copied: tags/jakarta-jmeter/2.11-5/debian/patches/08_bouncycastle-1.51.patch (from rev 18922, trunk/jakarta-jmeter/debian/patches/08_bouncycastle-1.51.patch)
===================================================================
--- tags/jakarta-jmeter/2.11-5/debian/patches/08_bouncycastle-1.51.patch (rev 0)
+++ tags/jakarta-jmeter/2.11-5/debian/patches/08_bouncycastle-1.51.patch 2015-12-06 15:57:35 UTC (rev 18923)
@@ -0,0 +1,118 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sun, 29 Nov 2015 18:42:07 +0100
+Subject: bouncycastle 1.51
+
+Fix FTBFS with bouncycastle >= 1.51. This is apparently fixed in the
+development version of jmeter. The patch can be dropped with jmeter 2.14.
+
+Forwarded: https://bz.apache.org/bugzilla/attachment.cgi?id=33178
+---
+ .../apache/jmeter/assertions/SMIMEAssertion.java | 22 +++++++++++++---------
+ .../assertions/SMIMEAssertionTestElement.java | 5 +++++
+ 2 files changed, 18 insertions(+), 9 deletions(-)
+
+diff --git a/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java b/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
+index b0baca9..abcb169 100644
+--- a/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
++++ b/src/components/org/apache/jmeter/assertions/SMIMEAssertion.java
+@@ -27,12 +27,12 @@ import java.io.InputStream;
+ import java.math.BigInteger;
+ import java.security.GeneralSecurityException;
+ import java.security.Security;
+-import java.security.cert.CertStore;
+ import java.security.cert.CertificateException;
+ import java.security.cert.CertificateFactory;
+ import java.security.cert.X509Certificate;
+ import java.util.ArrayList;
+ import java.util.Iterator;
++import java.util.Collection;
+ import java.util.List;
+ import java.util.Properties;
+
+@@ -53,6 +53,8 @@ import org.bouncycastle.cms.CMSException;
+ import org.bouncycastle.cms.SignerInformation;
+ import org.bouncycastle.cms.SignerInformationStore;
+ import org.bouncycastle.cms.jcajce.JcaX509CertSelectorConverter;
++import org.bouncycastle.cms.jcajce.JcaSimpleSignerInfoVerifierBuilder;
++import org.bouncycastle.operator.OperatorCreationException;
+ import org.bouncycastle.jce.PrincipalUtil;
+ import org.bouncycastle.jce.X509Principal;
+ import org.bouncycastle.jce.provider.BouncyCastleProvider;
+@@ -60,6 +62,7 @@ import org.bouncycastle.mail.smime.SMIMEException;
+ import org.bouncycastle.mail.smime.SMIMESignedParser;
+ import org.bouncycastle.operator.bc.BcDigestCalculatorProvider;
+ import org.bouncycastle.x509.extension.X509ExtensionUtil;
++import org.bouncycastle.util.Store;
+
+ /**
+ * Helper class which isolates the BouncyCastle code.
+@@ -73,7 +76,8 @@ class SMIMEAssertion {
+ super();
+ }
+
+- public static AssertionResult getResult(SMIMEAssertionTestElement testElement, SampleResult response, String name) {
++ public static AssertionResult getResult(SMIMEAssertionTestElement testElement, SampleResult response, String name)
++ throws OperatorCreationException {
+ checkForBouncycastle();
+ AssertionResult res = new AssertionResult(name);
+ try {
+@@ -143,19 +147,19 @@ class SMIMEAssertion {
+ }
+
+ private static AssertionResult verifySignature(SMIMEAssertionTestElement testElement, SMIMESignedParser s, String name)
+- throws CMSException {
++ throws CMSException, OperatorCreationException {
+ AssertionResult res = new AssertionResult(name);
+
+ try {
+- CertStore certs = s.getCertificatesAndCRLs("Collection", "BC"); // $NON-NLS-1$ // $NON-NLS-2$
++ Store certStore = s.getCertificates(); // $NON-NLS-1$ // $NON-NLS-2$
+ SignerInformationStore signers = s.getSignerInfos();
+ Iterator<?> signerIt = signers.getSigners().iterator();
+
+ if (signerIt.hasNext()) {
+
+ SignerInformation signer = (SignerInformation) signerIt.next();
+- Iterator<?> certIt = certs.getCertificates(
+- (new JcaX509CertSelectorConverter()).getCertSelector(signer.getSID())).iterator();
++ Collection certCollection = certStore.getMatches(signer.getSID());
++ Iterator<?> certIt = certCollection.iterator();
+
+ if (certIt.hasNext()) {
+ // the signer certificate
+@@ -163,9 +167,9 @@ class SMIMEAssertion {
+
+ if (testElement.isVerifySignature()) {
+
+- if (!signer.verify(cert.getPublicKey(), "BC")) { // $NON-NLS-1$
+- res.setFailure(true);
+- res.setFailureMessage("Signature is invalid");
++ if (!signer.verify(new JcaSimpleSignerInfoVerifierBuilder().setProvider("BC").build(cert))) { // $NON-NLS-1$
++ res.setFailure(true);
++ res.setFailureMessage("Signature is invalid");
+ }
+ }
+
+diff --git a/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java b/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java
+index 9fbdd6f..4c9aea4 100644
+--- a/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java
++++ b/src/components/org/apache/jmeter/assertions/SMIMEAssertionTestElement.java
+@@ -23,6 +23,7 @@ import java.io.Serializable;
+ import org.apache.jmeter.samplers.SampleResult;
+ import org.apache.jmeter.testelement.AbstractTestElement;
+ import org.apache.jmeter.util.JMeterUtils;
++import org.bouncycastle.operator.OperatorCreationException;
+
+ public class SMIMEAssertionTestElement extends AbstractTestElement implements
+ Serializable, Assertion {
+@@ -57,6 +58,10 @@ public class SMIMEAssertionTestElement extends AbstractTestElement implements
+ assertionResult.setResultForFailure(JMeterUtils
+ .getResString("bouncy_castle_unavailable_message")); //$NON-NLS-1$
+ return assertionResult;
++ } catch (OperatorCreationException e) {
++ AssertionResult assertionResult = new AssertionResult(getName());
++ assertionResult.setError(true);
++ return assertionResult;
+ }
+ }
+
More information about the pkg-java-commits
mailing list