You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pl...@apache.org on 2015/09/09 03:37:07 UTC
[46/46] directory-kerby git commit: Merge remote-tracking branch
'asf/master' into pkinit-support
Merge remote-tracking branch 'asf/master' into pkinit-support
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/00c4515c
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/00c4515c
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/00c4515c
Branch: refs/heads/pkinit-support
Commit: 00c4515cd47b34d2966478e8a78e1c1809af8943
Parents: 53d09c9 735fdf7
Author: plusplusjiajia <ji...@intel.com>
Authored: Wed Sep 9 09:41:39 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Wed Sep 9 09:41:39 2015 +0800
----------------------------------------------------------------------
.gitignore | 1 +
BUILDING.txt | 2 +-
benchmark/pom.xml | 3 +-
docs/kerby-ip-clearance.xml | 141 +++++++++++++++++++
kerby-asn1/pom.xml | 6 +-
.../java/org/apache/kerby/asn1/Asn1Factory.java | 4 +-
.../org/apache/kerby/asn1/Asn1InputBuffer.java | 13 +-
.../org/apache/kerby/asn1/EncodingOption.java | 2 +-
.../java/org/apache/kerby/asn1/TagClass.java | 4 +-
.../org/apache/kerby/asn1/TaggingOption.java | 16 +--
.../kerby/asn1/type/AbstractAsn1Type.java | 21 +--
.../org/apache/kerby/asn1/type/Asn1Boolean.java | 2 +-
.../kerby/asn1/type/Asn1GeneralizedTime.java | 1 +
.../org/apache/kerby/asn1/type/Asn1Simple.java | 15 +-
.../org/apache/kerby/asn1/type/Asn1Type.java | 32 ++---
.../apache/kerby/asn1/TestTaggingEncoding.java | 2 -
kerby-backend/json-backend/pom.xml | 2 +-
.../identitybackend/JsonIdentityBackend.java | 2 +-
kerby-backend/ldap-backend/pom.xml | 2 +-
.../identitybackend/LdapIdentityGetHelper.java | 18 +++
kerby-backend/mavibot-backend/pom.xml | 5 +-
.../java/org/apache/kerby/MavibotBackend.java | 2 +-
kerby-backend/pom.xml | 2 +-
kerby-backend/zookeeper-backend/pom.xml | 4 +-
.../identitybackend/IdentityZNodeHelper.java | 33 +++++
.../kerberos/kdc/identitybackend/ZKUtil.java | 39 ++++-
.../ZookeeperIdentityBackend.java | 2 +-
kerby-config/pom.xml | 6 +-
.../java/org/apache/kerby/config/Config.java | 40 +++---
kerby-dist/kdc-dist/bin/kadmin.sh | 7 +-
kerby-dist/kdc-dist/bin/kdcinit.sh | 7 +-
kerby-dist/kdc-dist/bin/start-kdc.sh | 7 +-
kerby-dist/kdc-dist/log4j.properties | 16 +++
kerby-dist/kdc-dist/pom.xml | 4 +-
kerby-dist/pom.xml | 8 +-
kerby-dist/tool-dist/bin/kinit.sh | 7 +-
kerby-dist/tool-dist/bin/klist.sh | 7 +-
kerby-dist/tool-dist/log4j.properties | 16 +++
kerby-dist/tool-dist/pom.xml | 4 +-
kerby-kdc-test/pom.xml | 4 +-
kerby-kdc/pom.xml | 4 +-
kerby-kerb/integration-test/pom.xml | 2 +-
.../integration/test/jaas/TokenJaasKrbUtil.java | 2 +
kerby-kerb/kerb-admin/pom.xml | 2 +-
.../kerby/kerberos/kerb/admin/Kadmin.java | 45 ++++--
kerby-kerb/kerb-client-api-all/pom.xml | 4 +-
kerby-kerb/kerb-client/pom.xml | 2 +-
.../kerby/kerberos/kerb/client/ClientUtil.java | 9 +-
.../kerby/kerberos/kerb/client/KrbClient.java | 70 ++++-----
.../kerby/kerberos/kerb/client/KrbConfig.java | 31 +++-
.../kerby/kerberos/kerb/client/KrbContext.java | 6 +
.../kerby/kerberos/kerb/client/KrbHandler.java | 3 +
.../kerby/kerberos/kerb/client/KrbSetting.java | 4 +-
.../kerb/client/impl/InternalKrbClient.java | 9 +-
.../kerb/client/preauth/KrbPreauth.java | 32 ++++-
.../kerb/client/preauth/PreauthHandler.java | 2 +
.../kerb/client/request/KdcRequest.java | 8 ++
kerby-kerb/kerb-common/pom.xml | 2 +-
.../kerby/kerberos/kerb/common/KrbUtil.java | 4 +-
.../kerb/transport/KdcUdpTransport.java | 2 +-
.../kerb/transport/KrbTcpTransport.java | 2 +-
.../kerberos/kerb/transport/KrbTransport.java | 10 +-
.../kerb/transport/KrbUdpTransport.java | 2 +-
kerby-kerb/kerb-core-test/pom.xml | 2 +-
kerby-kerb/kerb-core/pom.xml | 2 +-
.../apache/kerby/kerberos/kerb/KrbRuntime.java | 2 +
.../kerby/kerberos/kerb/provider/PkiLoader.java | 24 ++--
.../kerberos/kerb/provider/TokenDecoder.java | 6 +-
.../kerberos/kerb/provider/TokenEncoder.java | 6 +-
.../kerby/kerberos/kerb/spec/KerberosTime.java | 15 +-
.../kerberos/kerb/spec/base/AuthToken.java | 16 +--
.../kerby/kerberos/kerb/spec/base/KrbToken.java | 6 +
kerby-kerb/kerb-crypto/pom.xml | 2 +-
.../kerberos/kerb/crypto/EncryptionHandler.java | 115 ++++++++++++++-
.../kerberos/kerb/crypto/fast/FastUtil.java | 18 ++-
.../kerb/crypto/key/AbstractKeyMaker.java | 5 +-
.../kerberos/kerb/crypto/key/DesKeyMaker.java | 9 +-
.../kerberos/kerb/crypto/random/JavaRandom.java | 3 +-
.../kerb/crypto/random/RandomProvider.java | 4 +-
.../kerberos/kerb/crypto/util/Camellia.java | 8 ++
.../kerby/kerberos/kerb/crypto/util/Des.java | 3 +
.../kerby/kerberos/kerb/crypto/util/Nfold.java | 5 +-
kerby-kerb/kerb-identity-test/pom.xml | 2 +-
.../kerb/identity/backend/BackendTestBase.java | 1 +
kerby-kerb/kerb-identity/pom.xml | 2 +-
.../kerberos/kerb/identity/IdentityService.java | 14 +-
.../backend/AbstractIdentityBackend.java | 20 ++-
.../kerb/identity/backend/IdentityBackend.java | 2 +
kerby-kerb/kerb-kdc-test/pom.xml | 2 +-
kerby-kerb/kerb-server-api-all/pom.xml | 4 +-
kerby-kerb/kerb-server/pom.xml | 4 +-
.../kerby/kerberos/kerb/server/KdcHandler.java | 12 +-
.../kerby/kerberos/kerb/server/KdcServer.java | 38 +++--
.../kerby/kerberos/kerb/server/KdcSetting.java | 37 ++++-
.../kerby/kerberos/kerb/server/KdcUtil.java | 20 ++-
.../kerb/server/impl/InternalKdcServer.java | 3 +
.../kerb/server/preauth/KdcPreauth.java | 20 +++
.../kerb/server/preauth/PreauthHandler.java | 2 +-
.../kerberos/kerb/server/request/AsRequest.java | 1 +
.../kerb/server/request/KdcRequest.java | 116 ++++++++++++++-
.../kerb/server/request/TgsRequest.java | 11 ++
kerby-kerb/kerb-simplekdc/pom.xml | 2 +-
.../kerberos/kerb/server/SimpleKdcServer.java | 18 ++-
kerby-kerb/kerb-util/pom.xml | 2 +-
kerby-kerb/pom.xml | 4 +-
kerby-provider/pom.xml | 8 +-
kerby-provider/token-provider/pom.xml | 6 +-
.../provider/token/JwtTokenDecoder.java | 6 +-
.../kerby/kerberos/provider/token/JwtUtil.java | 3 +-
kerby-tool/client-tool/pom.xml | 4 +-
.../apache/kerby/kerberos/tool/ToolUtil.java | 2 +-
kerby-tool/kdc-tool/pom.xml | 2 +-
.../tool/kadmin/command/KadminCommand.java | 1 +
kerby-tool/pom.xml | 2 +-
kerby-util/pom.xml | 2 +-
.../src/main/java/org/apache/kerby/KOption.java | 3 +-
.../main/java/org/apache/kerby/KOptions.java | 4 +-
.../main/java/org/apache/kerby/util/Base64.java | 10 +-
.../apache/kerby/util/Base64InputStream.java | 4 +-
.../apache/kerby/util/Base64OutputStream.java | 4 +-
.../java/org/apache/kerby/util/HexUtil.java | 4 +
.../main/java/org/apache/kerby/util/IOUtil.java | 18 +--
pom.xml | 117 +++++++--------
123 files changed, 1149 insertions(+), 405 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/00c4515c/kerby-kdc-test/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/00c4515c/kerby-provider/pom.xml
----------------------------------------------------------------------
diff --cc kerby-provider/pom.xml
index 7aade63,1519bd3..a23352e
--- a/kerby-provider/pom.xml
+++ b/kerby-provider/pom.xml
@@@ -28,7 -26,6 +26,7 @@@
<modules>
<module>token-provider</module>
+ <module>pki-provider</module>
</modules>
- </project>
+ </project>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/00c4515c/kerby-tool/client-tool/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/00c4515c/pom.xml
----------------------------------------------------------------------