1 files changed, 10 insertions, 5 deletions

diff --git a/sys/crypto/siphash/siphash.c b/sys/crypto/siphash/siphash.c
index 92c87d71d391..89b2b18149ef 100644
--- a/sys/crypto/siphash/siphash.c
+++ b/sys/crypto/siphash/siphash.c
@@ -92,16 +92,21 @@ SipBuf(SIPHASH_CTX *ctx, const uint8_t **src, size_t len, int final)
 {
 	size_t x = 0;
 
-	KASSERT((!final && len > 0) || (final && len == 0),
-	    ("%s: invalid parameters", __func__));
+	/* handle hashing 0 length buffer - needed for test vectors */
+	if (len == 0 && final == 0)
+		return (0);
 
-	if (!final) {
+	if (final) {
+		KASSERT(len == 0, ("%s: invalid len param", __func__));
+		ctx->buf.b8[7] = (uint8_t)ctx->bytes;
+	} else {
+		KASSERT((len > 0) && src && *src,
+			("%s: invalid parameters", __func__));
 		x = MIN(len, sizeof(ctx->buf.b64) - ctx->buflen);
 		bcopy(*src, &ctx->buf.b8[ctx->buflen], x);
 		ctx->buflen += x;
 		*src += x;
-	} else
-		ctx->buf.b8[7] = (uint8_t)ctx->bytes;
+	}
 
 	if (ctx->buflen == 8 || final) {
 		ctx->v[3] ^= le64toh(ctx->buf.b64);