directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From plusplusjia...@apache.org
Subject [25/26] directory-kerby git commit: Merge remote-tracking branch 'asf/trunk' into kadmin-remote
Date Tue, 05 Jul 2016 07:17:13 GMT
Merge remote-tracking branch 'asf/trunk' into kadmin-remote


Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/9cbbc5b1
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/9cbbc5b1
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/9cbbc5b1

Branch: refs/heads/kadmin-remote
Commit: 9cbbc5b1e354b664e7bcdf8a02287439b995647b
Parents: cb8eb4b 358340d
Author: plusplusjiajia <jiajia.li@intel.com>
Authored: Tue Jul 5 15:21:21 2016 +0800
Committer: plusplusjiajia <jiajia.li@intel.com>
Committed: Tue Jul 5 15:21:21 2016 +0800

----------------------------------------------------------------------
 .../identitybackend/LdapIdentityBackend.java    |  2 +
 .../test/jaas/TokenAuthLoginModule.java         | 37 +++++++-
 .../integration/test/TokenLoginTestBase.java    | 10 +-
 .../TokenLoginWithTokenPreauthEnabledTest.java  | 72 +++++++++++++++
 .../kerb/client/preauth/token/TokenPreauth.java |  4 +-
 kerby-kerb/kerb-common/pom.xml                  |  6 ++
 .../kerby/kerberos/kerb/common/Krb5Conf.java    |  6 +-
 .../kerberos/kerb/common/PublicKeyReader.java   | 60 ++++++------
 .../kerby/kerberos/kerb/KrbErrorCode.java       |  2 +-
 .../apache/kerby/kerberos/kerb/KrbRuntime.java  |  2 +-
 .../kerb/type/ad/AuthorizationType.java         | 17 +---
 .../kerberos/kerb/type/base/EncryptionType.java |  2 +-
 .../kerberos/kerb/type/base/HostAddrType.java   |  4 +-
 .../kerby/kerberos/kerb/type/base/KrbToken.java | 64 +------------
 .../kerberos/kerb/type/base/KrbTokenBase.java   | 97 ++++++++++++++++++++
 .../kerb/type/pa/token/PaTokenRequest.java      | 10 +-
 .../kerberos/kerb/server/GssInteropTest.java    | 52 +++++++++--
 .../kerby/kerberos/kerb/server/KdcHandler.java  |  2 +-
 .../server/preauth/pkinit/PkinitPreauth.java    | 10 +-
 .../kerb/server/preauth/token/TokenPreauth.java | 64 ++++++-------
 .../kerb/server/request/KdcRequest.java         |  2 +-
 .../kerby/kerberos/kerb/KrbInputStream.java     | 24 +++--
 .../kerb/ccache/CredCacheInputStream.java       | 17 +++-
 .../kerby/kerberos/kerb/ccache/Credential.java  |  1 -
 .../kerberos/kerb/keytab/KeytabInputStream.java | 18 ----
 .../provider/token/JwtTokenDecoder.java         | 10 +-
 .../kerberos/provider/token/TokenTest.java      |  4 +-
 pom.xml                                         |  5 +-
 28 files changed, 391 insertions(+), 213 deletions(-)
----------------------------------------------------------------------



Mime
View raw message