You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by dr...@apache.org on 2015/02/09 07:28:11 UTC
[30/30] directory-kerberos git commit: Merged with master
Merged with master
Project: http://git-wip-us.apache.org/repos/asf/directory-kerberos/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerberos/commit/63099eb8
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerberos/tree/63099eb8
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerberos/diff/63099eb8
Branch: refs/heads/installation
Commit: 63099eb81c3905d3d6bb57541cd197e99f9d7d4d
Parents: e27df20 02ea20f
Author: Drankye <dr...@gmail.com>
Authored: Mon Feb 9 22:24:43 2015 +0800
Committer: Drankye <dr...@gmail.com>
Committed: Mon Feb 9 22:24:43 2015 +0800
----------------------------------------------------------------------
3rdparty/not-yet-commons-ssl/pom.xml | 7 +-
3rdparty/pom.xml | 23 -
README.md | 36 +-
benchmark/pom.xml | 23 +-
kerby-asn1/README.md | 2 +-
.../java/org/apache/kerby/asn1/Asn1Dump.java | 6 +-
.../java/org/apache/kerby/asn1/Asn1Factory.java | 13 +
.../org/apache/kerby/asn1/Asn1InputBuffer.java | 27 +-
.../org/apache/kerby/asn1/Asn1OutputBuffer.java | 2 +-
.../org/apache/kerby/asn1/EncodingOption.java | 180 ++++++--
.../java/org/apache/kerby/asn1/TagClass.java | 25 ++
.../org/apache/kerby/asn1/TaggingOption.java | 50 ++-
.../org/apache/kerby/asn1/UniversalTag.java | 36 +-
.../kerby/asn1/type/AbstractAsn1Type.java | 86 +++-
.../org/apache/kerby/asn1/type/Asn1Any.java | 6 +-
.../apache/kerby/asn1/type/Asn1BmpString.java | 6 +-
.../org/apache/kerby/asn1/type/Asn1Boolean.java | 22 +-
.../org/apache/kerby/asn1/type/Asn1Choice.java | 24 +-
.../apache/kerby/asn1/type/Asn1Collection.java | 8 +-
.../kerby/asn1/type/Asn1CollectionType.java | 28 +-
.../kerby/asn1/type/Asn1GeneralizedTime.java | 7 +-
.../org/apache/kerby/asn1/type/Asn1Item.java | 16 +-
.../kerby/asn1/type/Asn1ObjectIdentifier.java | 10 +-
.../org/apache/kerby/asn1/type/Asn1Simple.java | 16 +-
.../org/apache/kerby/asn1/type/Asn1Tagging.java | 39 +-
.../org/apache/kerby/asn1/type/Asn1Type.java | 80 ++++
.../org/apache/kerby/asn1/type/Asn1UtcTime.java | 3 +-
.../kerby/asn1/type/TaggingCollection.java | 8 +-
.../org/apache/kerby/asn1/PersonnelRecord.java | 10 +-
.../org/apache/kerby/asn1/TestAsn1Boolean.java | 28 +-
.../apache/kerby/asn1/TestAsn1Collection.java | 4 +-
.../org/apache/kerby/asn1/TestAsn1Integer.java | 4 +-
.../kerby/asn1/TestAsn1ObjectIdentifier.java | 4 +-
.../org/apache/kerby/asn1/TestAsn1UtcTime.java | 4 +-
.../apache/kerby/asn1/TestTaggingEncoding.java | 25 +-
.../test/java/org/apache/kerby/asn1/Util.java | 105 ++++-
kerby-kdc/pom.xml | 1 +
.../kerby/kerberos/kerb/client/KrbContext.java | 2 +-
.../kerberos/kerb/client/TestKrbConfigLoad.java | 40 +-
.../kerberos/kerb/common/EncryptionUtil.java | 8 +-
.../kerberos/kerb/common/KrbConfHelper.java | 3 +-
.../kerberos/kerb/common/KrbErrorUtil.java | 2 +-
.../kerb/preauth/pkinit/PkinitIdenity.java | 3 +-
kerby-kerb/kerb-core-test/pom.xml | 6 +-
.../src/main/resources/aes128-kerberos-data | Bin 1712 -> 0 bytes
.../src/main/resources/aes128-key-data | 1 -
.../src/main/resources/aes128-spnego-data | Bin 1778 -> 0 bytes
.../src/main/resources/aes256-kerberos-data | Bin 1744 -> 0 bytes
.../src/main/resources/aes256-key-data | Bin 32 -> 0 bytes
.../src/main/resources/aes256-spnego-data | Bin 1810 -> 0 bytes
.../src/main/resources/asrep.token | Bin 1241 -> 0 bytes
.../src/main/resources/asreq.token | Bin 291 -> 0 bytes
.../src/main/resources/des-kerberos-data | Bin 1773 -> 0 bytes
.../src/main/resources/des-key-data | 1 -
.../src/main/resources/des-pac-data | Bin 1072 -> 0 bytes
.../src/main/resources/des-spnego-data | Bin 1839 -> 0 bytes
.../src/main/resources/exceptions.properties | 55 ---
.../src/main/resources/rc4-kerberos-data | Bin 1735 -> 0 bytes
.../src/main/resources/rc4-key-data | 1 -
.../src/main/resources/rc4-pac-data | Bin 1048 -> 0 bytes
.../src/main/resources/rc4-spnego-data | Bin 1801 -> 0 bytes
.../src/main/resources/server.keytab | Bin 387 -> 0 bytes
.../src/main/resources/tgsrep.token | Bin 1189 -> 0 bytes
.../src/main/resources/tgsreq.token | Bin 1211 -> 0 bytes
.../kerb/codec/kerberos/KerberosApRequest.java | 2 +-
.../codec/kerberos/KerberosCredentials.java | 3 +-
.../kerb/codec/kerberos/KerberosToken.java | 6 +-
.../kerberos/kerb/codec/spnego/SpnegoToken.java | 4 +-
.../kerberos/kerb/codec/test/CodecTest.java | 11 +-
.../kerberos/kerb/codec/test/CodecTestUtil.java | 13 +-
.../kerb/codec/test/TestAsRepCodec.java | 33 +-
.../kerb/codec/test/TestAsReqCodec.java | 57 +--
.../kerberos/kerb/codec/test/TestKerberos.java | 72 +--
.../kerberos/kerb/codec/test/TestSpnego.java | 83 ++--
.../kerb/codec/test/TestTgsRepCodec.java | 31 +-
.../kerb/codec/test/TestTgsReqCodec.java | 44 +-
.../src/test/resources/aes128-kerberos-data | Bin 0 -> 1712 bytes
.../src/test/resources/aes128-key-data | 1 +
.../src/test/resources/aes128-spnego-data | Bin 0 -> 1778 bytes
.../src/test/resources/aes256-kerberos-data | Bin 0 -> 1744 bytes
.../src/test/resources/aes256-key-data | Bin 0 -> 32 bytes
.../src/test/resources/aes256-spnego-data | Bin 0 -> 1810 bytes
.../src/test/resources/asrep.token | Bin 0 -> 1241 bytes
.../src/test/resources/asreq.token | Bin 0 -> 291 bytes
.../src/test/resources/des-kerberos-data | Bin 0 -> 1773 bytes
.../src/test/resources/des-key-data | 1 +
.../src/test/resources/des-pac-data | Bin 0 -> 1072 bytes
.../src/test/resources/des-spnego-data | Bin 0 -> 1839 bytes
.../src/test/resources/exceptions.properties | 55 +++
.../src/test/resources/rc4-kerberos-data | Bin 0 -> 1735 bytes
.../src/test/resources/rc4-key-data | 1 +
.../src/test/resources/rc4-pac-data | Bin 0 -> 1048 bytes
.../src/test/resources/rc4-spnego-data | Bin 0 -> 1801 bytes
.../src/test/resources/server.keytab | Bin 0 -> 387 bytes
.../src/test/resources/tgsrep.token | Bin 0 -> 1189 bytes
.../src/test/resources/tgsreq.token | Bin 0 -> 1211 bytes
kerby-kerb/kerb-core/pom.xml | 2 +-
.../kerby/kerberos/kerb/KrbErrorException.java | 4 +
.../kerby/kerberos/kerb/KrbException.java | 5 +
.../kerby/kerberos/kerb/codec/KrbCodec.java | 4 +-
.../kerby/kerberos/kerb/spec/KerberosTime.java | 10 +-
.../kerberos/kerb/spec/KrbAppSequenceType.java | 3 +-
.../kerberos/kerb/spec/KrbSequenceType.java | 3 +-
.../kerberos/kerb/spec/common/CheckSum.java | 12 +-
.../kerb/spec/common/EncryptedData.java | 12 +-
.../kerb/spec/common/EncryptionKey.java | 16 +-
.../kerb/spec/common/PrincipalName.java | 2 +-
.../kerb/crypto/AbstractCryptoTypeHandler.java | 3 +-
.../kerby/kerberos/kerb/crypto/BytesUtil.java | 183 --------
.../kerby/kerberos/kerb/crypto/Camellia.java | 250 -----------
.../kerby/kerberos/kerb/crypto/CamelliaKey.java | 433 -------------------
.../kerberos/kerb/crypto/CheckSumHandler.java | 14 +-
.../apache/kerby/kerberos/kerb/crypto/Cmac.java | 178 --------
.../kerby/kerberos/kerb/crypto/Confounder.java | 33 --
.../kerby/kerberos/kerb/crypto/Crc32.java | 78 ----
.../apache/kerby/kerberos/kerb/crypto/Des.java | 84 ----
.../kerberos/kerb/crypto/EncryptionHandler.java | 21 +-
.../apache/kerby/kerberos/kerb/crypto/Hmac.java | 82 ----
.../apache/kerby/kerberos/kerb/crypto/Md4.java | 338 ---------------
.../kerby/kerberos/kerb/crypto/Nfold.java | 102 -----
.../kerby/kerberos/kerb/crypto/Nonce.java | 32 --
.../kerby/kerberos/kerb/crypto/Pbkdf.java | 40 --
.../kerby/kerberos/kerb/crypto/Random.java | 33 --
.../apache/kerby/kerberos/kerb/crypto/Rc4.java | 63 ---
.../cksum/AbstractCheckSumTypeHandler.java | 9 +-
.../cksum/AbstractKeyedCheckSumTypeHandler.java | 6 +-
.../kerb/crypto/cksum/CmacKcCheckSum.java | 2 +-
.../crypto/cksum/ConfounderedDesCheckSum.java | 2 +-
.../kerb/crypto/cksum/HashProvider.java | 7 +-
.../kerb/crypto/cksum/HmacKcCheckSum.java | 2 +-
.../kerb/crypto/cksum/HmacMd5Rc4CheckSum.java | 4 +-
.../kerberos/kerb/crypto/cksum/KcCheckSum.java | 5 +-
.../kerb/crypto/cksum/Md5HmacRc4CheckSum.java | 5 +-
.../crypto/cksum/provider/Crc32Provider.java | 2 +-
.../kerb/crypto/cksum/provider/Md4Provider.java | 2 +-
.../kerberos/kerb/crypto/enc/DesCbcEnc.java | 2 +-
.../kerb/crypto/enc/EncryptProvider.java | 10 +-
.../kerberos/kerb/crypto/enc/KeKiCmacEnc.java | 2 +-
.../kerby/kerberos/kerb/crypto/enc/KeKiEnc.java | 4 +-
.../kerb/crypto/enc/KeKiHmacSha1Enc.java | 2 +-
.../kerberos/kerb/crypto/enc/Rc4HmacEnc.java | 8 +-
.../enc/provider/AbstractEncryptProvider.java | 14 -
.../crypto/enc/provider/CamelliaProvider.java | 2 +-
.../kerb/crypto/key/AbstractKeyMaker.java | 2 +-
.../kerberos/kerb/crypto/key/AesKeyMaker.java | 4 +-
.../kerb/crypto/key/CamelliaKeyMaker.java | 8 +-
.../kerberos/kerb/crypto/key/Des3KeyMaker.java | 4 +-
.../kerberos/kerb/crypto/key/DesKeyMaker.java | 4 +-
.../kerberos/kerb/crypto/key/DkKeyMaker.java | 2 +-
.../kerberos/kerb/crypto/util/BytesUtil.java | 183 ++++++++
.../kerberos/kerb/crypto/util/Camellia.java | 250 +++++++++++
.../kerberos/kerb/crypto/util/CamelliaKey.java | 433 +++++++++++++++++++
.../kerby/kerberos/kerb/crypto/util/Cmac.java | 178 ++++++++
.../kerberos/kerb/crypto/util/Confounder.java | 33 ++
.../kerby/kerberos/kerb/crypto/util/Crc32.java | 78 ++++
.../kerby/kerberos/kerb/crypto/util/Des.java | 84 ++++
.../kerby/kerberos/kerb/crypto/util/Hmac.java | 82 ++++
.../kerby/kerberos/kerb/crypto/util/Md4.java | 338 +++++++++++++++
.../kerby/kerberos/kerb/crypto/util/Nfold.java | 102 +++++
.../kerby/kerberos/kerb/crypto/util/Nonce.java | 32 ++
.../kerby/kerberos/kerb/crypto/util/Pbkdf.java | 40 ++
.../kerby/kerberos/kerb/crypto/util/Random.java | 33 ++
.../kerby/kerberos/kerb/crypto/util/Rc4.java | 63 +++
.../src/main/resources/kdc-krb5.conf | 25 --
.../kerb-crypto/src/main/resources/kdc.ldiff | 46 --
.../kerberos/kerb/crypto/CamelliaEncTest.java | 6 +-
.../kerberos/kerb/crypto/CheckSumsTest.java | 2 +-
.../kerby/kerberos/kerb/crypto/CmacTest.java | 12 +-
.../kerby/kerberos/kerb/crypto/Crc32Test.java | 6 +-
.../kerberos/kerb/crypto/DecryptionTest.java | 9 +-
.../kerberos/kerb/crypto/DesKeyMakerTest.java | 9 +-
.../kerberos/kerb/crypto/KeyDeriveTest.java | 5 +-
.../kerberos/kerb/crypto/String2keyTest.java | 8 +-
.../kerby/kerberos/kerb/server/KdcTest.java | 9 +-
.../kerberos/kerb/server/WithCertKdcTest.java | 13 +-
.../kerberos/kerb/server/WithTokenKdcTest.java | 11 +-
.../kerberos/kerb/server/TestKdcConfigLoad.java | 25 +-
.../kerby/kerberos/kerb/KrbOutputStream.java | 12 +-
.../kerb/ccache/CredCacheOutputStream.java | 54 +--
.../kerberos/kerb/ccache/CredentialCache.java | 5 +-
.../kerby/kerberos/kerb/keytab/Keytab.java | 38 +-
.../kerby/kerberos/kerb/keytab/KeytabEntry.java | 24 +-
.../kerberos/kerb/keytab/KeytabInputStream.java | 3 +-
.../kerb/keytab/KeytabOutputStream.java | 4 +-
.../kerby/kerberos/kerb/util/CcacheTest.java | 9 +-
.../kerberos/kerb/util/EncryptionTest.java | 10 +-
.../kerby/kerberos/kerb/util/KeysTest.java | 15 +-
.../kerby/kerberos/kerb/util/KeytabTest.java | 13 +-
kerby-kerb/pom.xml | 7 +
.../main/java/org/apache/kerby/config/Conf.java | 11 +-
.../org/apache/kerby/config/ConfigImpl.java | 4 +-
.../org/apache/kerby/config/ConfigObject.java | 95 ++--
.../apache/kerby/config/IniConfigLoader.java | 4 +
.../apache/kerby/config/MapConfigLoader.java | 4 +-
.../kerby/config/PropertiesConfigLoader.java | 3 +-
.../apache/kerby/config/XmlConfigLoader.java | 37 +-
.../java/org/apache/kerby/config/ConfTest.java | 34 +-
.../org/apache/kerby/config/ConfigImplTest.java | 19 +-
.../org/apache/kerby/config/IniConfigTest.java | 13 +-
.../org/apache/kerby/transport/Acceptor.java | 2 +-
.../org/apache/kerby/transport/Connector.java | 2 +-
.../org/apache/kerby/transport/Network.java | 8 +-
.../kerby/transport/tcp/TcpTransport.java | 4 +-
.../org/apache/kerby/event/NetworkUtil.java | 47 ++
.../java/org/apache/kerby/event/TestBuffer.java | 7 +-
.../kerby/event/network/TestNetworkBase.java | 10 +-
.../kerby/event/network/TestNetworkClient.java | 15 +-
.../kerby/event/network/TestNetworkServer.java | 11 +-
.../org/apache/kerby/event/tcp/TestTcpBase.java | 7 +-
.../apache/kerby/event/tcp/TestTcpClient.java | 10 +-
.../apache/kerby/event/tcp/TestTcpServer.java | 20 +-
.../org/apache/kerby/event/udp/TestUdpBase.java | 7 +-
.../apache/kerby/event/udp/TestUdpClient.java | 10 +-
.../apache/kerby/event/udp/TestUdpServer.java | 8 +-
.../main/java/org/apache/kerby/pki/Pkix.java | 4 +-
lib/kerby-pkix/src/main/resources/cacert.pem | 23 -
lib/kerby-pkix/src/main/resources/cakey.pem | 27 --
.../src/main/resources/extensions.kdc | 36 --
lib/kerby-pkix/src/main/resources/kdccert.pem | 26 --
lib/kerby-pkix/src/main/resources/kdckey.pem | 27 --
lib/kerby-pkix/src/main/resources/usercert.pem | 26 --
lib/kerby-pkix/src/main/resources/userkey.pem | 27 --
.../java/org/apache/kerby/pki/PkixTest.java | 7 +-
lib/kerby-pkix/src/test/resources/cacert.pem | 23 +
lib/kerby-pkix/src/test/resources/cakey.pem | 27 ++
.../src/test/resources/extensions.kdc | 36 ++
lib/kerby-pkix/src/test/resources/kdccert.pem | 26 ++
lib/kerby-pkix/src/test/resources/kdckey.pem | 27 ++
lib/kerby-pkix/src/test/resources/usercert.pem | 26 ++
lib/kerby-pkix/src/test/resources/userkey.pem | 27 ++
lib/kerby-token/pom.xml | 4 +-
lib/pom.xml | 7 +
232 files changed, 3698 insertions(+), 3076 deletions(-)
----------------------------------------------------------------------