Module Name: src
Committed By: riastradh
Date: Thu Sep 19 14:35:00 UTC 2019
Modified Files:
src/sys/crypto/nist_hash_drbg: nist_hash_drbg.c
Log Message:
Use CTASSERT where possible, run-time assertion where not.
Should fix negative-length variable-length array found by kamil.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/crypto/nist_hash_drbg/nist_hash_drbg.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/crypto/nist_hash_drbg/nist_hash_drbg.c
diff -u src/sys/crypto/nist_hash_drbg/nist_hash_drbg.c:1.1 src/sys/crypto/nist_hash_drbg/nist_hash_drbg.c:1.2
--- src/sys/crypto/nist_hash_drbg/nist_hash_drbg.c:1.1 Mon Sep 2 20:09:29 2019
+++ src/sys/crypto/nist_hash_drbg/nist_hash_drbg.c Thu Sep 19 14:34:59 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nist_hash_drbg.c,v 1.1 2019/09/02 20:09:29 riastradh Exp $ */
+/* $NetBSD: nist_hash_drbg.c,v 1.2 2019/09/19 14:34:59 riastradh Exp $ */
/*-
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -49,7 +49,7 @@
#ifdef _KERNEL
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nist_hash_drbg.c,v 1.1 2019/09/02 20:09:29 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nist_hash_drbg.c,v 1.2 2019/09/19 14:34:59 riastradh Exp $");
#endif
#include <sys/param.h>
@@ -1009,6 +1009,10 @@ static const struct {
#define CHECK(i, name, actual, expected, n) do \
{ \
CTASSERT(sizeof(actual) == (n)); \
+ CTASSERT(__builtin_constant_p(n) ? sizeof(actual) == (n) : 1); \
+ ASSERT(__builtin_constant_p(n) ? 1 : sizeof(actual) >= (n)); \
+ CTASSERT(__builtin_constant_p(n) ? sizeof(expected) == (n) : 1); \
+ ASSERT(__builtin_constant_p(n) ? 1 : sizeof(expected) >= (n)); \
ok &= check(i, name, actual, expected, (n)); \
} while (0)
