This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 5021ff0 CXF-8161: fix memory leak and thread leak in JMSDestination.
Minor test cleanups.
new 2a9379a Handle Java 2 security issue in ForkJoinPool
new 737c8b8 cxf-core: use AtomicInteger in AttachmentUtil
new 1f4f4dc AttachmentUtil: return back correct @ character
new 4af5cf5 CXF-8177 CXF-8178 ECDH Algorithm Fixes (#612)
new 2958089 Jose cleanup to make fields final
new 52f7e10 Recording .gitmergeinfo Changes
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitmergeinfo | 7 +
.../org/apache/cxf/attachment/AttachmentUtil.java | 9 +-
.../apache/cxf/attachment/AttachmentUtilTest.java | 9 +-
.../microprofile/client/MPRestClientCallback.java | 9 +-
.../cxf/rs/security/jose/jwa/KeyAlgorithm.java | 6 +
.../AbstractContentEncryptionCipherProperties.java | 5 +-
.../security/jose/jwe/AbstractJweDecryption.java | 5 +-
.../security/jose/jwe/AbstractJweEncryption.java | 7 +-
.../jwe/AbstractWrapKeyEncryptionAlgorithm.java | 9 +-
.../security/jose/jwe/AesCbcHmacJweDecryption.java | 3 +-
.../jose/jwe/DirectKeyDecryptionAlgorithm.java | 3 +-
...a => EcdhAesGcmContentEncryptionAlgorithm.java} | 31 ++--
.../jwe/EcdhAesWrapKeyDecryptionAlgorithm.java | 24 ++-
.../jwe/EcdhAesWrapKeyEncryptionAlgorithm.java | 5 +-
....java => EcdhDirectKeyDecryptionAlgorithm.java} | 43 +++--
....java => EcdhDirectKeyEncryptionAlgorithm.java} | 25 ++-
.../jose/jwe/EcdhDirectKeyJweDecryption.java | 27 ---
.../jose/jwe/EcdhDirectKeyJweEncryption.java | 74 ---------
.../cxf/rs/security/jose/jwe/EcdhHelper.java | 84 ++++++++++
.../rs/security/jose/jwe/JweCompactBuilder.java | 7 +-
.../rs/security/jose/jwe/JweCompactConsumer.java | 3 +-
.../rs/security/jose/jwe/JweCompactProducer.java | 5 +-
.../rs/security/jose/jwe/JweDecryptionInput.java | 14 +-
.../rs/security/jose/jwe/JweDecryptionOutput.java | 5 +-
.../rs/security/jose/jwe/JweEncryptionOutput.java | 16 +-
.../cxf/rs/security/jose/jwe/JweException.java | 3 +-
.../cxf/rs/security/jose/jwe/JweHeaders.java | 1 +
.../cxf/rs/security/jose/jwe/JweJsonConsumer.java | 2 +-
.../security/jose/jwe/JweJsonEncryptionEntry.java | 5 +-
.../cxf/rs/security/jose/jwe/JweJsonProducer.java | 25 +--
.../security/jose/jwe/JweJwtCompactConsumer.java | 5 +-
.../cxf/rs/security/jose/jwe/JweOutputStream.java | 7 +-
.../apache/cxf/rs/security/jose/jwe/JweUtils.java | 73 +++++++-
.../jwe/PbesHmacAesWrapKeyDecryptionAlgorithm.java | 5 +-
.../jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java | 6 +-
.../jose/jwe/WrappedKeyDecryptionAlgorithm.java | 7 +-
.../apache/cxf/rs/security/jose/jwk/JwkUtils.java | 4 +
.../jose/jws/AbstractJwsSignatureProvider.java | 2 +-
.../jose/jws/HmacJwsSignatureProvider.java | 5 +-
.../jose/jws/HmacJwsSignatureVerifier.java | 12 +-
.../rs/security/jose/jws/JwsCompactConsumer.java | 7 +-
.../rs/security/jose/jws/JwsCompactProducer.java | 5 +-
.../rs/security/jose/jws/JwsDetachedSignature.java | 13 +-
.../cxf/rs/security/jose/jws/JwsException.java | 2 +-
.../cxf/rs/security/jose/jws/JwsInputStream.java | 15 +-
.../rs/security/jose/jws/JwsJsonOutputStream.java | 7 +-
.../cxf/rs/security/jose/jws/JwsJsonProducer.java | 11 +-
.../security/jose/jws/JwsJsonSignatureEntry.java | 14 +-
.../cxf/rs/security/jose/jws/JwsOutputStream.java | 5 +-
.../jose/jws/PrivateKeyJwsSignatureProvider.java | 6 +-
.../jose/jws/PublicKeyJwsSignatureVerifier.java | 15 +-
.../rs/security/jose/jwa/AbstractDecryptTest.java} | 32 ++--
.../rs/security/jose/jwa/AbstractEncryptTest.java | 50 ++++++
.../cxf/rs/security/jose/jwa/AbstractJwaTest.java | 54 ++++++
.../cxf/rs/security/jose/jwa/AbstractSignTest.java | 42 +++++
.../jose/jwa/AbstractVerifySignatureTest.java} | 28 ++--
.../rs/security/jose/jwa/CxfDecryptRfcTest.java} | 28 ++--
.../rs/security/jose/jwa/CxfEncryptRfcTest.java} | 31 ++--
.../cxf/rs/security/jose/jwa/CxfSignRfcTest.java} | 30 ++--
.../jose/jwa/CxfVerifySignatureRfcTest.java} | 28 ++--
.../jose/jwa/JwaDecryptRfcConformanceTest.java | 145 ++++++++++++++++
.../jose/jwa/JwaEncryptRfcConformanceTest.java | 147 ++++++++++++++++
.../jose/jwa/JwaSignRfcConformanceTest.java | 57 +++++++
.../jwa/JwaVerifySignatureRfcConformanceTest.java | 56 +++++++
.../security/jose/support/ApacheCXFConsumer.java | 184 +++++++++++++++++++++
.../security/jose/support/ApacheCXFProducer.java | 171 +++++++++++++++++++
.../cxf/rs/security/jose/support/Crypto.java | 136 +++++++++++++++
.../rs/security/jose/support/Serialization.java} | 23 +--
....p-256.ecdh-es+a128kw.a128cbc-hs256.compact.jwe | 1 +
...ecdh-es+a128kw.a128cbc-hs256.json.flattened.jwe | 7 +
.../ec.p-256.ecdh-es+a128kw.a128cbc-hs256.json.jwe | 15 ++
.../ec.p-256.ecdh-es+a128kw.a128gcm.compact.jwe | 1 +
...p-256.ecdh-es+a128kw.a128gcm.json.flattened.jwe | 7 +
.../jwe/ec.p-256.ecdh-es+a128kw.a128gcm.json.jwe | 15 ++
....p-256.ecdh-es+a256kw.a128cbc-hs256.compact.jwe | 1 +
...ecdh-es+a256kw.a128cbc-hs256.json.flattened.jwe | 7 +
.../ec.p-256.ecdh-es+a256kw.a128cbc-hs256.json.jwe | 15 ++
.../ec.p-256.ecdh-es+a256kw.a128gcm.compact.jwe | 1 +
...p-256.ecdh-es+a256kw.a128gcm.json.flattened.jwe | 7 +
.../jwe/ec.p-256.ecdh-es+a256kw.a128gcm.json.jwe | 15 ++
.../jwe/ec.p-256.ecdh-es.a128cbc-hs256.compact.jwe | 1 +
....p-256.ecdh-es.a128cbc-hs256.json.flattened.jwe | 6 +
.../jwe/ec.p-256.ecdh-es.a128cbc-hs256.json.jwe | 14 ++
.../jwe/ec.p-256.ecdh-es.a128gcm.compact.jwe | 1 +
.../ec.p-256.ecdh-es.a128gcm.json.flattened.jwe | 6 +
.../jwe/ec.p-256.ecdh-es.a128gcm.json.jwe | 14 ++
.../jwe/oct.128.a128kw.a128cbc-hs256.compact.jwe | 1 +
...oct.128.a128kw.a128cbc-hs256.json.flattened.jwe | 7 +
.../jwe/oct.128.a128kw.a128cbc-hs256.json.jwe | 15 ++
.../jwe/oct.128.a128kw.a128gcm.compact.jwe | 1 +
.../jwe/oct.128.a128kw.a128gcm.json.flattened.jwe | 7 +
.../resources/jwe/oct.128.a128kw.a128gcm.json.jwe | 15 ++
.../rsa.2048.rsa-oaep.a128cbc-hs256.compact.jwe | 1 +
....2048.rsa-oaep.a128cbc-hs256.json.flattened.jwe | 7 +
.../jwe/rsa.2048.rsa-oaep.a128cbc-hs256.json.jwe | 16 ++
.../jwe/rsa.2048.rsa-oaep.a128gcm.compact.jwe | 1 +
.../rsa.2048.rsa-oaep.a128gcm.json.flattened.jwe | 7 +
.../jwe/rsa.2048.rsa-oaep.a128gcm.json.jwe | 16 ++
.../jwe/rsa.2048.rsa1_5.a128cbc-hs256.compact.jwe | 1 +
...sa.2048.rsa1_5.a128cbc-hs256.json.flattened.jwe | 7 +
.../jwe/rsa.2048.rsa1_5.a128cbc-hs256.json.jwe | 16 ++
.../jwe/rsa.2048.rsa1_5.a128gcm.compact.jwe | 1 +
.../jwe/rsa.2048.rsa1_5.a128gcm.json.flattened.jwe | 7 +
.../resources/jwe/rsa.2048.rsa1_5.a128gcm.json.jwe | 16 ++
.../jose/src/test/resources/jwk/priKeys.jwks | 104 ++++++++++++
.../jose/src/test/resources/jwk/pubKeys.jwks | 74 +++++++++
.../test/resources/jws/ec.p-256.es256.compact.jws | 1 +
.../jws/ec.p-256.es256.json.flattened.jws | 5 +
.../src/test/resources/jws/ec.p-256.es256.json.jws | 12 ++
.../test/resources/jws/rsa.2048.ps256.compact.jws | 1 +
.../jws/rsa.2048.ps256.json.flattened.jws | 5 +
.../src/test/resources/jws/rsa.2048.ps256.json.jws | 12 ++
.../test/resources/jws/rsa.2048.rs256.compact.jws | 1 +
.../jws/rsa.2048.rs256.json.flattened.jws | 5 +
.../src/test/resources/jws/rsa.2048.rs256.json.jws | 12 ++
115 files changed, 2039 insertions(+), 408 deletions(-)
copy
rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/{JweDecryptionOutput.java
=> EcdhAesGcmContentEncryptionAlgorithm.java} (51%)
copy
rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/{EcdhDirectKeyJweDecryption.java
=> EcdhDirectKeyDecryptionAlgorithm.java} (50%)
copy
rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/{JweDecryptionOutput.java
=> EcdhDirectKeyEncryptionAlgorithm.java} (63%)
create mode 100644
rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/EcdhHelper.java
copy
rt/rs/security/jose-parent/jose/src/{main/java/org/apache/cxf/rs/security/jose/jwe/JweDecryptionOutput.java
=> test/java/org/apache/cxf/rs/security/jose/jwa/AbstractDecryptTest.java}
(51%)
create mode 100644
rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwa/AbstractEncryptTest.java
create mode 100644
rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwa/AbstractJwaTest.java
create mode 100644
rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwa/AbstractSignTest.java
copy
rt/rs/security/jose-parent/jose/src/{main/java/org/apache/cxf/rs/security/jose/jwe/JweDecryptionOutput.java
=>
test/java/org/apache/cxf/rs/security/jose/jwa/AbstractVerifySignatureTest.java}
(55%)
copy
rt/rs/security/jose-parent/jose/src/{main/java/org/apache/cxf/rs/security/jose/jwe/JweDecryptionOutput.java
=> test/java/org/apache/cxf/rs/security/jose/jwa/CxfDecryptRfcTest.java} (59%)
copy
rt/rs/security/jose-parent/jose/src/{main/java/org/apache/cxf/rs/security/jose/jwe/JweDecryptionOutput.java
=> test/java/org/apache/cxf/rs/security/jose/jwa/CxfEncryptRfcTest.java} (55%)
copy
rt/rs/security/jose-parent/jose/src/{main/java/org/apache/cxf/rs/security/jose/jwe/JweDecryptionOutput.java
=> test/java/org/apache/cxf/rs/security/jose/jwa/CxfSignRfcTest.java} (59%)
copy
rt/rs/security/jose-parent/jose/src/{main/java/org/apache/cxf/rs/security/jose/jwe/JweDecryptionOutput.java
=>
test/java/org/apache/cxf/rs/security/jose/jwa/CxfVerifySignatureRfcTest.java}
(59%)
create mode 100644
rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwa/JwaDecryptRfcConformanceTest.java
create mode 100644
rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwa/JwaEncryptRfcConformanceTest.java
create mode 100644
rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwa/JwaSignRfcConformanceTest.java
create mode 100644
rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/jwa/JwaVerifySignatureRfcConformanceTest.java
create mode 100644
rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/support/ApacheCXFConsumer.java
create mode 100644
rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/support/ApacheCXFProducer.java
create mode 100644
rt/rs/security/jose-parent/jose/src/test/java/org/apache/cxf/rs/security/jose/support/Crypto.java
copy
rt/rs/security/jose-parent/jose/src/{main/java/org/apache/cxf/rs/security/jose/jwe/JweDecryptionOutput.java
=> test/java/org/apache/cxf/rs/security/jose/support/Serialization.java} (59%)
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/ec.p-256.ecdh-es+a128kw.a128cbc-hs256.compact.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/ec.p-256.ecdh-es+a128kw.a128cbc-hs256.json.flattened.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/ec.p-256.ecdh-es+a128kw.a128cbc-hs256.json.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/ec.p-256.ecdh-es+a128kw.a128gcm.compact.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/ec.p-256.ecdh-es+a128kw.a128gcm.json.flattened.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/ec.p-256.ecdh-es+a128kw.a128gcm.json.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/ec.p-256.ecdh-es+a256kw.a128cbc-hs256.compact.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/ec.p-256.ecdh-es+a256kw.a128cbc-hs256.json.flattened.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/ec.p-256.ecdh-es+a256kw.a128cbc-hs256.json.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/ec.p-256.ecdh-es+a256kw.a128gcm.compact.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/ec.p-256.ecdh-es+a256kw.a128gcm.json.flattened.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/ec.p-256.ecdh-es+a256kw.a128gcm.json.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/ec.p-256.ecdh-es.a128cbc-hs256.compact.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/ec.p-256.ecdh-es.a128cbc-hs256.json.flattened.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/ec.p-256.ecdh-es.a128cbc-hs256.json.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/ec.p-256.ecdh-es.a128gcm.compact.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/ec.p-256.ecdh-es.a128gcm.json.flattened.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/ec.p-256.ecdh-es.a128gcm.json.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/oct.128.a128kw.a128cbc-hs256.compact.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/oct.128.a128kw.a128cbc-hs256.json.flattened.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/oct.128.a128kw.a128cbc-hs256.json.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/oct.128.a128kw.a128gcm.compact.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/oct.128.a128kw.a128gcm.json.flattened.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/oct.128.a128kw.a128gcm.json.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/rsa.2048.rsa-oaep.a128cbc-hs256.compact.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/rsa.2048.rsa-oaep.a128cbc-hs256.json.flattened.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/rsa.2048.rsa-oaep.a128cbc-hs256.json.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/rsa.2048.rsa-oaep.a128gcm.compact.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/rsa.2048.rsa-oaep.a128gcm.json.flattened.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/rsa.2048.rsa-oaep.a128gcm.json.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/rsa.2048.rsa1_5.a128cbc-hs256.compact.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/rsa.2048.rsa1_5.a128cbc-hs256.json.flattened.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/rsa.2048.rsa1_5.a128cbc-hs256.json.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/rsa.2048.rsa1_5.a128gcm.compact.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/rsa.2048.rsa1_5.a128gcm.json.flattened.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwe/rsa.2048.rsa1_5.a128gcm.json.jwe
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwk/priKeys.jwks
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jwk/pubKeys.jwks
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jws/ec.p-256.es256.compact.jws
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jws/ec.p-256.es256.json.flattened.jws
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jws/ec.p-256.es256.json.jws
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jws/rsa.2048.ps256.compact.jws
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jws/rsa.2048.ps256.json.flattened.jws
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jws/rsa.2048.ps256.json.jws
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jws/rsa.2048.rs256.compact.jws
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jws/rsa.2048.rs256.json.flattened.jws
create mode 100644
rt/rs/security/jose-parent/jose/src/test/resources/jws/rsa.2048.rs256.json.jws
