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/11/27 08:19:02 UTC
directory-kerby git commit: Fixed some checking styles
Repository: directory-kerby
Updated Branches:
refs/heads/master ac93a2010 -> e00fa4ec1
Fixed some checking styles
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/e00fa4ec
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/e00fa4ec
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/e00fa4ec
Branch: refs/heads/master
Commit: e00fa4ec1430a1cda37d554a13405f8f47ed9760
Parents: ac93a20
Author: Kai Zheng <ka...@intel.com>
Authored: Fri Nov 27 15:18:46 2015 +0800
Committer: Kai Zheng <ka...@intel.com>
Committed: Fri Nov 27 15:18:46 2015 +0800
----------------------------------------------------------------------
.../org/apache/kerby/x500/type/RDNSequence.java | 21 +++++++++++++++++++-
.../x500/type/RelativeDistinguishedName.java | 1 -
.../kerby/x509/type/AccessDescription.java | 3 ---
.../kerby/x509/type/AlgorithmIdentifier.java | 7 +++++--
.../apache/kerby/x509/type/AttCertIssuer.java | 4 +++-
.../apache/kerby/x509/type/DirectoryString.java | 2 +-
.../org/apache/kerby/x509/type/GeneralName.java | 2 +-
.../apache/kerby/x509/type/GeneralSubtrees.java | 2 +-
.../kerby/x509/type/PolicyQualifierId.java | 13 +-----------
.../org/apache/kerby/x509/type/TargetCert.java | 2 +-
10 files changed, 33 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/e00fa4ec/kerby-pkix/src/main/java/org/apache/kerby/x500/type/RDNSequence.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x500/type/RDNSequence.java b/kerby-pkix/src/main/java/org/apache/kerby/x500/type/RDNSequence.java
index f61e56b..6172725 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x500/type/RDNSequence.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x500/type/RDNSequence.java
@@ -1,3 +1,22 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
package org.apache.kerby.x500.type;
import org.apache.kerby.asn1.type.Asn1SequenceOf;
@@ -5,5 +24,5 @@ import org.apache.kerby.asn1.type.Asn1SequenceOf;
/**
* RDNSequence ::= SEQUENCE OF RelativeDistinguishedName
*/
-public class RDNSequence extends Asn1SequenceOf<RelativeDistinguishedName>{
+public class RDNSequence extends Asn1SequenceOf<RelativeDistinguishedName> {
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/e00fa4ec/kerby-pkix/src/main/java/org/apache/kerby/x500/type/RelativeDistinguishedName.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x500/type/RelativeDistinguishedName.java b/kerby-pkix/src/main/java/org/apache/kerby/x500/type/RelativeDistinguishedName.java
index 7b2dceb..e18b022 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x500/type/RelativeDistinguishedName.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x500/type/RelativeDistinguishedName.java
@@ -20,7 +20,6 @@
package org.apache.kerby.x500.type;
import org.apache.kerby.asn1.type.Asn1SetOf;
-import org.apache.kerby.x500.type.AttributeTypeAndValue;
/**
* RelativeDistinguishedName ::= SET SIZE (1..MAX) OF AttributeTypeAndValue
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/e00fa4ec/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AccessDescription.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AccessDescription.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AccessDescription.java
index 1ef91fd..5c40b48 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AccessDescription.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AccessDescription.java
@@ -33,9 +33,6 @@ import org.apache.kerby.asn1.type.Asn1SequenceType;
* </pre>
*/
public class AccessDescription extends Asn1SequenceType {
- public final static String id_ad_caIssuers = "1.3.6.1.5.5.7.48.2";
- public final static String id_ad_ocsp = "1.3.6.1.5.5.7.48.1";
-
private static final int ACCESS_METHOD = 0;
private static final int ACCESS_LOCATION = 1;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/e00fa4ec/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AlgorithmIdentifier.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AlgorithmIdentifier.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AlgorithmIdentifier.java
index 3ce7736..c5c1329 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AlgorithmIdentifier.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AlgorithmIdentifier.java
@@ -19,8 +19,11 @@
*/
package org.apache.kerby.x509.type;
-
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.type.Asn1Any;
+import org.apache.kerby.asn1.type.Asn1FieldInfo;
+import org.apache.kerby.asn1.type.Asn1ObjectIdentifier;
+import org.apache.kerby.asn1.type.Asn1SequenceType;
+import org.apache.kerby.asn1.type.Asn1Type;
/**
* AlgorithmIdentifier ::= SEQUENCE {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/e00fa4ec/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AttCertIssuer.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AttCertIssuer.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AttCertIssuer.java
index 0fbef5c..1120b39 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AttCertIssuer.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/AttCertIssuer.java
@@ -19,7 +19,9 @@
*/
package org.apache.kerby.x509.type;
-import org.apache.kerby.asn1.type.*;
+import org.apache.kerby.asn1.type.Asn1Choice;
+import org.apache.kerby.asn1.type.Asn1FieldInfo;
+import org.apache.kerby.asn1.type.ExplicitField;
/**
*
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/e00fa4ec/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DirectoryString.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DirectoryString.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DirectoryString.java
index 7a623ff..dfc6fd8 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DirectoryString.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/DirectoryString.java
@@ -38,7 +38,7 @@ import org.apache.kerby.asn1.type.Asn1Utf8String;
* }
* </pre>
*/
-public class DirectoryString extends Asn1Choice{
+public class DirectoryString extends Asn1Choice {
private static final int TELETEX_STRING = 0;
private static final int PRINTABLE_STRING = 1;
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/e00fa4ec/kerby-pkix/src/main/java/org/apache/kerby/x509/type/GeneralName.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/GeneralName.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/GeneralName.java
index 4d93d9b..17581af 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/GeneralName.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/GeneralName.java
@@ -106,7 +106,7 @@ public class GeneralName extends Asn1Choice {
}
public Name getDirectoryName() {
- return getFieldAs(DIRECTORY_NAME,Name.class);
+ return getFieldAs(DIRECTORY_NAME, Name.class);
}
public void setDirectoryName(Name directoryName) {
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/e00fa4ec/kerby-pkix/src/main/java/org/apache/kerby/x509/type/GeneralSubtrees.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/GeneralSubtrees.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/GeneralSubtrees.java
index 267d22d..89520a5 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/GeneralSubtrees.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/GeneralSubtrees.java
@@ -21,5 +21,5 @@ package org.apache.kerby.x509.type;
import org.apache.kerby.asn1.type.Asn1SequenceOf;
-public class GeneralSubtrees extends Asn1SequenceOf<GeneralSubtree>{
+public class GeneralSubtrees extends Asn1SequenceOf<GeneralSubtree> {
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/e00fa4ec/kerby-pkix/src/main/java/org/apache/kerby/x509/type/PolicyQualifierId.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/PolicyQualifierId.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/PolicyQualifierId.java
index b8895ef..b2d30e1 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/PolicyQualifierId.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/PolicyQualifierId.java
@@ -30,17 +30,6 @@ import org.apache.kerby.asn1.type.Asn1ObjectIdentifier;
* OBJECT IDENTIFIER (id-qt-cps | id-qt-unotice)
* </pre>
*/
-public class PolicyQualifierId extends Asn1ObjectIdentifier
-{
- private static final String id_qt = "1.3.6.1.5.5.7.2";
+public class PolicyQualifierId extends Asn1ObjectIdentifier {
- private PolicyQualifierId(String id)
- {
- super(id);
- }
-
- public static final PolicyQualifierId id_qt_cps =
- new PolicyQualifierId(id_qt + ".1");
- public static final PolicyQualifierId id_qt_unotice =
- new PolicyQualifierId(id_qt + ".2");
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/e00fa4ec/kerby-pkix/src/main/java/org/apache/kerby/x509/type/TargetCert.java
----------------------------------------------------------------------
diff --git a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/TargetCert.java b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/TargetCert.java
index b79fe3f..e630e08 100644
--- a/kerby-pkix/src/main/java/org/apache/kerby/x509/type/TargetCert.java
+++ b/kerby-pkix/src/main/java/org/apache/kerby/x509/type/TargetCert.java
@@ -29,7 +29,7 @@ import org.apache.kerby.asn1.type.Asn1SequenceType;
* certDigestInfo ObjectDigestInfo OPTIONAL
* }
*/
-public class TargetCert extends Asn1SequenceType{
+public class TargetCert extends Asn1SequenceType {
private static final int TARGET_CERTIFICATE = 0;
private static final int TARGET_NAME = 1;
private static final int CERT_DIGEST_INFO = 2;