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:27:46 UTC
[05/30] directory-kerberos git commit: Refined some codes related to
encoding option
Refined some codes related to encoding option
Project: http://git-wip-us.apache.org/repos/asf/directory-kerberos/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerberos/commit/7fbebbcd
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerberos/tree/7fbebbcd
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerberos/diff/7fbebbcd
Branch: refs/heads/installation
Commit: 7fbebbcdf6477310cdfc29e90f2ed50ed4fe0be8
Parents: 0228e16
Author: Drankye <dr...@gmail.com>
Authored: Sun Feb 1 09:55:26 2015 +0800
Committer: Drankye <dr...@gmail.com>
Committed: Sun Feb 1 09:55:26 2015 +0800
----------------------------------------------------------------------
.../apache/kerby/asn1/type/AbstractAsn1Type.java | 14 +++++++++++++-
.../org/apache/kerby/asn1/type/Asn1Tagging.java | 16 ++++++++--------
2 files changed, 21 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/7fbebbcd/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/AbstractAsn1Type.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/AbstractAsn1Type.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/AbstractAsn1Type.java
index 99b54fb..e06fcc9 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/AbstractAsn1Type.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/AbstractAsn1Type.java
@@ -38,7 +38,7 @@ public abstract class AbstractAsn1Type<T> implements Asn1Type {
private TagClass tagClass = TagClass.UNKNOWN;
private int tagNo = -1;
private int tagFlags = -1;
- protected EncodingOption encodingOption = EncodingOption.UNKNOWN;
+ private EncodingOption encodingOption = EncodingOption.UNKNOWN;
private int encodingLen = -1;
// The wrapped real value.
private T value;
@@ -67,10 +67,22 @@ public abstract class AbstractAsn1Type<T> implements Asn1Type {
this.value = value;
}
+ /**
+ * Set encoding option
+ * @param encodingOption
+ */
public void setEncodingOption(EncodingOption encodingOption) {
this.encodingOption = encodingOption;
}
+ /**
+ * Get encoding option
+ * @return encoding option
+ */
+ public EncodingOption getEncodingOption() {
+ return this.encodingOption;
+ }
+
public T getValue() {
return value;
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/7fbebbcd/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Tagging.java
----------------------------------------------------------------------
diff --git a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Tagging.java b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Tagging.java
index 2b2b97f..9f56b39 100644
--- a/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Tagging.java
+++ b/kerby-asn1/src/main/java/org/apache/kerby/asn1/type/Asn1Tagging.java
@@ -47,9 +47,9 @@ public class Asn1Tagging<T extends Asn1Type> extends AbstractAsn1Type<T> {
@Override
protected int encodingBodyLength() {
AbstractAsn1Type value = (AbstractAsn1Type) getValue();
- if (encodingOption.isExplicit()) {
+ if (getEncodingOption().isExplicit()) {
return value.encodingLength();
- } else if (encodingOption.isImplicit()) {
+ } else if (getEncodingOption().isImplicit()) {
return value.encodingBodyLength();
} else {
throw new RuntimeException("Invalid util option, only allowing explicit/implicit");
@@ -58,9 +58,9 @@ public class Asn1Tagging<T extends Asn1Type> extends AbstractAsn1Type<T> {
@Override
public boolean isConstructed() {
- if (encodingOption.isExplicit()) {
+ if (getEncodingOption().isExplicit()) {
return true;
- } else if (encodingOption.isImplicit()) {
+ } else if (getEncodingOption().isImplicit()) {
AbstractAsn1Type value = (AbstractAsn1Type) getValue();
return value.isConstructed();
}
@@ -70,9 +70,9 @@ public class Asn1Tagging<T extends Asn1Type> extends AbstractAsn1Type<T> {
@Override
protected void encodeBody(ByteBuffer buffer) {
AbstractAsn1Type value = (AbstractAsn1Type) getValue();
- if (encodingOption.isExplicit()) {
+ if (getEncodingOption().isExplicit()) {
value.encode(buffer);
- } else if (encodingOption.isImplicit()) {
+ } else if (getEncodingOption().isImplicit()) {
value.encodeBody(buffer);
} else {
throw new RuntimeException("Invalid util option, only allowing explicit/implicit");
@@ -82,9 +82,9 @@ public class Asn1Tagging<T extends Asn1Type> extends AbstractAsn1Type<T> {
@Override
protected void decodeBody(LimitedByteBuffer content) throws IOException {
AbstractAsn1Type value = (AbstractAsn1Type) getValue();
- if (encodingOption.isExplicit()) {
+ if (getEncodingOption().isExplicit()) {
value.decode(content);
- } else if (encodingOption.isImplicit()) {
+ } else if (getEncodingOption().isImplicit()) {
value.decodeBody(content);
} else {
throw new RuntimeException("Invalid util option, only allowing explicit/implicit");