From 59fc7f4c2ac14185e2b32d7fc16c4c35aee655a1 Mon Sep 17 00:00:00 2001
From: Peter Dettman <peter.dettman@bouncycastle.org>
Date: Sat, 29 Jun 2013 11:32:33 +0700
Subject: Fix error message

---
 .../org/bouncycastle/crypto/tls/HeartbeatMessage.java     | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/core/src/main/java/org/bouncycastle/crypto/tls/HeartbeatMessage.java b/core/src/main/java/org/bouncycastle/crypto/tls/HeartbeatMessage.java
index ed05c8de..320a1282 100644
--- a/core/src/main/java/org/bouncycastle/crypto/tls/HeartbeatMessage.java
+++ b/core/src/main/java/org/bouncycastle/crypto/tls/HeartbeatMessage.java
@@ -22,7 +22,7 @@ public class HeartbeatMessage
         }
         if (payload == null || payload.length >= (1 << 16))
         {
-            throw new IllegalArgumentException("'payload' must have length from 1 to (2^16 - 1)");
+            throw new IllegalArgumentException("'payload' must have length < 2^16");
         }
         if (paddingLength < 16)
         {
@@ -45,16 +45,9 @@ public class HeartbeatMessage
     {
         TlsUtils.writeUint8(type, output);
 
-        if (payload == null)
-        {
-            TlsUtils.writeUint16(0, output);
-        }
-        else
-        {
-            TlsUtils.checkUint16(payload.length);
-            TlsUtils.writeUint16(payload.length, output);
-            output.write(payload);
-        }
+        TlsUtils.checkUint16(payload.length);
+        TlsUtils.writeUint16(payload.length, output);
+        output.write(payload);
 
         byte[] padding = new byte[paddingLength];
         context.getSecureRandom().nextBytes(padding);
-- 
cgit v1.2.3