@zigc/lib 0.17.0-dev.607 → 0.17.0-dev.644

package/libc/include/generic-netbsd/assert.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: assert.h,v 1.25 2020/04/17 15:22:34 kamil Exp $	*/
+/*	$NetBSD: assert.h,v 1.27 2025/03/29 01:43:38 riastradh Exp $	*/
 
 /*-
  * Copyright (c) 1992, 1993
@@ -48,46 +48,36 @@
 #undef assert
 
 #ifdef NDEBUG
-# ifndef __lint__
-#  define assert(e)	(__static_cast(void,0))
-# else /* !__lint__ */
-#  define assert(e)
-# endif /* __lint__ */
+# define assert(e)	(__static_cast(void,0))
 #else /* !NDEBUG */
 # if __STDC__
 #  define assert(e)							\
-	((e) ? __static_cast(void,0) : __assert13(__FILE__, __LINE__,	\
-	                                          __assert_function__, #e))
+	(__predict_true(e) ? __static_cast(void,0)			\
+	    : __assert13(__FILE__, __LINE__, __assert_function__, #e))
 # else	/* PCC */
 #  define assert(e)							\
-	((e) ? __static_cast(void,0) : __assert13(__FILE__, __LINE__,	\
-	                                          __assert_function__, "e"))
+	(__predict_true(e) ? __static_cast(void,0)			\
+	    : __assert13(__FILE__, __LINE__, __assert_function__, "e"))
 # endif /* !__STDC__ */
 #endif /* NDEBUG */
 
 #undef _DIAGASSERT
 #if !defined(_DIAGNOSTIC)
-# if !defined(__lint__)
-#  define _DIAGASSERT(e) (__static_cast(void,0))
-# else /* !__lint__ */
-#  define _DIAGASSERT(e)
-# endif /* __lint__ */
+# define _DIAGASSERT(e) (__static_cast(void,0))
 #else /* _DIAGNOSTIC */
 # if __STDC__
 #  define _DIAGASSERT(e)						\
-	((e) ? __static_cast(void,0) : __diagassert13(__FILE__, __LINE__, \
-	                                              __assert_function__, #e))
+	(__predict_true(e) ? __static_cast(void,0)			\
+	    : __diagassert13(__FILE__, __LINE__, __assert_function__, #e))
 # else	/* !__STDC__ */
 #  define _DIAGASSERT(e)	 					\
-	((e) ? __static_cast(void,0) : __diagassert13(__FILE__, __LINE__, \
-	                                              __assert_function__, "e"))
+	(__predict_true(e) ? __static_cast(void,0)			\
+	    : __diagassert13(__FILE__, __LINE__, __assert_function__, "e"))
 # endif
 #endif /* _DIAGNOSTIC */
 
 
-#if defined(__lint__)
-#define	__assert_function__	(__static_cast(const void *,0))
-#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
+#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 #define	__assert_function__	__func__
 #elif __GNUC_PREREQ__(2, 6)
 #define	__assert_function__	__PRETTY_FUNCTION__

package/libc/include/generic-netbsd/bitstring.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: bitstring.h,v 1.14 2016/03/17 02:25:32 christos Exp $	*/
+/*	$NetBSD: bitstring.h,v 1.15 2024/05/12 10:41:23 rillig Exp $	*/
 
 /*
  * Copyright (c) 1989, 1993
@@ -98,7 +98,7 @@ typedef	unsigned char bitstr_t;
 		bit_clear(_name, _start); \
 		_start++; \
 	} \
-} while(/*CONSTCOND*/0)
+} while (0)
 
 				/* set bits start ... stop in bitstring */
 #define	bit_nset(name, start, stop) do { \
@@ -108,7 +108,7 @@ typedef	unsigned char bitstr_t;
 		bit_set(_name, _start); \
 		_start++; \
 	} \
-} while(/*CONSTCOND*/0)
+} while (0)
 
 				/* find first bit clear in name */
 #define	bit_ffc(name, nbits, value) do { \
@@ -121,7 +121,7 @@ typedef	unsigned char bitstr_t;
 			break; \
 		} \
 	*(value) = _value; \
-} while(/*CONSTCOND*/0)
+} while (0)
 
 				/* find first bit set in name */
 #define	bit_ffs(name, nbits, value) do { \
@@ -134,6 +134,6 @@ typedef	unsigned char bitstr_t;
 			break; \
 		} \
 	*(value) = _value; \
-} while(/*CONSTCOND*/0)
+} while (0)
 
 #endif /* !_BITSTRING_H_ */

package/libc/include/generic-netbsd/cdbw.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: cdbw.h,v 1.2 2012/06/03 21:21:45 joerg Exp $	*/
+/*	$NetBSD: cdbw.h,v 1.3 2023/08/08 10:34:08 riastradh Exp $	*/
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -50,7 +50,7 @@ int		 cdbw_put_data(struct cdbw *, const void *, size_t,
 int		 cdbw_put_key(struct cdbw *, const void *, size_t,
     uint32_t);
 uint32_t	 cdbw_stable_seeder(void);
-int		 cdbw_output(struct cdbw *, int, const char[16],
+int		 cdbw_output(struct cdbw *, int, const char *,
     uint32_t (*)(void));
 void		 cdbw_close(struct cdbw *);
 

package/libc/include/generic-netbsd/crypto/cryptodev.h

@@ -1,4 +1,4 @@
-/*	$NetBSD: cryptodev.h,v 1.50.4.1 2023/08/09 17:42:03 martin Exp $ */
+/*	$NetBSD: cryptodev.h,v 1.51.8.1 2026/05/07 14:40:13 martin Exp $ */
 /*	$FreeBSD: src/sys/opencrypto/cryptodev.h,v 1.2.2.6 2003/07/02 17:04:50 sam Exp $	*/
 /*	$OpenBSD: cryptodev.h,v 1.33 2002/07/17 23:52:39 art Exp $	*/
 
@@ -159,48 +159,48 @@
 #define	CRYPTO_ALG_FLAG_DSA_SHA		0x04 /* Can do SHA on msg */
 
 struct session_op {
-	u_int32_t	cipher;		/* ie. CRYPTO_DES_CBC */
-	u_int32_t	mac;		/* ie. CRYPTO_MD5_HMAC */
-	u_int32_t	comp_alg;	/* ie. CRYPTO_GZIP_COMP */
+	uint32_t	cipher;		/* ie. CRYPTO_DES_CBC */
+	uint32_t	mac;		/* ie. CRYPTO_MD5_HMAC */
+	uint32_t	comp_alg;	/* ie. CRYPTO_GZIP_COMP */
 
-	u_int32_t	keylen;		/* cipher key */
+	uint32_t	keylen;		/* cipher key */
 	void *		key;
-	int		mackeylen;	/* mac key */
+	uint32_t	mackeylen;	/* mac key */
 	void *		mackey;
 
-  	u_int32_t	ses;		/* returns: session # */
+  	uint32_t	ses;		/* returns: session # */
 };
 
 /* to support multiple session creation */
 
 struct session_n_op {
-	u_int32_t	cipher;		/* ie. CRYPTO_DES_CBC */
-	u_int32_t	mac;		/* ie. CRYPTO_MD5_HMAC */
-	u_int32_t	comp_alg;	/* ie. CRYPTO_GZIP_COMP */
+	uint32_t	cipher;		/* ie. CRYPTO_DES_CBC */
+	uint32_t	mac;		/* ie. CRYPTO_MD5_HMAC */
+	uint32_t	comp_alg;	/* ie. CRYPTO_GZIP_COMP */
 
-	u_int32_t	keylen;		/* cipher key */
+	uint32_t	keylen;		/* cipher key */
 	void *		key;
-	int		mackeylen;	/* mac key */
+	uint32_t	mackeylen;	/* mac key */
 	void *		mackey;
 
-	u_int32_t	ses;		/* returns: session # */
+	uint32_t	ses;		/* returns: session # */
 	int		status;
 };
 
 struct crypt_op {
-	u_int32_t	ses;
-	u_int16_t	op;		/* i.e. COP_ENCRYPT */
+	uint32_t	ses;
+	uint16_t	op;		/* i.e. COP_ENCRYPT */
 #define COP_ENCRYPT	1
 #define COP_DECRYPT	2
 #define COP_COMP	3
 #define COP_DECOMP	4
-	u_int16_t	flags;
+	uint16_t	flags;
 #define	COP_F_BATCH 	0x0008		/* Dispatch as quickly as possible */
-	u_int		len;		/* src len */
+	uint32_t	len;		/* src len */
 	void *		src, *dst;	/* become iov[] inside kernel */
 	void *		mac;		/* must be big enough for chosen MAC */
 	void *		iv;
-	u_int		dst_len;	/* dst len if not 0 */
+	uint32_t	dst_len;	/* dst len if not 0 */
 };
 
 /* to support multiple session creation */
@@ -219,27 +219,27 @@ struct crypt_op {
  */
 
 struct crypt_n_op {
-	u_int32_t	ses;
-	u_int16_t	op;		/* i.e. COP_ENCRYPT */
+	uint32_t	ses;
+	uint16_t	op;		/* i.e. COP_ENCRYPT */
 #define COP_ENCRYPT	1
 #define COP_DECRYPT	2
-	u_int16_t	flags;
+	uint16_t	flags;
 #define COP_F_BATCH	0x0008		/* Dispatch as quickly as possible */
 #define COP_F_MORE	0x0010		/* more data to follow */
-	u_int		len;		/* src len */
+	uint32_t	len;		/* src len */
 
-	u_int32_t	reqid;		/* request id */
+	uint32_t	reqid;		/* request id */
 	int		status;		/* status of request -accepted or not */	
 	void		*opaque;	/* opaque pointer returned to user */
-	u_int32_t	keylen;		/* cipher key - optional */
+	uint32_t	keylen;		/* cipher key - optional */
 	void *		key;
-	u_int32_t	mackeylen;	/* also optional */
+	uint32_t	mackeylen;	/* also optional */
 	void *		mackey;
 
 	void *		src, *dst;	/* become iov[] inside kernel */
 	void *		mac;		/* must be big enough for chosen MAC */
 	void *		iv;
-	u_int		dst_len;	/* dst len if not 0 */
+	uint32_t	dst_len;	/* dst len if not 0 */
 };
 
 /* CIOCNCRYPTM ioctl argument, supporting one or more asynchronous
@@ -255,7 +255,7 @@ struct crypt_mop {
 
 struct crypt_sfop {
 	size_t		count;
-	u_int32_t	*sesid;
+	uint32_t	*sesid;
 };
 
 struct crypt_sgop {
@@ -268,17 +268,17 @@ struct crypt_sgop {
 /* bignum parameter, in packed bytes, ... */
 struct crparam {
 	void *		crp_p;
-	u_int		crp_nbits;
+	uint32_t	crp_nbits;
 };
 
 #define CRK_MAXPARAM	8
 
 struct crypt_kop {
-	u_int		crk_op;		/* ie. CRK_MOD_EXP or other */
-	u_int		crk_status;	/* return status */
-	u_short		crk_iparams;	/* # of input parameters */
-	u_short		crk_oparams;	/* # of output parameters */
-	u_int		crk_pad1;
+	uint32_t	crk_op;		/* ie. CRK_MOD_EXP or other */
+	uint32_t	crk_status;	/* return status */
+	uint16_t	crk_iparams;	/* # of input parameters */
+	uint16_t	crk_oparams;	/* # of output parameters */
+	uint32_t	crk_pad1;
 	struct crparam	crk_param[CRK_MAXPARAM];
 };
 
@@ -295,11 +295,11 @@ struct crypt_kop {
  * user application.
  */
 struct crypt_n_kop {
-	u_int		crk_op;		/* ie. CRK_MOD_EXP or other */
-	u_int		crk_status;	/* return status */
-	u_short		crk_iparams;	/* # of input parameters */
-	u_short		crk_oparams;	/* # of output parameters */
-        u_int32_t	crk_reqid;	/* request id */
+	uint32_t	crk_op;		/* ie. CRK_MOD_EXP or other */
+	uint32_t	crk_status;	/* return status */
+	uint16_t	crk_iparams;	/* # of input parameters */
+	uint16_t	crk_oparams;	/* # of output parameters */
+        uint32_t	crk_reqid;	/* request id */
 	struct crparam	crk_param[CRK_MAXPARAM];
 	void		*crk_opaque;	/* opaque pointer returned to user */
 };
@@ -314,8 +314,8 @@ struct crypt_mkop {
  * not in the original crypt_kop structure (crk_status).
  */
 struct crypt_result {
-	u_int32_t	reqid;		/* request id */
-	u_int32_t	status;		/* status of request: 0 if successful */
+	uint32_t	reqid;		/* request id */
+	uint32_t	status;		/* status of request: 0 if successful */
 	void *		opaque;		/* Opaque pointer from the user, passed along */
 };
 
@@ -364,10 +364,10 @@ struct cryptret {
  * Please use F_SETFD against the cloned descriptor.  But this ioctl
  * is obsolete (the device now clones): please, just don't use it.
  */
-#define	CRIOGET		_IOWR('c', 100, u_int32_t)
+#define	CRIOGET		_IOWR('c', 100, uint32_t)
 
 /* the following are done against the cloned descriptor */
-#define	CIOCFSESSION	_IOW('c', 102, u_int32_t)
+#define	CIOCFSESSION	_IOW('c', 102, uint32_t)
 #define CIOCKEY		_IOWR('c', 104, struct crypt_kop)
 #define CIOCNFKEYM	_IOWR('c', 108, struct crypt_mkop)
 #define CIOCNFSESSION	_IOW('c', 109, struct crypt_sfop)
@@ -379,24 +379,24 @@ struct cryptret {
 #define CIOCCRYPT	_IOWR('c', 114, struct crypt_op)
 #define CIOCNCRYPTM	_IOWR('c', 115, struct crypt_mop)
 
-#define CIOCASYMFEAT	_IOR('c', 105, u_int32_t)
+#define CIOCASYMFEAT	_IOR('c', 105, uint32_t)
 
 struct cryptotstat {
 	struct timespec	acc;		/* total accumulated time */
 	struct timespec	min;		/* max time */
 	struct timespec	max;		/* max time */
-	u_int32_t	count;		/* number of observations */
+	uint32_t	count;		/* number of observations */
 };
 
 struct cryptostats {
-	u_int32_t	cs_ops;		/* symmetric crypto ops submitted */
-	u_int32_t	cs_errs;	/* symmetric crypto ops that failed */
-	u_int32_t	cs_kops;	/* asymmetric/key ops submitted */
-	u_int32_t	cs_kerrs;	/* asymmetric/key ops that failed */
-	u_int32_t	cs_intrs;	/* crypto swi thread activations */
-	u_int32_t	cs_rets;	/* crypto return thread activations */
-	u_int32_t	cs_blocks;	/* symmetric op driver block */
-	u_int32_t	cs_kblocks;	/* symmetric op driver block */
+	uint32_t	cs_ops;		/* symmetric crypto ops submitted */
+	uint32_t	cs_errs;	/* symmetric crypto ops that failed */
+	uint32_t	cs_kops;	/* asymmetric/key ops submitted */
+	uint32_t	cs_kerrs;	/* asymmetric/key ops that failed */
+	uint32_t	cs_intrs;	/* crypto swi thread activations */
+	uint32_t	cs_rets;	/* crypto return thread activations */
+	uint32_t	cs_blocks;	/* symmetric op driver block */
+	uint32_t	cs_kblocks;	/* symmetric op driver block */
 	/*
 	 * When CRYPTO_TIMING is defined at compile time and the
 	 * sysctl debug.crypto is set to 1, the crypto system will
@@ -423,18 +423,18 @@ struct uio;
 /* Standard initialization structure beginning */
 struct cryptoini {
 	int		cri_alg;	/* Algorithm to use */
-	int		cri_klen;	/* Key length, in bits */
-	int		cri_rnd;	/* Algorithm rounds, where relevant */
+	uint32_t	cri_klen;	/* Key length, in bits */
+	uint32_t	cri_rnd;	/* Algorithm rounds, where relevant */
 	char	       *cri_key;	/* key to use */
-	u_int8_t	cri_iv[EALG_MAX_BLOCK_LEN];	/* IV to use */
+	uint8_t	cri_iv[EALG_MAX_BLOCK_LEN];	/* IV to use */
 	struct cryptoini *cri_next;
 };
 
 /* Describe boundaries of a single crypto operation */
 struct cryptodesc {
-	int		crd_skip;	/* How many bytes to ignore from start */
-	int		crd_len;	/* How many bytes to process */
-	int		crd_inject;	/* Where to inject results, if applicable */
+	uint32_t	crd_skip;	/* How many bytes to ignore from start */
+	uint32_t	crd_len;	/* How many bytes to process */
+	uint32_t	crd_inject;	/* Where to inject results, if applicable */
 	int		crd_flags;
 
 #define	CRD_F_ENCRYPT		0x01	/* Set when doing encryption */
@@ -454,13 +454,20 @@ struct cryptodesc {
 	struct cryptodesc *crd_next;
 };
 
+struct cryptop_data {
+	struct csession *cse;
+	struct iovec	iovec[1];	/* user requests never have more */
+	struct uio	uio;
+	size_t		iov_len;
+};
+
 /* Structure describing complete operation */
 struct cryptop {
 	TAILQ_ENTRY(cryptop) crp_next;
-	u_int64_t	crp_sid;	/* Session ID */
+	uint64_t	crp_sid;	/* Session ID */
 
-	int		crp_ilen;	/* Input data total length */
-	int		crp_olen;	/* Result total length */
+	uint32_t	crp_ilen;	/* Input data total length */
+	uint32_t	crp_olen;	/* Result total length */
 
 	int		crp_etype;	/*
 					 * Error type (zero means no error).
@@ -505,19 +512,18 @@ struct cryptop {
 	/*
 	 * everything below is private to crypto(4)
 	 */
-	u_int32_t	crp_reqid;	/* request id */
+	uint32_t	crp_reqid;	/* request id */
 	void *		crp_usropaque;	/* Opaque pointer from user, passed along */
 	struct timespec	crp_tstamp;	/* performance time stamp */
 	kcondvar_t	crp_cv;
 	struct fcrypt 	*fcrp;
 	void * 		dst;
 	void *		mac;
-	u_int		len;
+	uint32_t	len;
 	u_char		tmp_iv[EALG_MAX_BLOCK_LEN];
 	u_char		tmp_mac[CRYPTO_MAX_MAC_LEN];
 	
-	struct iovec	iovec[1];
-	struct uio	uio;
+	struct cryptop_data cod;
 	uint32_t	magic;
 	struct cpu_info	*reqcpu;	/*
 					 * save requested CPU to do cryptoret
@@ -540,14 +546,15 @@ struct cryptop {
 struct cryptkop {
 	TAILQ_ENTRY(cryptkop) krp_next;
 
-	u_int32_t	krp_reqid;	/* request id */
+	uint32_t	krp_reqid;	/* request id */
 	void *		krp_usropaque;	/* Opaque pointer from user, passed along */
 
-	u_int		krp_op;		/* ie. CRK_MOD_EXP or other */
-	u_int		krp_status;	/* return status */
-	u_short		krp_iparams;	/* # of input parameters */
-	u_short		krp_oparams;	/* # of output parameters */
-	u_int32_t	krp_hid;
+	uint32_t	krp_op;		/* ie. CRK_MOD_EXP or other */
+	uint32_t	krp_status;	/* return status */
+	uint16_t	krp_iparams;	/* # of input parameters */
+	uint16_t	krp_oparams;	/* # of output parameters */
+	uint32_t	krp_hid;
+	kmutex_t	krp_lock;
 	struct crparam	krp_param[CRK_MAXPARAM];	/* kvm */
 	void		(*krp_callback)(struct cryptkop *);  /*
 							      * Callback function.
@@ -564,29 +571,29 @@ struct cryptkop {
 
 /* Crypto capabilities structure */
 struct cryptocap {
-	u_int32_t	cc_sessions;
+	uint32_t	cc_sessions;
 
 	/*
 	 * Largest possible operator length (in bits) for each type of
 	 * encryption algorithm.
 	 */
-	u_int16_t	cc_max_op_len[CRYPTO_ALGORITHM_MAX + 1];
+	uint16_t	cc_max_op_len[CRYPTO_ALGORITHM_MAX + 1];
 
-	u_int8_t	cc_alg[CRYPTO_ALGORITHM_MAX + 1];
+	uint8_t	cc_alg[CRYPTO_ALGORITHM_MAX + 1];
 
-	u_int8_t	cc_kalg[CRK_ALGORITHM_MAX + 1];
+	uint8_t	cc_kalg[CRK_ALGORITHM_MAX + 1];
 
-	u_int8_t	cc_flags;
-	u_int8_t	cc_qblocked;		/* symmetric q blocked */
-	u_int8_t	cc_kqblocked;		/* asymmetric q blocked */
+	uint8_t	cc_flags;
+	uint8_t	cc_qblocked;		/* symmetric q blocked */
+	uint8_t	cc_kqblocked;		/* asymmetric q blocked */
 #define CRYPTOCAP_F_CLEANUP	0x01		/* needs resource cleanup */
 #define CRYPTOCAP_F_SOFTWARE	0x02		/* software implementation */
 #define CRYPTOCAP_F_SYNC	0x04		/* operates synchronously */
 
 	void		*cc_arg;		/* callback argument */
-	int		(*cc_newsession)(void*, u_int32_t*, struct cryptoini*);
+	int		(*cc_newsession)(void*, uint32_t*, struct cryptoini*);
 	int		(*cc_process) (void*, struct cryptop *, int);
-	void		(*cc_freesession) (void *, u_int64_t);
+	void		(*cc_freesession) (void *, uint64_t);
 	void		*cc_karg;		/* callback argument */
 	int		(*cc_kprocess) (void*, struct cryptkop *, int);
 
@@ -602,29 +609,29 @@ struct cryptocap {
  */
 #define	CRYPTO_SESID2HID(_sid)	((((_sid) >> 32) & 0xffffff) - 1)
 #define	CRYPTO_SESID2CAPS(_sid)	(((_sid) >> 56) & 0xff)
-#define	CRYPTO_SESID2LID(_sid)	(((u_int32_t) (_sid)) & 0xffffffff)
+#define	CRYPTO_SESID2LID(_sid)	(((uint32_t) (_sid)) & 0xffffffff)
 
 MALLOC_DECLARE(M_CRYPTO_DATA);
 
-extern	int crypto_newsession(u_int64_t *sid, struct cryptoini *cri, int hard);
-extern	void crypto_freesession(u_int64_t sid);
-extern	int32_t crypto_get_driverid(u_int32_t flags);
-extern	int crypto_register(u_int32_t driverid, int alg, u_int16_t maxoplen,
-	    u_int32_t flags,
-	    int (*newses)(void*, u_int32_t*, struct cryptoini*),
-	    void (*freeses)(void *, u_int64_t),
+extern	int crypto_newsession(uint64_t *sid, struct cryptoini *cri, int hard);
+extern	void crypto_freesession(uint64_t sid);
+extern	int32_t crypto_get_driverid(uint32_t flags);
+extern	int crypto_register(uint32_t driverid, int alg, uint16_t maxoplen,
+	    uint32_t flags,
+	    int (*newses)(void*, uint32_t*, struct cryptoini*),
+	    void (*freeses)(void *, uint64_t),
 	    int (*process)(void*, struct cryptop *, int),
 	    void *arg);
-extern	int crypto_kregister(u_int32_t, int, u_int32_t,
+extern	int crypto_kregister(uint32_t, int, uint32_t,
 	    int (*)(void*, struct cryptkop *, int),
 	    void *arg);
-extern	int crypto_unregister(u_int32_t driverid, int alg);
-extern	int crypto_unregister_all(u_int32_t driverid);
+extern	int crypto_unregister(uint32_t driverid, int alg);
+extern	int crypto_unregister_all(uint32_t driverid);
 extern	void crypto_dispatch(struct cryptop *crp);
 extern	void crypto_kdispatch(struct cryptkop *);
 #define	CRYPTO_SYMQ	0x1
 #define	CRYPTO_ASYMQ	0x2
-extern	int crypto_unblock(u_int32_t, int);
+extern	int crypto_unblock(uint32_t, int);
 extern	void crypto_done(struct cryptop *crp);
 extern	void crypto_kdone(struct cryptkop *);
 extern	int crypto_getfeat(int *);