You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2015/07/10 13:03:00 UTC
svn commit: r1690242 - in /santuario/xml-security-java/trunk: ./
src/test/java/javax/xml/crypto/test/dsig/
src/test/java/org/apache/xml/security/test/dom/algorithms/
src/test/java/org/apache/xml/security/test/dom/encryption/
src/test/java/org/apache/xm...
Author: coheigea
Date: Fri Jul 10 11:02:59 2015
New Revision: 1690242
URL: http://svn.apache.org/r1690242
Log:
Uninstall BouncyCastle after use
Modified:
santuario/xml-security-java/trunk/pom.xml
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/HMACSignatureAlgorithmTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PKSignatureAlgorithmTest.java
santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignatureDigestMethodTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/DigestAlgorithmTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/HMACSignatureAlgorithmTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/KeyWrapEncryptionAlgorithmTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/PKSignatureAlgorithmTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SymmetricEncryptionAlgorithmTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/DEREncodedKeyValueTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/DEREncodedKeyValueResolverTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionCreationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionVerificationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionCreationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionVerificationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/XMLEncryption11Test.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureCreationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureVerificationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestCreationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestVerificationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACCreationTest.java
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACVerificationTest.java
Modified: santuario/xml-security-java/trunk/pom.xml
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/pom.xml?rev=1690242&r1=1690241&r2=1690242&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/pom.xml (original)
+++ santuario/xml-security-java/trunk/pom.xml Fri Jul 10 11:02:59 2015
@@ -298,7 +298,6 @@
<configuration>
<reportFormat>brief</reportFormat>
<useFile>false</useFile>
- <forkMode>pertest</forkMode>
<childDelegation>false</childDelegation>
<includes>
<include>**/*Test.java</include>
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/HMACSignatureAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/HMACSignatureAlgorithmTest.java?rev=1690242&r1=1690241&r2=1690242&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/HMACSignatureAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/HMACSignatureAlgorithmTest.java Fri Jul 10 11:02:59 2015
@@ -104,6 +104,11 @@ public class HMACSignatureAlgorithmTest
sks = new KeySelectors.SecretKeySelector("testkey".getBytes("ASCII"));
}
+ @org.junit.AfterClass
+ public static void cleanup() throws Exception {
+ Security.removeProvider("org.bouncycastle.jce.provider.BouncyCastleProvider");
+ }
+
@org.junit.Test
public void testHMACSHA1() throws Exception {
test_create_signature_enveloping(hmacSha1, sha1, null,
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PKSignatureAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PKSignatureAlgorithmTest.java?rev=1690242&r1=1690241&r2=1690242&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PKSignatureAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/PKSignatureAlgorithmTest.java Fri Jul 10 11:02:59 2015
@@ -147,6 +147,11 @@ public class PKSignatureAlgorithmTest ex
(kifac.newKeyValue(ecKeyPair.getPublic())));
}
+ @org.junit.AfterClass
+ public static void cleanup() throws Exception {
+ Security.removeProvider("org.bouncycastle.jce.provider.BouncyCastleProvider");
+ }
+
@org.junit.Test
public void testRSA_SHA1() throws Exception {
test_create_signature_enveloping(rsaSha1, sha1, rsaki,
Modified: santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignatureDigestMethodTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignatureDigestMethodTest.java?rev=1690242&r1=1690241&r2=1690242&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignatureDigestMethodTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/javax/xml/crypto/test/dsig/SignatureDigestMethodTest.java Fri Jul 10 11:02:59 2015
@@ -118,6 +118,11 @@ public class SignatureDigestMethodTest e
kvks = new KeySelectors.KeyValueKeySelector();
}
+ @org.junit.AfterClass
+ public static void cleanup() throws Exception {
+ Security.removeProvider("org.bouncycastle.jce.provider.BouncyCastleProvider");
+ }
+
@org.junit.Test
public void testSHA1() throws Exception {
test_create_signature_enveloping(rsaSha1, sha1, rsaki,
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/DigestAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/DigestAlgorithmTest.java?rev=1690242&r1=1690241&r2=1690242&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/DigestAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/DigestAlgorithmTest.java Fri Jul 10 11:02:59 2015
@@ -60,6 +60,11 @@ public class DigestAlgorithmTest extends
}
}
+ @org.junit.AfterClass
+ public static void cleanup() throws Exception {
+ Security.removeProvider("org.bouncycastle.jce.provider.BouncyCastleProvider");
+ }
+
@org.junit.Test
public void testSHA1() throws Exception {
Document doc = XMLUtils.createDocumentBuilder(false).newDocument();
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/HMACSignatureAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/HMACSignatureAlgorithmTest.java?rev=1690242&r1=1690241&r2=1690242&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/HMACSignatureAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/HMACSignatureAlgorithmTest.java Fri Jul 10 11:02:59 2015
@@ -74,6 +74,11 @@ public class HMACSignatureAlgorithmTest
}
}
}
+
+ @org.junit.AfterClass
+ public static void cleanup() throws Exception {
+ Security.removeProvider("org.bouncycastle.jce.provider.BouncyCastleProvider");
+ }
@org.junit.Test
public void testHMACSHA1() throws Exception {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/KeyWrapEncryptionAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/KeyWrapEncryptionAlgorithmTest.java?rev=1690242&r1=1690241&r2=1690242&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/KeyWrapEncryptionAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/KeyWrapEncryptionAlgorithmTest.java Fri Jul 10 11:02:59 2015
@@ -82,6 +82,11 @@ public class KeyWrapEncryptionAlgorithmT
rsaKeyPair = KeyPairGenerator.getInstance("RSA").genKeyPair();
}
+
+ @org.junit.AfterClass
+ public static void cleanup() throws Exception {
+ Security.removeProvider("org.bouncycastle.jce.provider.BouncyCastleProvider");
+ }
@org.junit.Test
public void testAES128KW() throws Exception {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/PKSignatureAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/PKSignatureAlgorithmTest.java?rev=1690242&r1=1690241&r2=1690242&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/PKSignatureAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/PKSignatureAlgorithmTest.java Fri Jul 10 11:02:59 2015
@@ -82,6 +82,11 @@ public class PKSignatureAlgorithmTest ex
ecKeyPair = KeyPairGenerator.getInstance("EC").genKeyPair();
}
+
+ @org.junit.AfterClass
+ public static void cleanup() throws Exception {
+ Security.removeProvider("org.bouncycastle.jce.provider.BouncyCastleProvider");
+ }
@org.junit.Test
public void testRSA_MD5() throws Exception {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SymmetricEncryptionAlgorithmTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SymmetricEncryptionAlgorithmTest.java?rev=1690242&r1=1690241&r2=1690242&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SymmetricEncryptionAlgorithmTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/algorithms/SymmetricEncryptionAlgorithmTest.java Fri Jul 10 11:02:59 2015
@@ -73,6 +73,11 @@ public class SymmetricEncryptionAlgorith
}
}
}
+
+ @org.junit.AfterClass
+ public static void cleanup() throws Exception {
+ Security.removeProvider("org.bouncycastle.jce.provider.BouncyCastleProvider");
+ }
@org.junit.Test
public void testAES128() throws Exception {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java?rev=1690242&r1=1690241&r2=1690242&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLCipherTest.java Fri Jul 10 11:02:59 2015
@@ -136,6 +136,11 @@ public class XMLCipherTest extends org.j
}
+ @org.junit.AfterClass
+ public static void cleanup() throws Exception {
+ Security.removeProvider("org.bouncycastle.jce.provider.BouncyCastleProvider");
+ }
+
/**
* Test encryption using a generated AES 128 bit key that is
* encrypted using a AES 192 bit key. Then reverse using the KEK
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java?rev=1690242&r1=1690241&r2=1690242&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/encryption/XMLEncryption11Test.java Fri Jul 10 11:02:59 2015
@@ -139,6 +139,11 @@ public class XMLEncryption11Test extends
}
}
+ @org.junit.AfterClass
+ public static void cleanup() throws Exception {
+ Security.removeProvider("org.bouncycastle.jce.provider.BouncyCastleProvider");
+ }
+
/**
* rsa-oaep-mgf1p, Digest:SHA256, MGF:SHA1, PSource: None
*/
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/DEREncodedKeyValueTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/DEREncodedKeyValueTest.java?rev=1690242&r1=1690241&r2=1690242&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/DEREncodedKeyValueTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/DEREncodedKeyValueTest.java Fri Jul 10 11:02:59 2015
@@ -77,6 +77,11 @@ public class DEREncodedKeyValueTest exte
dsaKeyControl = loadPublicKey("dsa.key", "DSA");
}
+ @org.junit.AfterClass
+ public static void cleanup() throws Exception {
+ Security.removeProvider("org.bouncycastle.jce.provider.BouncyCastleProvider");
+ }
+
@org.junit.Test
public void testSchema() throws Exception {
DEREncodedKeyValue derEncodedKeyValue = new DEREncodedKeyValue(documentBuilder.newDocument(), rsaKeyControl);
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/DEREncodedKeyValueResolverTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/DEREncodedKeyValueResolverTest.java?rev=1690242&r1=1690241&r2=1690242&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/DEREncodedKeyValueResolverTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/keys/keyresolver/DEREncodedKeyValueResolverTest.java Fri Jul 10 11:02:59 2015
@@ -78,6 +78,11 @@ public class DEREncodedKeyValueResolverT
}
}
+ @org.junit.AfterClass
+ public static void cleanup() throws Exception {
+ Security.removeProvider("org.bouncycastle.jce.provider.BouncyCastleProvider");
+ }
+
@org.junit.Test
public void testRSAPublicKey() throws Exception {
Document doc = loadXML("DEREncodedKeyValue-RSA.xml");
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java?rev=1690242&r1=1690241&r2=1690242&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/dom/signature/ECDSASignatureTest.java Fri Jul 10 11:02:59 2015
@@ -90,6 +90,11 @@ public class ECDSASignatureTest extends
db = XMLUtils.createDocumentBuilder(false);
org.apache.xml.security.Init.init();
}
+
+ @org.junit.AfterClass
+ public static void cleanup() throws Exception {
+ Security.removeProvider("org.bouncycastle.jce.provider.BouncyCastleProvider");
+ }
@org.junit.Test
public void testOne() throws Exception {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionCreationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionCreationTest.java?rev=1690242&r1=1690241&r2=1690242&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionCreationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionCreationTest.java Fri Jul 10 11:02:59 2015
@@ -95,6 +95,11 @@ public class KeyWrapEncryptionCreationTe
rsaKeyPair = KeyPairGenerator.getInstance("RSA").genKeyPair();
}
+ @org.junit.AfterClass
+ public static void cleanup() throws Exception {
+ Security.removeProvider("org.bouncycastle.jce.provider.BouncyCastleProvider");
+ }
+
@Test
public void testAES128KW() throws Exception {
// Set up the Configuration
@@ -844,4 +849,4 @@ public class KeyWrapEncryptionCreationTe
return cipher.doFinal(document, ee);
}
-}
\ No newline at end of file
+}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionVerificationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionVerificationTest.java?rev=1690242&r1=1690241&r2=1690242&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionVerificationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/KeyWrapEncryptionVerificationTest.java Fri Jul 10 11:02:59 2015
@@ -102,6 +102,11 @@ public class KeyWrapEncryptionVerificati
rsaKeyPair = KeyPairGenerator.getInstance("RSA").genKeyPair();
}
+ @org.junit.AfterClass
+ public static void cleanup() throws Exception {
+ Security.removeProvider("org.bouncycastle.jce.provider.BouncyCastleProvider");
+ }
+
@Test
public void testAES128KW() throws Exception {
// Read in plaintext document
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionCreationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionCreationTest.java?rev=1690242&r1=1690241&r2=1690242&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionCreationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionCreationTest.java Fri Jul 10 11:02:59 2015
@@ -87,6 +87,11 @@ public class SymmetricEncryptionCreation
}
}
+ @org.junit.AfterClass
+ public static void cleanup() throws Exception {
+ Security.removeProvider("org.bouncycastle.jce.provider.BouncyCastleProvider");
+ }
+
@Test
public void testAES128() throws Exception {
// Set up the Configuration
@@ -755,4 +760,4 @@ public class SymmetricEncryptionCreation
return cipher.doFinal(document, ee);
}
-}
\ No newline at end of file
+}
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionVerificationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionVerificationTest.java?rev=1690242&r1=1690241&r2=1690242&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionVerificationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/SymmetricEncryptionVerificationTest.java Fri Jul 10 11:02:59 2015
@@ -98,6 +98,11 @@ public class SymmetricEncryptionVerifica
}
}
+ @org.junit.AfterClass
+ public static void cleanup() throws Exception {
+ Security.removeProvider("org.bouncycastle.jce.provider.BouncyCastleProvider");
+ }
+
@Test
public void testAES128() throws Exception {
// Read in plaintext document
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/XMLEncryption11Test.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/XMLEncryption11Test.java?rev=1690242&r1=1690241&r2=1690242&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/XMLEncryption11Test.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/encryption/XMLEncryption11Test.java Fri Jul 10 11:02:59 2015
@@ -105,6 +105,11 @@ public class XMLEncryption11Test extends
nodeCount = countNodes(doc);
}
+ @org.junit.AfterClass
+ public static void cleanup() throws Exception {
+ Security.removeProvider("org.bouncycastle.jce.provider.BouncyCastleProvider");
+ }
+
/**
* rsa-oaep-mgf1p, Digest:SHA256, MGF:SHA1, PSource: None
*/
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureCreationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureCreationTest.java?rev=1690242&r1=1690241&r2=1690242&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureCreationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureCreationTest.java Fri Jul 10 11:02:59 2015
@@ -80,6 +80,11 @@ public class PKSignatureCreationTest ext
ecKeyPair = KeyPairGenerator.getInstance("EC").genKeyPair();
}
+ @org.junit.AfterClass
+ public static void cleanup() throws Exception {
+ Security.removeProvider("org.bouncycastle.jce.provider.BouncyCastleProvider");
+ }
+
@Test
public void testRSA_SHA1() throws Exception {
// Set up the Configuration
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureVerificationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureVerificationTest.java?rev=1690242&r1=1690241&r2=1690242&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureVerificationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/PKSignatureVerificationTest.java Fri Jul 10 11:02:59 2015
@@ -92,6 +92,11 @@ public class PKSignatureVerificationTest
ecKeyPair = KeyPairGenerator.getInstance("EC").genKeyPair();
}
+
+ @org.junit.AfterClass
+ public static void cleanup() throws Exception {
+ Security.removeProvider("org.bouncycastle.jce.provider.BouncyCastleProvider");
+ }
@Test
public void testRSA_SHA1() throws Exception {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestCreationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestCreationTest.java?rev=1690242&r1=1690241&r2=1690242&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestCreationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestCreationTest.java Fri Jul 10 11:02:59 2015
@@ -76,6 +76,11 @@ public class SignatureDigestCreationTest
}
}
+ @org.junit.AfterClass
+ public static void cleanup() throws Exception {
+ Security.removeProvider("org.bouncycastle.jce.provider.BouncyCastleProvider");
+ }
+
@Test
public void testSHA1() throws Exception {
// Set up the Configuration
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestVerificationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestVerificationTest.java?rev=1690242&r1=1690241&r2=1690242&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestVerificationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureDigestVerificationTest.java Fri Jul 10 11:02:59 2015
@@ -87,6 +87,11 @@ public class SignatureDigestVerification
}
}
}
+
+ @org.junit.AfterClass
+ public static void cleanup() throws Exception {
+ Security.removeProvider("org.bouncycastle.jce.provider.BouncyCastleProvider");
+ }
@Test
public void testSHA1() throws Exception {
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACCreationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACCreationTest.java?rev=1690242&r1=1690241&r2=1690242&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACCreationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACCreationTest.java Fri Jul 10 11:02:59 2015
@@ -71,6 +71,11 @@ public class SignatureHMACCreationTest e
}
}
+ @org.junit.AfterClass
+ public static void cleanup() throws Exception {
+ Security.removeProvider("org.bouncycastle.jce.provider.BouncyCastleProvider");
+ }
+
@Test
public void testHMACSHA1() throws Exception {
// Set up the Configuration
Modified: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACVerificationTest.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACVerificationTest.java?rev=1690242&r1=1690241&r2=1690242&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACVerificationTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/stax/signature/SignatureHMACVerificationTest.java Fri Jul 10 11:02:59 2015
@@ -85,6 +85,11 @@ public class SignatureHMACVerificationTe
}
}
}
+
+ @org.junit.AfterClass
+ public static void cleanup() throws Exception {
+ Security.removeProvider("org.bouncycastle.jce.provider.BouncyCastleProvider");
+ }
@Test
public void testHMACSHA1() throws Exception {