diff --git a/ipmitool/src/plugins/lanplus/lanplus.h b/ipmitool/src/plugins/lanplus/lanplus.h
index 6cccb9f..131d231 100644
--- a/ipmitool/src/plugins/lanplus/lanplus.h
+++ b/ipmitool/src/plugins/lanplus/lanplus.h
@@ -98,7 +98,7 @@
  * TODO: these are wild guesses and should be checked
  */
 #define IPMI_MAX_CONF_HEADER_SIZE   0x20
-#define IPMI_MAX_PAYLOAD_SIZE       0xFF /* Includes confidentiality header/trailer */
+#define IPMI_MAX_PAYLOAD_SIZE       0xFFFF /* Includes confidentiality header/trailer */
 #define IPMI_MAX_CONF_TRAILER_SIZE  0x20
 #define IPMI_MAX_INTEGRITY_PAD_SIZE 0x20
 #define IPMI_MAX_AUTH_CODE_SIZE     0x20
diff --git a/ipmitool/src/plugins/lanplus/lanplus_crypt.c b/ipmitool/src/plugins/lanplus/lanplus_crypt.c
index 6bc7238..94df14a 100644
--- a/ipmitool/src/plugins/lanplus/lanplus_crypt.c
+++ b/ipmitool/src/plugins/lanplus/lanplus_crypt.c
@@ -696,7 +696,7 @@ int lanplus_encrypt_payload(uint8_t         crypt_alg,
 	
 	/* Currently, we only support AES */
 	assert(crypt_alg == IPMI_CRYPT_AES_CBC_128);
-	assert(input_length <= 255);
+	assert(input_length <= IPMI_MAX_PAYLOAD_SIZE);
 
 
 	/*