/**
 *  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.kerberos.kerb;

import org.apache.kerby.kerberos.kerb.type.KerberosTime;
import org.apache.kerby.kerberos.kerb.type.base.EncryptionKey;
import org.apache.kerby.kerberos.kerb.type.base.EncryptionType;
import org.apache.kerby.kerberos.kerb.type.base.PrincipalName;

import java.io.DataInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;

public abstract class KrbInputStream extends DataInputStream {
    public KrbInputStream(InputStream in) {
        super(in);
    }

    public KerberosTime readTime() throws IOException {
        long value = readInt();
        KerberosTime time = new KerberosTime(value * 1000);
        return time;
    }

    public abstract PrincipalName readPrincipal(int version) throws IOException;

    public EncryptionKey readKey() throws IOException {
        int eType = readShort();
        EncryptionType encType = EncryptionType.fromValue(eType);
        byte[] keyData = readCountedOctets();
        if (encType == EncryptionType.NONE || keyData == null) {
            return null;
        }

        EncryptionKey key = new EncryptionKey(encType, keyData);
        return key;
    }

    public String readCountedString() throws IOException {
        byte[] countedOctets = readCountedOctets();
        if (countedOctets != null) {
            // ASCII
            return new String(countedOctets, StandardCharsets.UTF_8);
        }
        return null;
    }

    public byte[] readCountedOctets() throws IOException {
        int len = readOctetsCount();
        if (len == 0) {
            return null;
        }
        if (len < 0 || len > available()) {
            throw new IOException("Unexpected octets len: " + len);
        }

        byte[] data = new byte[len];
        if (read(data) == -1) {
            throw new IOException("Unexpected end of stream");
        }

        return data;
    }

    public abstract int readOctetsCount() throws IOException;
}

@@ -2635,104 +2635,24 @@
     
-if (read(data) == -1) %7B%0A            throw new IOException(%22Unexpected end of stream%22);%0A        %7D
+readFully(data);
 %0A%0A  

Use readFully instead of read for being more robust, according to Steve review