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:05 UTC
[24/30] directory-kerberos git commit: Some test refactoring
Some test refactoring
Project: http://git-wip-us.apache.org/repos/asf/directory-kerberos/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerberos/commit/4ae948c6
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerberos/tree/4ae948c6
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerberos/diff/4ae948c6
Branch: refs/heads/installation
Commit: 4ae948c6c3cb0458d90c1af547d1ebab99c40849
Parents: f2ccbc3
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Thu Feb 5 11:54:00 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Thu Feb 5 11:54:00 2015 +0000
----------------------------------------------------------------------
.../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 +-
.../kerb/codec/kerberos/KerberosToken.java | 6 +-
.../kerberos/kerb/codec/spnego/SpnegoToken.java | 4 +-
.../kerberos/kerb/codec/test/CodecTestUtil.java | 13 +++--
.../kerberos/kerb/codec/test/TestKerberos.java | 6 +-
.../kerberos/kerb/codec/test/TestSpnego.java | 3 +-
.../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/kerberos/kerb/KrbErrorException.java | 4 ++
.../kerby/kerberos/kerb/KrbException.java | 5 ++
.../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 +-
55 files changed, 120 insertions(+), 97 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/aes128-kerberos-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/aes128-kerberos-data b/kerby-kerb/kerb-core-test/src/main/resources/aes128-kerberos-data
deleted file mode 100644
index 7f3b582..0000000
Binary files a/kerby-kerb/kerb-core-test/src/main/resources/aes128-kerberos-data and /dev/null differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/aes128-key-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/aes128-key-data b/kerby-kerb/kerb-core-test/src/main/resources/aes128-key-data
deleted file mode 100644
index 4ba2540..0000000
--- a/kerby-kerb/kerb-core-test/src/main/resources/aes128-key-data
+++ /dev/null
@@ -1 +0,0 @@
-����\���U�s�7"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/aes128-spnego-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/aes128-spnego-data b/kerby-kerb/kerb-core-test/src/main/resources/aes128-spnego-data
deleted file mode 100644
index 13c89e6..0000000
Binary files a/kerby-kerb/kerb-core-test/src/main/resources/aes128-spnego-data and /dev/null differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/aes256-kerberos-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/aes256-kerberos-data b/kerby-kerb/kerb-core-test/src/main/resources/aes256-kerberos-data
deleted file mode 100644
index b7d539f..0000000
Binary files a/kerby-kerb/kerb-core-test/src/main/resources/aes256-kerberos-data and /dev/null differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/aes256-key-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/aes256-key-data b/kerby-kerb/kerb-core-test/src/main/resources/aes256-key-data
deleted file mode 100644
index 24792c1..0000000
Binary files a/kerby-kerb/kerb-core-test/src/main/resources/aes256-key-data and /dev/null differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/aes256-spnego-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/aes256-spnego-data b/kerby-kerb/kerb-core-test/src/main/resources/aes256-spnego-data
deleted file mode 100644
index 6a7e55c..0000000
Binary files a/kerby-kerb/kerb-core-test/src/main/resources/aes256-spnego-data and /dev/null differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/asrep.token
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/asrep.token b/kerby-kerb/kerb-core-test/src/main/resources/asrep.token
deleted file mode 100644
index d77cff7..0000000
Binary files a/kerby-kerb/kerb-core-test/src/main/resources/asrep.token and /dev/null differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/asreq.token
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/asreq.token b/kerby-kerb/kerb-core-test/src/main/resources/asreq.token
deleted file mode 100644
index 6d503b3..0000000
Binary files a/kerby-kerb/kerb-core-test/src/main/resources/asreq.token and /dev/null differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/des-kerberos-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/des-kerberos-data b/kerby-kerb/kerb-core-test/src/main/resources/des-kerberos-data
deleted file mode 100644
index 3db6963..0000000
Binary files a/kerby-kerb/kerb-core-test/src/main/resources/des-kerberos-data and /dev/null differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/des-key-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/des-key-data b/kerby-kerb/kerb-core-test/src/main/resources/des-key-data
deleted file mode 100644
index 84a0c50..0000000
--- a/kerby-kerb/kerb-core-test/src/main/resources/des-key-data
+++ /dev/null
@@ -1 +0,0 @@
-��2^�L�
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/des-pac-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/des-pac-data b/kerby-kerb/kerb-core-test/src/main/resources/des-pac-data
deleted file mode 100644
index 7408111..0000000
Binary files a/kerby-kerb/kerb-core-test/src/main/resources/des-pac-data and /dev/null differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/des-spnego-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/des-spnego-data b/kerby-kerb/kerb-core-test/src/main/resources/des-spnego-data
deleted file mode 100644
index 04a56e8..0000000
Binary files a/kerby-kerb/kerb-core-test/src/main/resources/des-spnego-data and /dev/null differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/exceptions.properties
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/exceptions.properties b/kerby-kerb/kerb-core-test/src/main/resources/exceptions.properties
deleted file mode 100644
index c9cc814..0000000
--- a/kerby-kerb/kerb-core-test/src/main/resources/exceptions.properties
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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.
-object.cast.fail=Unable to cast object from {0} to {1}.
-
-spnego.token.empty=Empty SPNego token.
-spnego.token.invalid=Not a valid SPNego token: {0}.
-spnego.token.malformed=Malformed SPNego token.
-spnego.field.invalid=Not a valid SPNego token field: {0}.
-
-
-kerberos.object.cast=Unable to cast Kerberos object from {0} to {1}.
-kerberos.token.empty=Empty Kerberos token.
-kerberos.token.invalid=Not a Kerberos token.
-kerberos.token.malformed=Malformed Kerberos token.
-kerberos.kdcReq.empty=Empty message.
-kerberos.kdcReq.invalid=Not a KRB_AP_REQ message.
-kerberos.ticket.empty=Empty Kerberos ticket.
-kerberos.ticket.invalid=Not a Kerberos v5 ticket.
-kerberos.ticket.malformed=Malformed Kerberos ticket.
-kerberos.field.invalid=Not a valid Kerberos ticket field: {0}.
-kerberos.field.malformed=Malformed Kerberos ticket field.
-kerberos.key.notfound=Unable to find appropriate key of type {0}.
-kerberos.version.invalid=Invalid version of Kerberos ticket: {0}.
-kerberos.login.fail=Unable to get server keys.
-kerberos.decrypt.fail=Unable to decrypt encrypted data using key of type {0}.
-
-pac.token.empty=Empty PAC token.
-pac.token.malformed=Malformed PAC token.
-pac.logoninfo.malformed=Malformed PAC logon info.
-pac.signature.malformed=Malformed PAC signature.
-pac.signature.invalid=Invalid PAC signature.
-pac.string.notempty=String not empty while expected null.
-pac.string.malformed.size=Inconsistent string lengths.
-pac.string.invalid.size=Inconsistent string size: {1}, expecting {0}.
-pac.groups.invalid.size=Group count ({0}) doesn't match the real number of groups ({1}) in the PAC.
-pac.extrasids.invalid.size=Extra SID count ({0}) doesn't match the real number of extra SID ({1}) in the PAC.
-pac.resourcegroups.invalid.size=Resource group count ({0}) doesn't match the real number of resource groups ({1}) in the PAC.
-pac.sid.malformed.size=Inconsistent SID length.
-pac.subauthority.malformed.size=Incorrect byte array length: {0}; must be multiple of 4.
-pac.version.invalid=Invalid version of PAC token: {0}.
-pac.check.fail=Unable to check PAC signature.
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/rc4-kerberos-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/rc4-kerberos-data b/kerby-kerb/kerb-core-test/src/main/resources/rc4-kerberos-data
deleted file mode 100644
index 6be7086..0000000
Binary files a/kerby-kerb/kerb-core-test/src/main/resources/rc4-kerberos-data and /dev/null differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/rc4-key-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/rc4-key-data b/kerby-kerb/kerb-core-test/src/main/resources/rc4-key-data
deleted file mode 100644
index 64f9d9c..0000000
--- a/kerby-kerb/kerb-core-test/src/main/resources/rc4-key-data
+++ /dev/null
@@ -1 +0,0 @@
-l�܇y#�l�mv��k�
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/rc4-pac-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/rc4-pac-data b/kerby-kerb/kerb-core-test/src/main/resources/rc4-pac-data
deleted file mode 100644
index df45f91..0000000
Binary files a/kerby-kerb/kerb-core-test/src/main/resources/rc4-pac-data and /dev/null differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/rc4-spnego-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/rc4-spnego-data b/kerby-kerb/kerb-core-test/src/main/resources/rc4-spnego-data
deleted file mode 100644
index 91cbe26..0000000
Binary files a/kerby-kerb/kerb-core-test/src/main/resources/rc4-spnego-data and /dev/null differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/server.keytab
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/server.keytab b/kerby-kerb/kerb-core-test/src/main/resources/server.keytab
deleted file mode 100644
index b44347c..0000000
Binary files a/kerby-kerb/kerb-core-test/src/main/resources/server.keytab and /dev/null differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/tgsrep.token
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/tgsrep.token b/kerby-kerb/kerb-core-test/src/main/resources/tgsrep.token
deleted file mode 100644
index 25d6270..0000000
Binary files a/kerby-kerb/kerb-core-test/src/main/resources/tgsrep.token and /dev/null differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/main/resources/tgsreq.token
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/main/resources/tgsreq.token b/kerby-kerb/kerb-core-test/src/main/resources/tgsreq.token
deleted file mode 100644
index 69f6b46..0000000
Binary files a/kerby-kerb/kerb-core-test/src/main/resources/tgsreq.token and /dev/null differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/kerberos/KerberosApRequest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/kerberos/KerberosApRequest.java b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/kerberos/KerberosApRequest.java
index 4266ea6..3ffb686 100644
--- a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/kerberos/KerberosApRequest.java
+++ b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/kerberos/KerberosApRequest.java
@@ -33,7 +33,7 @@ public class KerberosApRequest {
private KerberosTicket ticket;
public KerberosApRequest(byte[] token, EncryptionKey key) throws Exception {
- if(token.length <= 0) {
+ if (token.length <= 0) {
throw new IOException("kerberos request empty");
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/kerberos/KerberosToken.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/kerberos/KerberosToken.java b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/kerberos/KerberosToken.java
index f3488c3..bb24611 100644
--- a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/kerberos/KerberosToken.java
+++ b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/kerberos/KerberosToken.java
@@ -35,14 +35,16 @@ public class KerberosToken {
public KerberosToken(byte[] token, EncryptionKey key) throws Exception {
- if(token.length <= 0)
+ if (token.length <= 0) {
throw new IOException("kerberos.token.empty");
+ }
Asn1InputBuffer buffer = new Asn1InputBuffer(token);
Asn1Item value = (Asn1Item) buffer.read();
- if(! value.isAppSpecific() && ! value.isConstructed())
+ if(! value.isAppSpecific() && ! value.isConstructed()) {
throw new IOException("kerberos.token.malformed");
+ }
buffer = new Asn1InputBuffer(value.getBodyContent());
buffer.skipNext();
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/spnego/SpnegoToken.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/spnego/SpnegoToken.java b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/spnego/SpnegoToken.java
index 7c80a59..6e61dc1 100644
--- a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/spnego/SpnegoToken.java
+++ b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/spnego/SpnegoToken.java
@@ -33,8 +33,9 @@ public abstract class SpnegoToken {
public static SpnegoToken parse(byte[] token) throws IOException {
SpnegoToken spnegoToken = null;
- if(token.length <= 0)
+ if (token.length <= 0) {
throw new IOException("spnego.token.empty");
+ }
switch (token[0]) {
case (byte)0x60:
@@ -45,7 +46,6 @@ public abstract class SpnegoToken {
break;
default:
spnegoToken = null;
- Object[] args = new Object[]{token[0]};
throw new IOException("spnego.token.invalid");
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/CodecTestUtil.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/CodecTestUtil.java b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/CodecTestUtil.java
index ed11259..2657093 100644
--- a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/CodecTestUtil.java
+++ b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/CodecTestUtil.java
@@ -23,10 +23,11 @@ import java.io.IOException;
import java.io.InputStream;
public class CodecTestUtil {
- /*package*/ static byte[] readBinaryFile(String path) throws IOException {
- InputStream is = CodecTestUtil.class.getResourceAsStream(path);
- byte[] bytes = new byte[is.available()];
- is.read(bytes);
- return bytes;
- }
+ /*package*/
+ static byte[] readBinaryFile(String path) throws IOException {
+ InputStream is = CodecTestUtil.class.getResourceAsStream(path);
+ byte[] bytes = new byte[is.available()];
+ is.read(bytes);
+ return bytes;
+ }
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestKerberos.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestKerberos.java b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestKerberos.java
index 900186f..42e5feb 100644
--- a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestKerberos.java
+++ b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestKerberos.java
@@ -44,10 +44,8 @@ public class TestKerberos {
@Before
public void setUp() throws IOException {
- InputStream file;
- byte[] keyData;
- file = this.getClass().getClassLoader().getResourceAsStream("rc4-kerberos-data");
+ InputStream file = this.getClass().getClassLoader().getResourceAsStream("rc4-kerberos-data");
rc4Token = new byte[file.available()];
file.read(rc4Token);
file.close();
@@ -68,7 +66,7 @@ public class TestKerberos {
file.close();
file = this.getClass().getClassLoader().getResourceAsStream("rc4-key-data");
- keyData = new byte[file.available()];
+ byte[] keyData = new byte[file.available()];
file.read(keyData);
rc4Key = new EncryptionKey(23, keyData, 2);
file.close();
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestSpnego.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestSpnego.java b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestSpnego.java
index 8c53d3a..35eed4a 100644
--- a/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestSpnego.java
+++ b/kerby-kerb/kerb-core-test/src/test/java/org/apache/kerby/kerberos/kerb/codec/test/TestSpnego.java
@@ -39,9 +39,8 @@ public class TestSpnego {
//@Before
public void setUp() throws IOException {
- InputStream file;
- file = this.getClass().getClassLoader().getResourceAsStream("rc4-spnego-data");
+ InputStream file = this.getClass().getClassLoader().getResourceAsStream("rc4-spnego-data");
rc4Token = new byte[file.available()];
file.read(rc4Token);
file.close();
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/aes128-kerberos-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/aes128-kerberos-data b/kerby-kerb/kerb-core-test/src/test/resources/aes128-kerberos-data
new file mode 100644
index 0000000..7f3b582
Binary files /dev/null and b/kerby-kerb/kerb-core-test/src/test/resources/aes128-kerberos-data differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/aes128-key-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/aes128-key-data b/kerby-kerb/kerb-core-test/src/test/resources/aes128-key-data
new file mode 100644
index 0000000..4ba2540
--- /dev/null
+++ b/kerby-kerb/kerb-core-test/src/test/resources/aes128-key-data
@@ -0,0 +1 @@
+����\���U�s�7"
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/aes128-spnego-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/aes128-spnego-data b/kerby-kerb/kerb-core-test/src/test/resources/aes128-spnego-data
new file mode 100644
index 0000000..13c89e6
Binary files /dev/null and b/kerby-kerb/kerb-core-test/src/test/resources/aes128-spnego-data differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/aes256-kerberos-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/aes256-kerberos-data b/kerby-kerb/kerb-core-test/src/test/resources/aes256-kerberos-data
new file mode 100644
index 0000000..b7d539f
Binary files /dev/null and b/kerby-kerb/kerb-core-test/src/test/resources/aes256-kerberos-data differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/aes256-key-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/aes256-key-data b/kerby-kerb/kerb-core-test/src/test/resources/aes256-key-data
new file mode 100644
index 0000000..24792c1
Binary files /dev/null and b/kerby-kerb/kerb-core-test/src/test/resources/aes256-key-data differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/aes256-spnego-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/aes256-spnego-data b/kerby-kerb/kerb-core-test/src/test/resources/aes256-spnego-data
new file mode 100644
index 0000000..6a7e55c
Binary files /dev/null and b/kerby-kerb/kerb-core-test/src/test/resources/aes256-spnego-data differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/asrep.token
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/asrep.token b/kerby-kerb/kerb-core-test/src/test/resources/asrep.token
new file mode 100644
index 0000000..d77cff7
Binary files /dev/null and b/kerby-kerb/kerb-core-test/src/test/resources/asrep.token differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/asreq.token
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/asreq.token b/kerby-kerb/kerb-core-test/src/test/resources/asreq.token
new file mode 100644
index 0000000..6d503b3
Binary files /dev/null and b/kerby-kerb/kerb-core-test/src/test/resources/asreq.token differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/des-kerberos-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/des-kerberos-data b/kerby-kerb/kerb-core-test/src/test/resources/des-kerberos-data
new file mode 100644
index 0000000..3db6963
Binary files /dev/null and b/kerby-kerb/kerb-core-test/src/test/resources/des-kerberos-data differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/des-key-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/des-key-data b/kerby-kerb/kerb-core-test/src/test/resources/des-key-data
new file mode 100644
index 0000000..84a0c50
--- /dev/null
+++ b/kerby-kerb/kerb-core-test/src/test/resources/des-key-data
@@ -0,0 +1 @@
+��2^�L�
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/des-pac-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/des-pac-data b/kerby-kerb/kerb-core-test/src/test/resources/des-pac-data
new file mode 100644
index 0000000..7408111
Binary files /dev/null and b/kerby-kerb/kerb-core-test/src/test/resources/des-pac-data differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/des-spnego-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/des-spnego-data b/kerby-kerb/kerb-core-test/src/test/resources/des-spnego-data
new file mode 100644
index 0000000..04a56e8
Binary files /dev/null and b/kerby-kerb/kerb-core-test/src/test/resources/des-spnego-data differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/exceptions.properties
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/exceptions.properties b/kerby-kerb/kerb-core-test/src/test/resources/exceptions.properties
new file mode 100644
index 0000000..c9cc814
--- /dev/null
+++ b/kerby-kerb/kerb-core-test/src/test/resources/exceptions.properties
@@ -0,0 +1,55 @@
+# 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.
+object.cast.fail=Unable to cast object from {0} to {1}.
+
+spnego.token.empty=Empty SPNego token.
+spnego.token.invalid=Not a valid SPNego token: {0}.
+spnego.token.malformed=Malformed SPNego token.
+spnego.field.invalid=Not a valid SPNego token field: {0}.
+
+
+kerberos.object.cast=Unable to cast Kerberos object from {0} to {1}.
+kerberos.token.empty=Empty Kerberos token.
+kerberos.token.invalid=Not a Kerberos token.
+kerberos.token.malformed=Malformed Kerberos token.
+kerberos.kdcReq.empty=Empty message.
+kerberos.kdcReq.invalid=Not a KRB_AP_REQ message.
+kerberos.ticket.empty=Empty Kerberos ticket.
+kerberos.ticket.invalid=Not a Kerberos v5 ticket.
+kerberos.ticket.malformed=Malformed Kerberos ticket.
+kerberos.field.invalid=Not a valid Kerberos ticket field: {0}.
+kerberos.field.malformed=Malformed Kerberos ticket field.
+kerberos.key.notfound=Unable to find appropriate key of type {0}.
+kerberos.version.invalid=Invalid version of Kerberos ticket: {0}.
+kerberos.login.fail=Unable to get server keys.
+kerberos.decrypt.fail=Unable to decrypt encrypted data using key of type {0}.
+
+pac.token.empty=Empty PAC token.
+pac.token.malformed=Malformed PAC token.
+pac.logoninfo.malformed=Malformed PAC logon info.
+pac.signature.malformed=Malformed PAC signature.
+pac.signature.invalid=Invalid PAC signature.
+pac.string.notempty=String not empty while expected null.
+pac.string.malformed.size=Inconsistent string lengths.
+pac.string.invalid.size=Inconsistent string size: {1}, expecting {0}.
+pac.groups.invalid.size=Group count ({0}) doesn't match the real number of groups ({1}) in the PAC.
+pac.extrasids.invalid.size=Extra SID count ({0}) doesn't match the real number of extra SID ({1}) in the PAC.
+pac.resourcegroups.invalid.size=Resource group count ({0}) doesn't match the real number of resource groups ({1}) in the PAC.
+pac.sid.malformed.size=Inconsistent SID length.
+pac.subauthority.malformed.size=Incorrect byte array length: {0}; must be multiple of 4.
+pac.version.invalid=Invalid version of PAC token: {0}.
+pac.check.fail=Unable to check PAC signature.
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/rc4-kerberos-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/rc4-kerberos-data b/kerby-kerb/kerb-core-test/src/test/resources/rc4-kerberos-data
new file mode 100644
index 0000000..6be7086
Binary files /dev/null and b/kerby-kerb/kerb-core-test/src/test/resources/rc4-kerberos-data differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/rc4-key-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/rc4-key-data b/kerby-kerb/kerb-core-test/src/test/resources/rc4-key-data
new file mode 100644
index 0000000..64f9d9c
--- /dev/null
+++ b/kerby-kerb/kerb-core-test/src/test/resources/rc4-key-data
@@ -0,0 +1 @@
+l�܇y#�l�mv��k�
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/rc4-pac-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/rc4-pac-data b/kerby-kerb/kerb-core-test/src/test/resources/rc4-pac-data
new file mode 100644
index 0000000..df45f91
Binary files /dev/null and b/kerby-kerb/kerb-core-test/src/test/resources/rc4-pac-data differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/rc4-spnego-data
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/rc4-spnego-data b/kerby-kerb/kerb-core-test/src/test/resources/rc4-spnego-data
new file mode 100644
index 0000000..91cbe26
Binary files /dev/null and b/kerby-kerb/kerb-core-test/src/test/resources/rc4-spnego-data differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/server.keytab
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/server.keytab b/kerby-kerb/kerb-core-test/src/test/resources/server.keytab
new file mode 100644
index 0000000..b44347c
Binary files /dev/null and b/kerby-kerb/kerb-core-test/src/test/resources/server.keytab differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/tgsrep.token
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/tgsrep.token b/kerby-kerb/kerb-core-test/src/test/resources/tgsrep.token
new file mode 100644
index 0000000..25d6270
Binary files /dev/null and b/kerby-kerb/kerb-core-test/src/test/resources/tgsrep.token differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core-test/src/test/resources/tgsreq.token
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core-test/src/test/resources/tgsreq.token b/kerby-kerb/kerb-core-test/src/test/resources/tgsreq.token
new file mode 100644
index 0000000..69f6b46
Binary files /dev/null and b/kerby-kerb/kerb-core-test/src/test/resources/tgsreq.token differ
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbErrorException.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbErrorException.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbErrorException.java
index e2c2658..7bcdefa 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbErrorException.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbErrorException.java
@@ -22,6 +22,10 @@ package org.apache.kerby.kerberos.kerb;
import org.apache.kerby.kerberos.kerb.spec.common.KrbError;
public class KrbErrorException extends KrbException {
+ /**
+ *
+ */
+ private static final long serialVersionUID = -5541320518061583932L;
private KrbError krbError;
public KrbErrorException(KrbError krbError) {
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbException.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbException.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbException.java
index 878e264..3f75bcd 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbException.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/KrbException.java
@@ -21,6 +21,11 @@ package org.apache.kerby.kerberos.kerb;
public class KrbException extends Exception {
+ /**
+ *
+ */
+ private static final long serialVersionUID = 3561718983481823145L;
+
public KrbException(String message) {
super(message);
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/KerberosTime.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/KerberosTime.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/KerberosTime.java
index 3614253..632c8f2 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/KerberosTime.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/KerberosTime.java
@@ -19,17 +19,14 @@
*/
package org.apache.kerby.kerberos.kerb.spec;
-import org.apache.kerby.asn1.type.Asn1GeneralizedTime;
-
import java.util.Date;
-import java.util.TimeZone;
+
+import org.apache.kerby.asn1.type.Asn1GeneralizedTime;
/**
KerberosTime ::= GeneralizedTime -- with no fractional seconds
*/
public class KerberosTime extends Asn1GeneralizedTime {
- private static final TimeZone UTC = TimeZone.getTimeZone("UTC");
-
public static final KerberosTime NEVER = new KerberosTime(Long.MAX_VALUE);
public static final int MINUTE = 60000;
@@ -93,8 +90,7 @@ public class KerberosTime extends Asn1GeneralizedTime {
public KerberosTime copy() {
long time = getTime();
- KerberosTime result = new KerberosTime(time);
- return result;
+ return new KerberosTime(time);
}
/**
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/KrbAppSequenceType.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/KrbAppSequenceType.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/KrbAppSequenceType.java
index bee83da..2e72cbb 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/KrbAppSequenceType.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/KrbAppSequenceType.java
@@ -43,8 +43,7 @@ public abstract class KrbAppSequenceType extends TaggingSequence {
}
protected KerberosTime getFieldAsTime(int index) {
- KerberosTime value = getFieldAs(index, KerberosTime.class);
- return value;
+ return getFieldAs(index, KerberosTime.class);
}
protected void setFieldAsTime(int index, long value) {
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/KrbSequenceType.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/KrbSequenceType.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/KrbSequenceType.java
index 4cdb181..d0d9d52 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/KrbSequenceType.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/KrbSequenceType.java
@@ -41,8 +41,7 @@ public abstract class KrbSequenceType extends Asn1SequenceType {
}
protected KerberosTime getFieldAsTime(int index) {
- KerberosTime value = getFieldAs(index, KerberosTime.class);
- return value;
+ return getFieldAs(index, KerberosTime.class);
}
protected void setFieldAsTime(int index, long value) {
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/CheckSum.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/CheckSum.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/CheckSum.java
index 9822c02..0bbaaf1 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/CheckSum.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/CheckSum.java
@@ -75,12 +75,18 @@ public class CheckSum extends KrbSequenceType {
@Override
public boolean equals(Object other) {
- if (this == other) return true;
- if (other == null || getClass() != other.getClass()) return false;
+ if (this == other) {
+ return true;
+ }
+ if (other == null || getClass() != other.getClass()) {
+ return false;
+ }
CheckSum that = (CheckSum) other;
- if (getCksumtype() != that.getCksumtype()) return false;
+ if (getCksumtype() != that.getCksumtype()) {
+ return false;
+ }
return Arrays.equals(getChecksum(), that.getChecksum());
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/EncryptedData.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/EncryptedData.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/EncryptedData.java
index 3875000..c012a16 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/EncryptedData.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/EncryptedData.java
@@ -79,8 +79,12 @@ public class EncryptedData extends KrbSequenceType {
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
EncryptedData that = (EncryptedData) o;
@@ -89,7 +93,9 @@ public class EncryptedData extends KrbSequenceType {
getKvno() != that.getKvno()) return false;
*/
- if (getEType() != that.getEType()) return false;
+ if (getEType() != that.getEType()) {
+ return false;
+ }
return Arrays.equals(getCipher(), that.getCipher());
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/EncryptionKey.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/EncryptionKey.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/EncryptionKey.java
index 6f7f540..1cc72da 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/EncryptionKey.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/EncryptionKey.java
@@ -93,14 +93,22 @@ public class EncryptionKey extends KrbSequenceType {
@Override
public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
EncryptionKey that = (EncryptionKey) o;
- if (kvno != -1 && that.kvno != -1 && kvno != that.kvno) return false;
+ if (kvno != -1 && that.kvno != -1 && kvno != that.kvno) {
+ return false;
+ }
- if (getKeyType() != that.getKeyType()) return false;
+ if (getKeyType() != that.getKeyType()) {
+ return false;
+ }
return Arrays.equals(getKeyData(), that.getKeyData());
}
http://git-wip-us.apache.org/repos/asf/directory-kerberos/blob/4ae948c6/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/PrincipalName.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/PrincipalName.java b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/PrincipalName.java
index eef8ede..be05d8b 100644
--- a/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/PrincipalName.java
+++ b/kerby-kerb/kerb-core/src/main/java/org/apache/kerby/kerberos/kerb/spec/common/PrincipalName.java
@@ -75,7 +75,7 @@ public class PrincipalName extends KrbSequenceType {
if (krbStrings != null) {
return krbStrings.getAsStrings();
}
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
public void setNameStrings(List<String> nameStrings) {