hello_ext: move static assertions from gnutls_int.h to hello_ext.c

Signed-off-by: Daiki Ueno <ueno@gnu.org>

diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index 54d3c9f6726563e63d6f00f03da5d04b355eebcb..1f8b2c48e0dae7b0ac28444d37e6db5bd8675d8a 100644 (file)
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -417,27 +417,6 @@ typedef enum extensions_t {
 #define GNUTLS_EXTENSION_MAX_VALUE 63
 #define ext_track_t uint64_t
 
-#include <verify.h>
-
-verify(GNUTLS_EXTENSION_MAX < GNUTLS_EXTENSION_MAX_VALUE);
-verify(GNUTLS_EXTENSION_MAX < MAX_EXT_TYPES);
-
-/* we must provide at least 16 extensions for users to register;
- * increase GNUTLS_EXTENSION_MAX_VALUE, MAX_EXT_TYPES and used_exts
- * type if this fails
- */
-verify(GNUTLS_EXTENSION_MAX_VALUE - GNUTLS_EXTENSION_MAX >= 16);
-
-/* MAX_EXT_TYPES must fit in a single byte, to generate random
- * permutation at once.
- */
-verify(MAX_EXT_TYPES <= UINT8_MAX);
-
-/* The 'verify' symbol from <verify.h> is used extensively in the
- * code; undef it to avoid clash
- */
-#undef verify
-
 typedef enum {
        CIPHER_STREAM,
        CIPHER_BLOCK,

diff --git a/lib/hello_ext.c b/lib/hello_ext.c
index 68308514bae507982072d702df56efba17c2a2ee..60f33ae3ded1b5d377b226e0adfac72fe7c48f07 100644 (file)
--- a/lib/hello_ext.c
+++ b/lib/hello_ext.c
@@ -59,6 +59,21 @@
 #include "ext/server_cert_type.h"
 #include "ext/compress_certificate.h"
 #include "intprops.h"
+#include "verify.h"
+
+verify(GNUTLS_EXTENSION_MAX < GNUTLS_EXTENSION_MAX_VALUE);
+verify(GNUTLS_EXTENSION_MAX < MAX_EXT_TYPES);
+
+/* we must provide at least 16 extensions for users to register;
+ * increase GNUTLS_EXTENSION_MAX_VALUE, MAX_EXT_TYPES and used_exts
+ * type if this fails
+ */
+verify(GNUTLS_EXTENSION_MAX_VALUE - GNUTLS_EXTENSION_MAX >= 16);
+
+/* MAX_EXT_TYPES must fit in a single byte, to generate random
+ * permutation at once.
+ */
+verify(MAX_EXT_TYPES <= UINT8_MAX);
 
 static void unset_ext_data(gnutls_session_t session,
                           const struct hello_ext_entry_st *, unsigned idx);