Repository: cxf Updated Branches: refs/heads/master a7d5d525c -> 7d26a5962
[CXF-6993] Minor improvements Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7d26a596 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7d26a596 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7d26a596 Branch: refs/heads/master Commit: 7d26a5962960534eae6f84c20496f0a30a6b7892 Parents: a7d5d52 Author: Sergey Beryozkin <[email protected]> Authored: Thu Mar 23 16:00:46 2017 +0000 Committer: Sergey Beryozkin <[email protected]> Committed: Thu Mar 23 16:00:46 2017 +0000 ---------------------------------------------------------------------- .../security/jose/jwe/AbstractContentEncryptionAlgorithm.java | 4 +++- .../java/org/apache/cxf/rs/security/jose/jwe/JweUtils.java | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/7d26a596/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractContentEncryptionAlgorithm.java ---------------------------------------------------------------------- diff --git a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractContentEncryptionAlgorithm.java b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractContentEncryptionAlgorithm.java index 6e27289..11a76f3 100644 --- a/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractContentEncryptionAlgorithm.java +++ b/rt/rs/security/jose-parent/jose/src/main/java/org/apache/cxf/rs/security/jose/jwe/AbstractContentEncryptionAlgorithm.java @@ -53,7 +53,9 @@ public abstract class AbstractContentEncryptionAlgorithm extends AbstractContent theCek = CryptoUtils.getSecretKey(AlgorithmUtils.stripAlgoProperties(algoJava), getContentEncryptionKeySize(headers)).getEncoded(); if (generateCekOnce) { - cek = theCek; + synchronized (this) { + cek = theCek; + } } } else { theCek = cek; http://git-wip-us.apache.org/repos/asf/cxf/blob/7d26a596/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 e5828be..613fc77 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 @@ -269,8 +269,12 @@ public final class JweUtils { return null; } public static ContentEncryptionProvider getContentEncryptionProvider(ContentAlgorithm algorithm) { + return getContentEncryptionProvider(algorithm, false); + } + public static ContentEncryptionProvider getContentEncryptionProvider(ContentAlgorithm algorithm, + boolean generateCekOnce) { if (AlgorithmUtils.isAesGcm(algorithm.getJwaName())) { - return new AesGcmContentEncryptionAlgorithm(algorithm); + return new AesGcmContentEncryptionAlgorithm(algorithm, generateCekOnce); } return null; }
