cxf-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Colm O hEigeartaigh <cohei...@apache.org>
Subject Re: [1/5] cxf git commit: Minor change
Date Wed, 04 Nov 2015 14:58:16 GMT
I removed them because no other code in CXF apart from the JWT classes was
using them. I will restore them though.

Colm.

On Wed, Nov 4, 2015 at 2:53 PM, Sergey Beryozkin <sberyozkin@gmail.com>
wrote:

> Hi Colm,
>
> Why did you remove AbstractJoseConsumer/Producer ?
>
> Not only JWT tokens can be signed/encrypted
>
> Can you please restore those ?
>
> Thanks, Sergey
>
>
>
>
>
> On 04/11/15 14:45, coheigea@apache.org wrote:
>
>> Repository: cxf
>> Updated Branches:
>>    refs/heads/master 33b3e3cd5 -> cb686be9d
>>
>>
>> Minor change
>>
>>
>> Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
>> Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/55f11ca2
>> Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/55f11ca2
>> Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/55f11ca2
>>
>> Branch: refs/heads/master
>> Commit: 55f11ca29cfaecb9fd3fb8892f05bcea8f36576e
>> Parents: 33b3e3c
>> Author: Colm O hEigeartaigh <coheigea@apache.org>
>> Authored: Wed Nov 4 11:44:48 2015 +0000
>> Committer: Colm O hEigeartaigh <coheigea@apache.org>
>> Committed: Wed Nov 4 11:44:48 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/55f11ca2/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/55f11ca2/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 1c33ea0..3a9a91e 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
>> @@ -286,7 +286,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);
>> @@ -304,10 +304,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);
>>
>>
>
> --
> Sergey Beryozkin
>
> Talend Community Coders
> http://coders.talend.com/
>



-- 
Colm O hEigeartaigh

Talend Community Coder
http://coders.talend.com

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message