Repository: cxf Updated Branches: refs/heads/3.0.x-fixes cb538a459 -> bee60953d
Minor change Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1870f95d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1870f95d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1870f95d Branch: refs/heads/3.0.x-fixes Commit: 1870f95d4f24a6b0e8411ffc18a32662422c3de7 Parents: cb538a4 Author: Colm O hEigeartaigh <[email protected]> Authored: Wed Nov 4 11:44:48 2015 +0000 Committer: Colm O hEigeartaigh <[email protected]> Committed: Wed Nov 4 17:53:36 2015 +0000 ---------------------------------------------------------------------- .../java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java | 4 ++-- .../java/org/apache/cxf/rs/security/jose/jws/JwsUtils.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/1870f95d/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java index af7dd22..a40c619 100644 --- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java +++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java @@ -325,7 +325,7 @@ public final class JweUtils { if (includeCert) { JwkUtils.includeCertChain(jwk, headers, keyEncryptionAlgo); } - if (includeCertSha1 && headers != null) { + if (includeCertSha1) { String digest = KeyManagementUtils.loadDigestAndEncodeX509Certificate(m, props); if (digest != null) { headers.setX509Thumbprint(digest); @@ -345,7 +345,7 @@ public final class JweUtils { if (includeCert) { headers.setX509Chain(KeyManagementUtils.loadAndEncodeX509CertificateOrChain(m, props)); } - if (includeCertSha1 && headers != null) { + if (includeCertSha1) { String digest = KeyManagementUtils.loadDigestAndEncodeX509Certificate(m, props); if (digest != null) { headers.setX509Thumbprint(digest); http://git-wip-us.apache.org/repos/asf/cxf/blob/1870f95d/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 74e3629..a79d124 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 @@ -287,7 +287,7 @@ public final class JwsUtils { if (includeCert) { JwkUtils.includeCertChain(jwk, headers, signatureAlgo); } - if (includeCertSha1 && headers != null) { + if (includeCertSha1) { String digest = KeyManagementUtils.loadDigestAndEncodeX509Certificate(m, props); if (digest != null) { headers.setX509Thumbprint(digest); @@ -305,10 +305,10 @@ public final class JwsUtils { PrivateKey pk = KeyManagementUtils.loadPrivateKey(m, props, KeyOperation.SIGN); theSigProvider = getPrivateKeySignatureProvider(pk, SignatureAlgorithm.getAlgorithm(signatureAlgo)); - if (includeCert && headers != null) { + if (includeCert) { headers.setX509Chain(KeyManagementUtils.loadAndEncodeX509CertificateOrChain(m, props)); } - if (includeCertSha1 && headers != null) { + if (includeCertSha1) { String digest = KeyManagementUtils.loadDigestAndEncodeX509Certificate(m, props); if (digest != null) { headers.setX509Thumbprint(digest);
