[3/3] cxf git commit: Unregister BouncyCastle properly

2015-10-15 Thread coheigea 
Unregister BouncyCastle properly


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7a02829e
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7a02829e
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7a02829e

Branch: refs/heads/3.0.x-fixes
Commit: 7a02829e62aa273db3e0966ee961ae6f0c25183a
Parents: e139b83
Author: Colm O hEigeartaigh 
Authored: Thu Oct 15 14:47:27 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu Oct 15 14:49:32 2015 +0100

--
 .../cxf/rs/security/jose/jwe/AbstractJweEncryption.java  | 1 +
 .../cxf/rs/security/jose/cookbook/JwsJoseCookBookTest.java   | 8 
 .../cxf/rs/security/jose/jwe/JweCompactReaderWriterTest.java | 2 +-
 .../apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java | 2 +-
 .../apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java | 2 +-
 .../cxf/rs/security/jose/jwe/JwePbeHmacAesWrapTest.java  | 2 +-
 .../org/apache/cxf/rs/security/jose/jwk/JsonWebKeyTest.java  | 4 ++--
 .../cxf/rs/security/jose/jws/JwsCompactReaderWriterTest.java | 2 +-
 .../cxf/systest/jaxrs/security/jwt/JAXRSJweJwsTest.java  | 2 +-
 .../cxf/systest/jaxrs/security/jwt/JAXRSJwsJsonTest.java | 2 +-
 10 files changed, 14 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/7a02829e/rt/rs/security/jose/jose-core/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
--
diff --git 
a/rt/rs/security/jose/jose-core/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
 
b/rt/rs/security/jose/jose-core/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
index 561df8d..acc9933 100644
--- 
a/rt/rs/security/jose/jose-core/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
+++ 
b/rt/rs/security/jose/jose-core/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
@@ -128,6 +128,7 @@ public abstract class AbstractJweEncryption implements 
JweEncryptionProvider {
 try {
 return CryptoUtils.encryptBytes(content, 
createCekSecretKey(state), state.keyProps);
 } catch (SecurityException ex) {
+LOG.fine(ex.getMessage());
 if (ex.getCause() instanceof NoSuchAlgorithmException) {
 LOG.warning("Unsupported algorithm: " + 
state.keyProps.getKeyAlgo());
 throw new 
JweException(JweException.Error.INVALID_CONTENT_ALGORITHM);

http://git-wip-us.apache.org/repos/asf/cxf/blob/7a02829e/rt/rs/security/jose/jose-core/src/test/java/org/apache/cxf/rs/security/jose/cookbook/JwsJoseCookBookTest.java
--
diff --git 
a/rt/rs/security/jose/jose-core/src/test/java/org/apache/cxf/rs/security/jose/cookbook/JwsJoseCookBookTest.java
 
b/rt/rs/security/jose/jose-core/src/test/java/org/apache/cxf/rs/security/jose/cookbook/JwsJoseCookBookTest.java
index 1c1bb04..40fb210 100644
--- 
a/rt/rs/security/jose/jose-core/src/test/java/org/apache/cxf/rs/security/jose/cookbook/JwsJoseCookBookTest.java
+++ 
b/rt/rs/security/jose/jose-core/src/test/java/org/apache/cxf/rs/security/jose/cookbook/JwsJoseCookBookTest.java
@@ -434,7 +434,7 @@ public class JwsJoseCookBookTest {
 jsonConsumer = new 
JwsJsonConsumer(jsonProducer.getJwsJsonSignedDocument());
 assertTrue(jsonConsumer.verifySignatureWith(rsaPublicKey, 
SignatureAlgorithm.PS384));
 
-Security.removeProvider(BouncyCastleProvider.class.getName());
+Security.removeProvider(BouncyCastleProvider.PROVIDER_NAME);
 }
 @Test
 public void testECDSASignature() throws Exception {
@@ -468,7 +468,7 @@ public class JwsJoseCookBookTest {
 JsonWebKey ecPublicKey = publicKeys.get(0);
 assertTrue(compactConsumer.verifySignatureWith(ecPublicKey, 
SignatureAlgorithm.ES512));
 } finally {
-Security.removeProvider(BouncyCastleProvider.class.getName());
+Security.removeProvider(BouncyCastleProvider.PROVIDER_NAME);
 }
 }
 @Test
@@ -654,7 +654,7 @@ public class JwsJoseCookBookTest {
 assertTrue(jsonConsumer.verifySignatureWith(ecPublicKey, 
SignatureAlgorithm.ES512));
 assertTrue(jsonConsumer.verifySignatureWith(hmacKey, 
SignatureAlgorithm.HS256));
 } finally {
-Security.removeProvider(BouncyCastleProvider.class.getName());
+Security.removeProvider(BouncyCastleProvider.PROVIDER_NAME);
 }
 }
 public JsonWebKeys readKeySet(String fileName) throws Exception {
@@ -662,4 +662,4 @@ public class JwsJoseCookBookTest {
 String s = IOUtils.readStringFromStream(is);
 return JwkUtils.readJwkSet(s);
 }
-}
\ No newline at end of file
+}

[3/3] cxf git commit: Unregister BouncyCastle properly

2015-10-15 Thread coheigea 
Unregister BouncyCastle properly


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6d630272
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6d630272
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6d630272

Branch: refs/heads/master
Commit: 6d6302720706434c10b8581bc2d06b19db8fb7ed
Parents: 2f9874b
Author: Colm O hEigeartaigh 
Authored: Thu Oct 15 14:47:27 2015 +0100
Committer: Colm O hEigeartaigh 
Committed: Thu Oct 15 14:47:27 2015 +0100

--
 .../cxf/rs/security/jose/jwe/AbstractJweEncryption.java  | 1 +
 .../cxf/rs/security/jose/cookbook/JwsJoseCookBookTest.java   | 8 
 .../cxf/rs/security/jose/jwe/JweCompactReaderWriterTest.java | 2 +-
 .../apache/cxf/rs/security/jose/jwe/JweJsonConsumerTest.java | 2 +-
 .../apache/cxf/rs/security/jose/jwe/JweJsonProducerTest.java | 2 +-
 .../cxf/rs/security/jose/jwe/JwePbeHmacAesWrapTest.java  | 2 +-
 .../org/apache/cxf/rs/security/jose/jwk/JsonWebKeyTest.java  | 4 ++--
 .../cxf/rs/security/jose/jws/JwsCompactReaderWriterTest.java | 2 +-
 .../cxf/systest/jaxrs/security/jwt/JAXRSJweJwsTest.java  | 2 +-
 .../cxf/systest/jaxrs/security/jwt/JAXRSJwsJsonTest.java | 2 +-
 10 files changed, 14 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cxf/blob/6d630272/rt/rs/security/jose/jose-core/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
--
diff --git 
a/rt/rs/security/jose/jose-core/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
 
b/rt/rs/security/jose/jose-core/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
index 561df8d..acc9933 100644
--- 
a/rt/rs/security/jose/jose-core/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
+++ 
b/rt/rs/security/jose/jose-core/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractJweEncryption.java
@@ -128,6 +128,7 @@ public abstract class AbstractJweEncryption implements 
JweEncryptionProvider {
 try {
 return CryptoUtils.encryptBytes(content, 
createCekSecretKey(state), state.keyProps);
 } catch (SecurityException ex) {
+LOG.fine(ex.getMessage());
 if (ex.getCause() instanceof NoSuchAlgorithmException) {
 LOG.warning("Unsupported algorithm: " + 
state.keyProps.getKeyAlgo());
 throw new 
JweException(JweException.Error.INVALID_CONTENT_ALGORITHM);

http://git-wip-us.apache.org/repos/asf/cxf/blob/6d630272/rt/rs/security/jose/jose-core/src/test/java/org/apache/cxf/rs/security/jose/cookbook/JwsJoseCookBookTest.java
--
diff --git 
a/rt/rs/security/jose/jose-core/src/test/java/org/apache/cxf/rs/security/jose/cookbook/JwsJoseCookBookTest.java
 
b/rt/rs/security/jose/jose-core/src/test/java/org/apache/cxf/rs/security/jose/cookbook/JwsJoseCookBookTest.java
index 1c1bb04..40fb210 100644
--- 
a/rt/rs/security/jose/jose-core/src/test/java/org/apache/cxf/rs/security/jose/cookbook/JwsJoseCookBookTest.java
+++ 
b/rt/rs/security/jose/jose-core/src/test/java/org/apache/cxf/rs/security/jose/cookbook/JwsJoseCookBookTest.java
@@ -434,7 +434,7 @@ public class JwsJoseCookBookTest {
 jsonConsumer = new 
JwsJsonConsumer(jsonProducer.getJwsJsonSignedDocument());
 assertTrue(jsonConsumer.verifySignatureWith(rsaPublicKey, 
SignatureAlgorithm.PS384));
 
-Security.removeProvider(BouncyCastleProvider.class.getName());
+Security.removeProvider(BouncyCastleProvider.PROVIDER_NAME);
 }
 @Test
 public void testECDSASignature() throws Exception {
@@ -468,7 +468,7 @@ public class JwsJoseCookBookTest {
 JsonWebKey ecPublicKey = publicKeys.get(0);
 assertTrue(compactConsumer.verifySignatureWith(ecPublicKey, 
SignatureAlgorithm.ES512));
 } finally {
-Security.removeProvider(BouncyCastleProvider.class.getName());
+Security.removeProvider(BouncyCastleProvider.PROVIDER_NAME);
 }
 }
 @Test
@@ -654,7 +654,7 @@ public class JwsJoseCookBookTest {
 assertTrue(jsonConsumer.verifySignatureWith(ecPublicKey, 
SignatureAlgorithm.ES512));
 assertTrue(jsonConsumer.verifySignatureWith(hmacKey, 
SignatureAlgorithm.HS256));
 } finally {
-Security.removeProvider(BouncyCastleProvider.class.getName());
+Security.removeProvider(BouncyCastleProvider.PROVIDER_NAME);
 }
 }
 public JsonWebKeys readKeySet(String fileName) throws Exception {
@@ -662,4 +662,4 @@ public class JwsJoseCookBookTest {
 String s = IOUtils.readStringFromStream(is);
 return JwkUtils.readJwkSet(s);
 }
-}
\ No newline at end of file
+}

htt