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/12/07 04:33:56 UTC
[26/26] directory-kerby git commit: merge from master.
merge from master.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/1d9567ec
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/1d9567ec
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/1d9567ec
Branch: refs/heads/pkinit-support
Commit: 1d9567ec2716d19e54c53343fd6541cd6018609a
Parents: 38b2aa3 68c837f
Author: plusplusjiajia <ji...@intel.com>
Authored: Mon Dec 7 11:39:55 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Mon Dec 7 11:39:55 2015 +0800
----------------------------------------------------------------------
docs/kerby-checkstyle.xml | 2 +-
.../main/java/org/apache/kerby/asn1/Asn1.java | 95 ++
.../java/org/apache/kerby/asn1/Asn1Dump.java | 72 --
.../org/apache/kerby/asn1/Asn1Dumpable.java | 26 +
.../java/org/apache/kerby/asn1/Asn1Dumper.java | 91 ++
.../org/apache/kerby/asn1/Asn1FieldInfo.java | 12 +-
.../java/org/apache/kerby/asn1/Asn1Header.java | 54 +
.../org/apache/kerby/asn1/Asn1InputBuffer.java | 108 --
.../org/apache/kerby/asn1/Asn1OutputBuffer.java | 67 --
.../java/org/apache/kerby/asn1/EnumType.java | 28 +
.../org/apache/kerby/asn1/ExplicitField.java | 6 +-
.../org/apache/kerby/asn1/ImplicitField.java | 6 +-
.../apache/kerby/asn1/LimitedByteBuffer.java | 121 --
.../main/java/org/apache/kerby/asn1/Tag.java | 141 +++
.../java/org/apache/kerby/asn1/TagClass.java | 2 +-
.../org/apache/kerby/asn1/TaggingOption.java | 8 +-
.../org/apache/kerby/asn1/UniversalTag.java | 10 +-
.../kerby/asn1/type/AbstractAsn1Type.java | 47 +-
.../org/apache/kerby/asn1/type/Asn1Any.java | 47 +-
.../apache/kerby/asn1/type/Asn1BitString.java | 7 +
.../apache/kerby/asn1/type/Asn1BmpString.java | 6 +-
.../org/apache/kerby/asn1/type/Asn1Boolean.java | 6 +-
.../org/apache/kerby/asn1/type/Asn1Choice.java | 33 +-
.../apache/kerby/asn1/type/Asn1Collection.java | 88 +-
.../kerby/asn1/type/Asn1CollectionOf.java | 38 +-
.../kerby/asn1/type/Asn1CollectionType.java | 100 +-
.../apache/kerby/asn1/type/Asn1Constructed.java | 107 ++
.../apache/kerby/asn1/type/Asn1EnumType.java | 27 -
.../apache/kerby/asn1/type/Asn1Enumerated.java | 9 +-
.../org/apache/kerby/asn1/type/Asn1Eoc.java | 54 +
.../org/apache/kerby/asn1/type/Asn1Flags.java | 10 +-
.../org/apache/kerby/asn1/type/Asn1Item.java | 96 +-
.../org/apache/kerby/asn1/type/Asn1Null.java | 10 +-
.../org/apache/kerby/asn1/type/Asn1Object.java | 356 ++----
.../apache/kerby/asn1/type/Asn1OctetString.java | 14 +-
.../apache/kerby/asn1/type/Asn1Sequence.java | 3 +-
.../apache/kerby/asn1/type/Asn1SequenceOf.java | 3 +-
.../kerby/asn1/type/Asn1SequenceType.java | 2 +-
.../org/apache/kerby/asn1/type/Asn1Set.java | 3 +-
.../org/apache/kerby/asn1/type/Asn1SetOf.java | 3 +-
.../org/apache/kerby/asn1/type/Asn1SetType.java | 2 +-
.../org/apache/kerby/asn1/type/Asn1Simple.java | 33 +-
.../org/apache/kerby/asn1/type/Asn1String.java | 4 +-
.../org/apache/kerby/asn1/type/Asn1Tagging.java | 27 +-
.../kerby/asn1/type/Asn1TaggingCollection.java | 183 +++
.../kerby/asn1/type/Asn1TaggingSequence.java | 38 +
.../apache/kerby/asn1/type/Asn1TaggingSet.java | 39 +
.../org/apache/kerby/asn1/type/Asn1Type.java | 24 +-
.../kerby/asn1/type/TaggingCollection.java | 170 ---
.../apache/kerby/asn1/type/TaggingSequence.java | 38 -
.../org/apache/kerby/asn1/type/TaggingSet.java | 38 -
.../org/apache/kerby/asn1/util/Asn1Reader.java | 114 ++
.../org/apache/kerby/asn1/util/Asn1Reader1.java | 47 +
.../org/apache/kerby/asn1/util/Asn1Reader2.java | 62 ++
.../org/apache/kerby/asn1/util/Asn1Util.java | 119 ++
.../java/org/apache/kerby/asn1/util/Base64.java | 1048 ++++++++++++++++++
.../org/apache/kerby/asn1/util/HexUtil.java | 113 ++
.../java/org/apache/kerby/asn1/util/IOUtil.java | 109 ++
.../java/org/apache/kerby/asn1/util/Utf8.java | 34 +
.../org/apache/kerby/asn1/PersonnelRecord.java | 85 +-
.../org/apache/kerby/asn1/TestAsn1Boolean.java | 5 +-
.../apache/kerby/asn1/TestAsn1Collection.java | 13 +-
.../org/apache/kerby/asn1/TestAsn1Dump.java | 41 +
.../org/apache/kerby/asn1/TestAsn1Flags.java | 11 +-
.../org/apache/kerby/asn1/TestAsn1Input.java | 35 -
.../org/apache/kerby/asn1/TestAsn1Integer.java | 5 +-
.../kerby/asn1/TestAsn1ObjectIdentifier.java | 5 +-
.../org/apache/kerby/asn1/TestAsn1UtcTime.java | 5 +-
.../apache/kerby/asn1/TestPersonnelRecord.java | 27 +-
.../test/java/org/apache/kerby/asn1/Util.java | 153 ---
.../kerberos/kdc/WithTokenKdcTestBase.java | 6 +-
.../src/test/resources/log4j.properties | 30 +
kerby-kerb/integration-test/run/login.conf | 2 +-
.../kerb/integration/test/AppClient.java | 2 +-
.../kerb/integration/test/AppServer.java | 4 +-
.../kerb/integration/test/gss/GssAppClient.java | 16 +-
.../kerb/integration/test/gss/GssAppServer.java | 30 +-
.../integration/test/sasl/SaslAppClient.java | 4 +-
.../integration/test/sasl/SaslAppServer.java | 18 +-
.../integration/test/TokenLoginTestBase.java | 6 +-
.../src/test/resources/log4j.properties | 30 +
.../kerby/kerberos/kerb/preauth/PaFlag.java | 11 +-
.../kerby/kerberos/kerb/codec/CodecTest.java | 3 +-
.../apache/kerby/kerberos/kerb/KrbCodec.java | 19 +-
.../kerby/kerberos/kerb/KrbErrorCode.java | 11 +-
.../kerberos/kerb/type/KrbAppSequenceType.java | 16 +-
.../kerberos/kerb/type/KrbSequenceType.java | 12 +-
.../kerby/kerberos/kerb/type/ad/AdToken.java | 16 +-
.../kerb/type/ad/AuthorizationDataEntry.java | 18 +-
.../kerb/type/ad/AuthorizationType.java | 11 +-
.../kerby/kerberos/kerb/type/ap/ApOption.java | 11 +-
.../kerby/kerberos/kerb/type/ap/ApRep.java | 18 +-
.../kerby/kerberos/kerb/type/ap/ApReq.java | 22 +-
.../kerberos/kerb/type/ap/Authenticator.java | 33 +-
.../kerberos/kerb/type/ap/EncAPRepPart.java | 23 +-
.../kerby/kerberos/kerb/type/base/CheckSum.java | 18 +-
.../kerberos/kerb/type/base/CheckSumType.java | 7 +-
.../kerberos/kerb/type/base/EncryptedData.java | 20 +-
.../kerberos/kerb/type/base/EncryptionKey.java | 18 +-
.../kerberos/kerb/type/base/EncryptionType.java | 6 +-
.../kerb/type/base/EtypeInfo2Entry.java | 20 +-
.../kerberos/kerb/type/base/EtypeInfoEntry.java | 18 +-
.../kerberos/kerb/type/base/HostAddrType.java | 11 +-
.../kerberos/kerb/type/base/HostAddress.java | 18 +-
.../kerby/kerberos/kerb/type/base/KeyUsage.java | 11 +-
.../kerby/kerberos/kerb/type/base/KrbError.java | 38 +-
.../kerberos/kerb/type/base/KrbMessage.java | 20 +-
.../kerberos/kerb/type/base/KrbMessageType.java | 11 +-
.../kerby/kerberos/kerb/type/base/KrbToken.java | 29 +-
.../kerberos/kerb/type/base/LastReqEntry.java | 18 +-
.../kerberos/kerb/type/base/LastReqType.java | 11 +-
.../kerby/kerberos/kerb/type/base/NameType.java | 11 +-
.../kerberos/kerb/type/base/PrincipalName.java | 19 +-
.../kerby/kerberos/kerb/type/base/SamType.java | 9 +-
.../kerberos/kerb/type/base/TokenFormat.java | 11 +-
.../kerb/type/base/TransitedEncoding.java | 18 +-
.../kerb/type/base/TransitedEncodingType.java | 11 +-
.../kerberos/kerb/type/fast/ArmorType.java | 11 +-
.../kerberos/kerb/type/fast/FastOption.java | 11 +-
.../kerberos/kerb/type/fast/KrbFastArmor.java | 18 +-
.../kerb/type/fast/KrbFastArmoredRep.java | 16 +-
.../kerb/type/fast/KrbFastArmoredReq.java | 20 +-
.../kerb/type/fast/KrbFastFinished.java | 20 +-
.../kerberos/kerb/type/fast/KrbFastReq.java | 20 +-
.../kerb/type/fast/KrbFastResponse.java | 22 +-
.../kerberos/kerb/type/fast/PaAuthnEntry.java | 20 +-
.../kerberos/kerb/type/fast/PaFxFastReply.java | 16 +-
.../kerb/type/fast/PaFxFastRequest.java | 16 +-
.../kerberos/kerb/type/kdc/EncKdcRepPart.java | 38 +-
.../kerby/kerberos/kerb/type/kdc/KdcOption.java | 11 +-
.../kerby/kerberos/kerb/type/kdc/KdcRep.java | 26 +-
.../kerby/kerberos/kerb/type/kdc/KdcReq.java | 20 +-
.../kerberos/kerb/type/kdc/KdcReqBody.java | 38 +-
.../kerb/type/pa/PaAuthenticationSetElem.java | 20 +-
.../kerberos/kerb/type/pa/PaDataEntry.java | 18 +-
.../kerby/kerberos/kerb/type/pa/PaDataType.java | 11 +-
.../kerby/kerberos/kerb/type/pa/PaEncTsEnc.java | 18 +-
.../kerberos/kerb/type/pa/otp/OtpTokenInfo.java | 32 +-
.../kerb/type/pa/otp/PaOtpChallenge.java | 24 +-
.../kerberos/kerb/type/pa/pkinit/AuthPack.java | 22 +-
.../kerberos/kerb/type/pa/pkinit/DHRepInfo.java | 18 +-
.../pa/pkinit/ExternalPrincipalIdentifier.java | 20 +-
.../kerb/type/pa/pkinit/KdcDHKeyInfo.java | 20 +-
.../kerb/type/pa/pkinit/Krb5PrincipalName.java | 18 +-
.../kerberos/kerb/type/pa/pkinit/PaPkAsRep.java | 18 +-
.../kerberos/kerb/type/pa/pkinit/PaPkAsReq.java | 20 +-
.../kerb/type/pa/pkinit/PkAuthenticator.java | 22 +-
.../kerb/type/pa/pkinit/ReplyKeyPack.java | 18 +-
.../kerb/type/pa/token/PaTokenChallenge.java | 16 +-
.../kerb/type/pa/token/PaTokenRequest.java | 18 +-
.../kerberos/kerb/type/pa/token/TokenFlag.java | 11 +-
.../kerberos/kerb/type/pa/token/TokenInfo.java | 18 +-
.../kerb/type/ticket/EncTicketPart.java | 36 +-
.../kerby/kerberos/kerb/type/ticket/Ticket.java | 22 +-
.../kerberos/kerb/type/ticket/TicketFlag.java | 11 +-
.../kerby/kerberos/kerb/server/KdcConfig.java | 6 +-
.../kerberos/kerb/server/KdcConfigKey.java | 6 +-
.../kerb/server/preauth/token/TokenPreauth.java | 2 +-
.../kerby/kerberos/kerb/client/JaasKrbUtil.java | 2 +-
.../org/apache/kerby/cms/type/Attribute.java | 18 +-
.../cms/type/AttributeCertificateInfoV1.java | 33 +-
.../kerby/cms/type/AttributeCertificateV1.java | 20 +-
.../org/apache/kerby/cms/type/Certificate.java | 19 +-
.../kerby/cms/type/CertificateChoices.java | 23 +-
.../apache/kerby/cms/type/CertificateList.java | 20 +-
.../org/apache/kerby/cms/type/CmsVersion.java | 9 +-
.../apache/kerby/cms/type/CompressedData.java | 19 +-
.../org/apache/kerby/cms/type/ContentInfo.java | 18 +-
.../kerby/cms/type/EncapsulatedContentInfo.java | 18 +-
.../kerby/cms/type/ExtendedCertificate.java | 20 +-
.../kerby/cms/type/ExtendedCertificateInfo.java | 20 +-
.../kerby/cms/type/IssuerAndSerialNumber.java | 18 +-
.../kerby/cms/type/OtherCertificateFormat.java | 17 +-
.../cms/type/OtherRevocationInfoFormat.java | 18 +-
.../kerby/cms/type/RevocationInfoChoice.java | 18 +-
.../org/apache/kerby/cms/type/SignedData.java | 26 +-
.../apache/kerby/cms/type/SignerIdentifier.java | 18 +-
.../org/apache/kerby/cms/type/SignerInfo.java | 28 +-
.../java/org/apache/kerby/cms/type/Subject.java | 18 +-
.../kerby/x500/type/AttributeTypeAndValue.java | 17 +-
.../java/org/apache/kerby/x500/type/Name.java | 16 +-
.../kerby/x509/type/AccessDescription.java | 18 +-
.../kerby/x509/type/AlgorithmIdentifier.java | 19 +-
.../apache/kerby/x509/type/AttCertIssuer.java | 18 +-
.../kerby/x509/type/AttCertValidityPeriod.java | 18 +-
.../org/apache/kerby/x509/type/Attribute.java | 18 +-
.../kerby/x509/type/AttributeCertificate.java | 20 +-
.../x509/type/AttributeCertificateInfo.java | 32 +-
.../kerby/x509/type/AuthorityKeyIdentifier.java | 19 +-
.../kerby/x509/type/BasicConstraints.java | 18 +-
.../org/apache/kerby/x509/type/CRLReason.java | 11 +-
.../org/apache/kerby/x509/type/Certificate.java | 20 +-
.../apache/kerby/x509/type/CertificateList.java | 20 +-
.../apache/kerby/x509/type/CertificatePair.java | 18 +-
.../org/apache/kerby/x509/type/DHParameter.java | 19 +-
.../apache/kerby/x509/type/DSAParameter.java | 20 +-
.../org/apache/kerby/x509/type/DigestInfo.java | 18 +-
.../kerby/x509/type/DigestedObjectType.java | 11 +-
.../apache/kerby/x509/type/DirectoryString.java | 23 +-
.../org/apache/kerby/x509/type/DisplayText.java | 22 +-
.../kerby/x509/type/DistributionPoint.java | 20 +-
.../kerby/x509/type/DistributionPointName.java | 18 +-
.../apache/kerby/x509/type/EDIPartyName.java | 18 +-
.../org/apache/kerby/x509/type/Extension.java | 20 +-
.../org/apache/kerby/x509/type/GeneralName.java | 33 +-
.../apache/kerby/x509/type/GeneralSubtree.java | 20 +-
.../java/org/apache/kerby/x509/type/Holder.java | 20 +-
.../apache/kerby/x509/type/IetfAttrSyntax.java | 18 +-
.../kerby/x509/type/IetfAttrSyntaxChoice.java | 20 +-
.../apache/kerby/x509/type/IssuerSerial.java | 20 +-
.../x509/type/IssuingDistributionPoint.java | 25 +-
.../org/apache/kerby/x509/type/KeyUsage.java | 9 +-
.../apache/kerby/x509/type/NameConstraints.java | 18 +-
.../apache/kerby/x509/type/NoticeReference.java | 18 +-
.../kerby/x509/type/ObjectDigestInfo.java | 22 +-
.../org/apache/kerby/x509/type/OtherName.java | 18 +-
.../kerby/x509/type/PolicyConstraints.java | 18 +-
.../kerby/x509/type/PolicyInformation.java | 18 +-
.../apache/kerby/x509/type/PolicyMapping.java | 18 +-
.../kerby/x509/type/PolicyQualifierInfo.java | 18 +-
.../kerby/x509/type/PrivateKeyUsagePeriod.java | 18 +-
.../org/apache/kerby/x509/type/ReasonFlags.java | 9 +-
.../kerby/x509/type/RevokedCertificate.java | 20 +-
.../org/apache/kerby/x509/type/RoleSyntax.java | 18 +-
.../kerby/x509/type/SubjectPublicKeyInfo.java | 18 +-
.../org/apache/kerby/x509/type/TBSCertList.java | 29 +-
.../apache/kerby/x509/type/TBSCertificate.java | 36 +-
.../java/org/apache/kerby/x509/type/Target.java | 20 +-
.../org/apache/kerby/x509/type/TargetCert.java | 20 +-
.../java/org/apache/kerby/x509/type/Time.java | 18 +-
.../org/apache/kerby/x509/type/UserNotice.java | 18 +-
.../java/org/apache/kerby/x509/type/V2Form.java | 20 +-
pom.xml | 1 +
233 files changed, 5434 insertions(+), 2033 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/1d9567ec/docs/kerby-checkstyle.xml
----------------------------------------------------------------------
diff --cc docs/kerby-checkstyle.xml
index 6af4748,72388df..241bdf4
--- a/docs/kerby-checkstyle.xml
+++ b/docs/kerby-checkstyle.xml
@@@ -66,8 -66,8 +66,8 @@@
<!-- Checks for imports -->
<!-- See http://checkstyle.sf.net/config_import.html -->
- <module name="AvoidStarImport"/>
+ <!--module name="AvoidStarImport"/-->
- <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
+ <!--module name="IllegalImport"/--> <!-- defaults to sun.* packages -->
<module name="RedundantImport"/>
<module name="UnusedImports"/>
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/1d9567ec/kerby-asn1/src/main/java/org/apache/kerby/asn1/UniversalTag.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/1d9567ec/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1CollectionType.java
----------------------------------------------------------------------
diff --cc kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1CollectionType.java
index 7011770,36082c4..ec5e81a
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1CollectionType.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1CollectionType.java
@@@ -19,13 -19,14 +19,15 @@@
*/
package org.apache.kerby.asn1.type;
+ import org.apache.kerby.asn1.Asn1Dumpable;
+ import org.apache.kerby.asn1.Asn1Dumper;
import org.apache.kerby.asn1.Asn1FieldInfo;
- import org.apache.kerby.asn1.LimitedByteBuffer;
- import org.apache.kerby.asn1.TagClass;
+ import org.apache.kerby.asn1.EnumType;
import org.apache.kerby.asn1.TaggingOption;
+ import org.apache.kerby.asn1.UniversalTag;
import java.io.IOException;
+import java.math.BigInteger;
import java.nio.ByteBuffer;
/**
@@@ -177,12 -185,8 +186,12 @@@ public abstract class Asn1CollectionTyp
setFieldAs(index, new Asn1Integer(value));
}
- protected void setFieldAsBigInteger(int index, BigInteger value) {
++ protected void setFieldAsBigInteger(EnumType index, BigInteger value) {
+ setFieldAs(index, new Asn1Integer(value));
+ }
+
- protected <T extends Asn1Type> T getFieldAsAny(int index, Class<T> t) {
- Asn1Type value = fields[index];
+ protected <T extends Asn1Type> T getFieldAsAny(EnumType index, Class<T> t) {
+ Asn1Type value = fields[index.getValue()];
if (value != null && value instanceof Asn1Any) {
Asn1Any any = (Asn1Any) value;
return any.getValueAs(t);
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/1d9567ec/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/CodecTest.java
----------------------------------------------------------------------
diff --cc kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/CodecTest.java
index eb4083c,3507bf0..bfb2baf
--- a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/CodecTest.java
+++ b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/CodecTest.java
@@@ -47,28 -41,6 +47,27 @@@ public class CodecTest
assertThat(restored).isNotNull();
assertThat(restored.getCksumtype()).isEqualTo(mcs.getCksumtype());
assertThat(mcs.getChecksum()).isEqualTo(restored.getChecksum());
- assertThat(restored.tagNo()).isEqualTo(mcs.tagNo());
- assertThat(restored.tagFlags()).isEqualTo(mcs.tagFlags());
+ assertThat(restored.tag()).isEqualTo(mcs.tag());
}
+
+ @Test
+ public void testDecode() throws IOException {
+ AsReq expected = new AsReq();
+
+ KdcReqBody body = new KdcReqBody();
+
+ expected.setReqBody(body);
+
+ Asn1InputBuffer ib = new Asn1InputBuffer(expected.encode());
+ Asn1Type fd1 = ib.read();
+ Asn1Type fd2 = ib.read();
+ Asn1Type fd3 = ib.read();
+ Asn1Type fd4 = ib.read();
+ Asn1Type fd5 = ib.read();
+ Asn1Type fd6 = ib.read();
+ Asn1Type fd7 = ib.read();
+ Asn1Type fd8 = ib.read();
+ Asn1Type fd9 = ib.read();
+
+ }
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/1d9567ec/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/base/NameType.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/1d9567ec/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/AuthPack.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/1d9567ec/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/KdcDHKeyInfo.java
----------------------------------------------------------------------
diff --cc kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/KdcDHKeyInfo.java
index 05c2f02,f3669eb..9f6e92d
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/KdcDHKeyInfo.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/type/pa/pkinit/KdcDHKeyInfo.java
@@@ -34,12 -36,24 +36,24 @@@ import static org.apache.kerby.kerberos
}
*/
public class KdcDHKeyInfo extends KrbSequenceType {
- private static final int SUBJECT_PUBLIC_KEY = 0;
- private static final int NONCE = 1;
- private static final int DH_KEY_EXPIRATION = 2;
+ protected static enum MyEnum implements EnumType {
- SUBJECT_PUBLICK_KEY,
++ SUBJECT_PUBLIC_KEY,
+ NONCE,
+ DH_KEY_EXPIRATION;
+
+ @Override
+ public int getValue() {
+ return ordinal();
+ }
+
+ @Override
+ public String getName() {
+ return name();
+ }
+ }
static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
- new ExplicitField(SUBJECT_PUBLICK_KEY, Asn1BitString.class),
+ new ExplicitField(SUBJECT_PUBLIC_KEY, Asn1BitString.class),
new ExplicitField(NONCE, Asn1Integer.class),
new ExplicitField(DH_KEY_EXPIRATION, KerberosTime.class)
};
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/1d9567ec/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcConfig.java
----------------------------------------------------------------------
diff --cc kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcConfig.java
index 4025628,18e8b3d..a9ac3c4
--- a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcConfig.java
+++ b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcConfig.java
@@@ -168,16 -168,6 +168,16 @@@ public class KdcConfig extends Krb5Con
}
public List<String> getIssuers() {
- return Arrays.asList(getStringArray(KdcConfigKey.ISSUERS, true, KDCDEFAULT));
+ return Arrays.asList(getStringArray(KdcConfigKey.TOKEN_ISSUERS, true, KDCDEFAULT));
}
+
+ public List<String> getPkinitAnchors() {
+ return Arrays.asList(getString(
+ KdcConfigKey.PKINIT_ANCHORS, true, KDCDEFAULT));
+ }
+
+ public String getPkinitIdentity() {
+ return getString(
+ KdcConfigKey.PKINIT_IDENTITY, true, KDCDEFAULT);
+ }
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/1d9567ec/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcConfigKey.java
----------------------------------------------------------------------
diff --cc kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcConfigKey.java
index e372193,6cae218..f74951a
--- a/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcConfigKey.java
+++ b/kerby-kerb/kerb-server/src/main/java/org/apache/kerby/kerberos/kerb/server/KdcConfigKey.java
@@@ -49,11 -49,9 +49,11 @@@ public enum KdcConfigKey implements Con
ENCRYPTION_TYPES("aes128-cts-hmac-sha1-96 des3-cbc-sha1-kd"),
RESTRICT_ANONYMOUS_TO_TGT(false),
KDC_MAX_DGRAM_REPLY_SIZE(4096),
- VERIFY_KEY(),
- DECRYPTION_KEY(),
- ISSUERS(),
+ TOKEN_VERIFY_KEYS(),
+ TOKEN_DECRYPTION_KEYS(),
- TOKEN_ISSUERS();
++ TOKEN_ISSUERS(),
+ PKINIT_IDENTITY(null),
+ PKINIT_ANCHORS(null);
private Object defaultValue;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/1d9567ec/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AlgorithmIdentifier.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/1d9567ec/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DHParameter.java
----------------------------------------------------------------------
diff --cc kerby-pkix/src/main/java/org/apache/kerby/x509/type/DHParameter.java
index f66cb70,0000000..f5366c1
mode 100644,000000..100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DHParameter.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DHParameter.java
@@@ -1,51 -1,0 +1,64 @@@
+package org.apache.kerby.x509.type;
+
+import org.apache.kerby.asn1.Asn1FieldInfo;
++import org.apache.kerby.asn1.EnumType;
+import org.apache.kerby.asn1.type.Asn1Integer;
+import org.apache.kerby.asn1.type.Asn1SequenceType;
++import static org.apache.kerby.x509.type.DHParameter.MyEnum.*;
+
+import java.math.BigInteger;
+
+public class DHParameter extends Asn1SequenceType {
++ protected static enum MyEnum implements EnumType {
++ P,
++ G,
++ Q;
+
- private static final int P = 0;
- private static final int G = 1;
- private static final int Q = 2;
++ @Override
++ public int getValue() {
++ return ordinal();
++ }
++
++ @Override
++ public String getName() {
++ return name();
++ }
++ }
+
+ static Asn1FieldInfo[] fieldInfos = new Asn1FieldInfo[] {
+ new Asn1FieldInfo(P, Asn1Integer.class),
+ new Asn1FieldInfo(G, Asn1Integer.class),
+ new Asn1FieldInfo(Q, Asn1Integer.class),
+ };
+
+ public DHParameter() {
+ super(fieldInfos);
+ }
+
+ public void setP(BigInteger p) {
+ setFieldAsBigInteger(P, p);
+ }
+
+ public BigInteger getP() {
+ Asn1Integer p = getFieldAs(P, Asn1Integer.class);
+ return p.getValue();
+ }
+
+ public void setG(BigInteger g) {
+ setFieldAsBigInteger(G, g);
+ }
+
+ public BigInteger getG() {
+ Asn1Integer g = getFieldAs(G, Asn1Integer.class);
+ return g.getValue();
+ }
+
+ public void setQ(BigInteger q) {
+ setFieldAsBigInteger(Q, q);
+ }
+
+ public BigInteger getQ() {
+ Asn1Integer q = getFieldAs(Q, Asn1Integer.class);
+ return q.getValue();
+ }
+}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/1d9567ec/kerby-pkix/src/main/java/org/apache/kerby/x509/type/SubjectPublicKeyInfo.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/1d9567ec/pom.xml
----------------------------------------------------------------------