Avoid EOFException in RecordStream.readRecord if input closes between

records (defer to caller to decide).

1 files changed, 10 insertions, 2 deletions

diff --git a/core/src/main/java/org/bouncycastle/crypto/tls/RecordStream.java b/core/src/main/java/org/bouncycastle/crypto/tls/RecordStream.java
index 684eb1fc..d90c47d2 100644
--- a/core/src/main/java/org/bouncycastle/crypto/tls/RecordStream.java
+++ b/core/src/main/java/org/bouncycastle/crypto/tls/RecordStream.java
@@ -136,10 +136,17 @@ class RecordStream
         pendingCipher = null;
     }
 
-    public void readRecord()
+    public boolean readRecord()
         throws IOException
     {
-        short type = TlsUtils.readUint8(input);
+//        short type = TlsUtils.readUint8(input);
+        int i = input.read();
+        if (i < 0)
+        {
+            return false;
+        }
+
+        short type = (short)i;
 
         // TODO In earlier RFCs, it was "SHOULD ignore"; should this be version-dependent?
         /*
@@ -172,6 +179,7 @@ class RecordStream
         int length = TlsUtils.readUint16(input);
         byte[] plaintext = decodeAndVerify(type, input, length);
         handler.processRecord(type, plaintext, 0, plaintext.length);
+        return true;
     }
 
     protected byte[] decodeAndVerify(short type, InputStream input, int len)