cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [3/3] cxf git commit: Fixing merge
Date Mon, 30 Nov 2015 17:22:01 GMT
Fixing merge


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

Branch: refs/heads/3.0.x-fixes
Commit: 1c635e00afbaaa20a0bfe0e9a61b8cfbe0a2d233
Parents: 992739b
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Mon Nov 30 17:21:47 2015 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Mon Nov 30 17:21:47 2015 +0000

----------------------------------------------------------------------
 .../java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java  | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/1c635e00/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java
----------------------------------------------------------------------
diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java
b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java
index 7a020ef..b17f7d3 100644
--- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java
+++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java
@@ -386,16 +386,11 @@ public final class JwsUtils {
                 && SignatureAlgorithm.NONE.getJwaName().equals(inHeaders.getAlgorithm()))
{
                 theVerifier = new NoneJwsSignatureVerifier();
             } else {
-<<<<<<< HEAD
-                theVerifier = getPublicKeySignatureVerifier(
-                              KeyManagementUtils.loadPublicKey(m, props), 
-                              SignatureAlgorithm.getAlgorithm(signatureAlgo));
-=======
                 X509Certificate[] certs = KeyManagementUtils.loadX509CertificateOrChain(m,
props);
                 if (certs != null && certs.length > 0) {
-                    theVerifier = getPublicKeySignatureVerifier(certs[0], signatureAlgo);
+                    theVerifier = getPublicKeySignatureVerifier(certs[0],
+                        SignatureAlgorithm.getAlgorithm(signatureAlgo));
                 }
->>>>>>> a400eaa... Set a security context up from the JWS cert
             }
         }
         if (theVerifier == null && !ignoreNullVerifier) {


Mime
View raw message