directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dran...@apache.org
Subject [14/14] directory-kerberos git commit: Merge branch 'master' into installation
Date Wed, 11 Mar 2015 21:48:27 GMT
Merge branch 'master' into installation


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

Branch: refs/heads/installation
Commit: 9a3aedac0d7f225fac534b3b0d9b7c1bd65a0835
Parents: 297dab0 bffabdc
Author: Drankye <drankye@gmail.com>
Authored: Thu Mar 12 05:42:21 2015 +0800
Committer: Drankye <drankye@gmail.com>
Committed: Thu Mar 12 05:42:21 2015 +0800

----------------------------------------------------------------------
 3rdparty/not-yet-commons-ssl/pom.xml            |   6 +-
 3rdparty/pom.xml                                |   9 +-
 kdc-tool/README                                 |   1 +
 kdc-tool/kinit/pom.xml                          |  45 +++
 .../org/apache/kerby/kerberos/tool/Kinit.java   |  42 +++
 kdc-tool/pom.xml                                |  33 ++
 kdc-tool/token-tool/pom.xml                     |  49 +++
 .../org/apache/kerby/token/AuthzDataEntry.java  |  52 +++
 .../java/org/apache/kerby/token/TokenCache.java |  82 +++++
 .../org/apache/kerby/token/TokenExtractor.java  | 102 ++++++
 .../java/org/apache/kerby/token/TokenTool.java  | 125 +++++++
 kerby-asn1/pom.xml                              |   7 +-
 kerby-kdc/pom.xml                               |   4 +-
 kerby-kerb/kerb-client/pom.xml                  |  24 ++
 .../kerby/kerberos/kerb/client/KrbClient.java   | 138 ++++++--
 .../kerby/kerberos/kerb/client/KrbConfig.java   |  42 ++-
 .../kerberos/kerb/client/KrbConfigKey.java      |   3 +
 .../kerby/kerberos/kerb/client/KrbContext.java  |   6 +-
 .../kerby/kerberos/kerb/client/KrbOptions.java  |  40 ++-
 .../kerb/client/preauth/PreauthContext.java     |   4 +-
 .../kerb/client/preauth/PreauthHandler.java     |   9 +-
 .../kerb/client/preauth/UserResponser.java      |   2 +-
 .../kerb/client/preauth/token/TokenContext.java |   2 +-
 .../kerb/client/preauth/token/TokenPreauth.java |   2 +-
 .../src/main/resources/kdc-krb5.conf            |  25 --
 .../kerb-client/src/main/resources/kdc.ldiff    |  46 ---
 .../kerb-client/src/main/resources/krb5.conf    |  57 ----
 .../src/test/resources/kdc-krb5.conf            |  25 ++
 .../kerb-client/src/test/resources/kdc.ldiff    |  46 +++
 .../kerb-client/src/test/resources/krb5.conf    |  57 ++++
 .../kerberos/kerb/codec/test/TestKerberos.java  |   5 +
 .../kerberos/kerb/spec/common/CheckSumType.java |   8 +
 .../kerb/spec/common/EncryptionType.java        |   8 +
 .../kerberos/kerb/spec/pa/token/KerbToken.java  |  50 +++
 .../kerb/crypto/AbstractCryptoTypeHandler.java  |  12 +-
 .../kerberos/kerb/crypto/EncryptionHandler.java |  17 +
 .../kerb/crypto/cksum/CmacKcCheckSum.java       |   3 +-
 .../kerb/crypto/cksum/HmacKcCheckSum.java       |   3 +-
 .../kerb/crypto/cksum/HmacMd5Rc4CheckSum.java   |   6 +-
 .../kerberos/kerb/crypto/cksum/KcCheckSum.java  |   6 +-
 .../kerb/crypto/cksum/Md5HmacRc4CheckSum.java   |   3 +-
 .../kerb/crypto/enc/AbstractEncTypeHandler.java |   2 +-
 .../kerby/kerberos/kerb/crypto/enc/KeKiEnc.java |  17 +-
 .../kerberos/kerb/crypto/enc/Rc4HmacEnc.java    |   6 +-
 .../kerb/crypto/enc/provider/DesProvider.java   |  14 +-
 .../kerberos/kerb/crypto/key/AesKeyMaker.java   |   4 +-
 .../kerb/crypto/key/CamelliaKeyMaker.java       |  16 +-
 .../kerberos/kerb/crypto/key/Des3KeyMaker.java  |   6 +-
 .../kerberos/kerb/crypto/key/DesKeyMaker.java   |   4 +-
 .../kerberos/kerb/crypto/key/DkKeyMaker.java    |   2 +-
 .../kerberos/kerb/crypto/util/BytesUtil.java    |  12 +-
 .../kerby/kerberos/kerb/crypto/util/Crc32.java  |   3 +-
 .../kerby/kerberos/kerb/crypto/util/Hmac.java   |   3 +-
 .../kerby/kerberos/kerb/crypto/util/Nfold.java  |  19 +-
 .../kerby/kerberos/kerb/crypto/util/Pbkdf.java  |   4 +-
 .../kerberos/kerb/crypto/CamelliaEncTest.java   |   2 +-
 .../kerberos/kerb/crypto/CheckSumTest.java      |   3 +-
 .../kerberos/kerb/crypto/CheckSumsTest.java     |   4 +
 .../kerby/kerberos/kerb/crypto/CmacTest.java    |   3 +-
 .../kerberos/kerb/crypto/DecryptionTest.java    |  19 ++
 .../kerberos/kerb/crypto/KeyDeriveTest.java     | 328 +++++++++++--------
 .../kerberos/kerb/crypto/String2keyTest.java    |  32 ++
 .../kerb/identity/ComplexAttribute.java         |   2 +-
 .../kerby/kerberos/kerb/identity/Identity.java  |   4 +-
 .../kerberos/kerb/identity/KrbIdentity.java     |   4 +-
 .../backend/InMemoryIdentityBackend.java        |   2 +-
 .../kerberos/kerb/server/TestKdcServer.java     | 122 -------
 .../kerby/kerberos/kerb/server/KdcTest.java     |  11 +-
 .../kerby/kerberos/kerb/server/KdcTestBase.java |  55 +++-
 .../kerberos/kerb/server/OnlyTcpKdcTest.java    |  35 ++
 .../kerberos/kerb/server/TcpAndUdpKdcTest.java  |  35 ++
 .../kerberos/kerb/server/TestKdcServer.java     | 122 +++++++
 .../kerberos/kerb/server/WithTokenKdcTest.java  |   2 +-
 kerby-kerb/kerb-server/pom.xml                  |  24 ++
 .../kerby/kerberos/kerb/server/KdcConfig.java   |  34 +-
 .../kerberos/kerb/server/KdcConfigKey.java      |   6 +-
 .../kerby/kerberos/kerb/server/KdcServer.java   |  46 ++-
 .../server/preauth/pkinit/PkinitPreauth.java    |   2 +-
 .../kerb/server/replay/RequestRecord.java       |  24 +-
 .../kerb/server/replay/SimpleCacheService.java  |   2 +-
 .../kerb-server/src/main/resources/kdc.conf     |  51 ---
 .../kerby/kerberos/kerb/server/KdcTest.java     |  22 +-
 .../kerberos/kerb/server/TestKdcConfigLoad.java |   4 +-
 .../kerb-server/src/test/resources/kdc.conf     |  51 +++
 .../kerberos/kerb/util/EncryptionTest.java      |   4 +
 .../kerby/kerberos/kerb/util/KeysTest.java      |   3 +
 kerby-kerb/pom.xml                              |   6 +-
 lib/kerby-token/pom.xml                         |  44 ---
 .../org/apache/kerby/token/AuthzDataEntry.java  |  52 ---
 .../java/org/apache/kerby/token/KerbToken.java  |  47 ---
 .../java/org/apache/kerby/token/TokenCache.java |  82 -----
 .../org/apache/kerby/token/TokenExtractor.java  | 101 ------
 .../java/org/apache/kerby/token/TokenTool.java  | 124 -------
 lib/pom.xml                                     |   7 +-
 pom.xml                                         |   2 +-
 tool/pom.xml                                    |  45 ---
 .../java/org/apache/kerberos/tool/Kinit.java    |  42 ---
 97 files changed, 1721 insertions(+), 1207 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/9a3aedac/kerby-kerb/kerb-server/pom.xml
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/9a3aedac/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcServer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/9a3aedac/pom.xml
----------------------------------------------------------------------
diff --cc pom.xml
index 3d08524,6fed365..d03c850
--- a/pom.xml
+++ b/pom.xml
@@@ -41,10 -62,9 +41,10 @@@
      <module>kerby-asn1</module>
      <module>kerby-kerb</module>
      <module>kerby-kdc</module>
-     <module>tool</module>
+     <module>kdc-tool</module>
      <module>kdc-backend</module>
      <module>benchmark</module>
 +    <module>kerby-dist</module>
    </modules>
  
    <dependencyManagement>


Mime
View raw message