Index: sys/opencrypto/crypto.c
===================================================================
--- sys/opencrypto/crypto.c
+++ sys/opencrypto/crypto.c
@@ -1296,9 +1296,7 @@
 		KASSERT(crp->crp_iv_start + csp->csp_ivlen <= ilen,
 		    ("IV outside buffer length"));
 	}
-	/* XXX: payload_start of 0 should always be < ilen? */
-	KASSERT(crp->crp_payload_start == 0 ||
-	    crp->crp_payload_start < ilen,
+	KASSERT(crp->crp_payload_start <= ilen,
 	    ("invalid payload start"));
 	KASSERT(crp->crp_payload_start + crp->crp_payload_length <=
 	    ilen, ("payload outside input buffer"));
Index: sys/opencrypto/cryptodev.c
===================================================================
--- sys/opencrypto/cryptodev.c
+++ sys/opencrypto/cryptodev.c
@@ -753,11 +753,9 @@
 		return (E2BIG);
 	}
 
-	if (cse->txform) {
-		if (cop->len == 0 || (cop->len % cse->txform->blocksize) != 0) {
-			SDT_PROBE1(opencrypto, dev, ioctl, error, __LINE__);
-			return (EINVAL);
-		}
+	if (cse->txform != NULL && (cop->len % cse->txform->blocksize) != 0) {
+		SDT_PROBE1(opencrypto, dev, ioctl, error, __LINE__);
+		return (EINVAL);
 	}
 
 	if (cop->mac && cse->hashsize == 0) {