Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fe39afe4 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fe39afe4 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fe39afe4 Branch: refs/heads/master Commit: fe39afe42bc46a6815f386d0ca67034aa944e5dd Parents: fb2429b c686b1a Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Wed Nov 25 16:08:30 2015 +0000 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Wed Nov 25 16:08:30 2015 +0000 ---------------------------------------------------------------------- .../rs/security/jose/common/JoseConstants.java | 6 + .../cxf/rs/security/jose/jwe/JweUtils.java | 26 +++- .../jose/jwk/DefaultJwkReaderWriter.java | 49 ------- .../cxf/rs/security/jose/jwk/JsonWebKeys.java | 13 +- .../rs/security/jose/jwk/JwkReaderWriter.java | 27 +++- .../cxf/rs/security/jose/jwk/JwkUtils.java | 127 ++++++++----------- .../cxf/rs/security/jose/jws/JwsUtils.java | 13 +- .../rs/security/oidc/idp/OidcKeysService.java | 46 +++++++ .../oidc/rp/AbstractTokenValidator.java | 2 + 9 files changed, 179 insertions(+), 130 deletions(-) ----------------------------------------------------------------------
