 @@ -1,14 +1,14 @@
-/*	$NetBSD: randomid.c,v 1.15 2021/09/11 20:28:03 andvar Exp $	*/
+/*	$NetBSD: randomid.c,v 1.16 2022/05/15 20:37:50 andvar Exp $	*/
 /*	$KAME: ip6_id.c,v 1.8 2003/09/06 13:41:06 itojun Exp $	*/
 /*	$OpenBSD: ip_id.c,v 1.6 2002/03/15 18:19:52 millert Exp $	*/
 /*
  * Copyright (C) 2003 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -73,27 +73,27 @@
  *      b = random with gcd(b,m) == 1
  *      m = constant and a maximal period of m-1.
+ *
  * The transaction id is determined by:
  * id[n] = seed xor (g^X[n] mod n)
+ *
  * Effectively the id is restricted to the lower (bits - 1) bits, thus
  * yielding two different cycles by toggling the msb on and off.
  * This avoids reuse issues caused by reseeding.
  */
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: randomid.c,v 1.15 2021/09/11 20:28:03 andvar Exp $");
+__RCSID("$NetBSD: randomid.c,v 1.16 2022/05/15 20:37:50 andvar Exp $");
 #endif
 #include "namespace.h"
 #include <sys/types.h>
 #include <sys/time.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 #include <randomid.h>
 #ifdef __weak_alias
 __weak_alias(randomid,_randomid)
 @@ -112,27 +112,27 @@ struct randomconf {
 	const int	rc_skip;	/* skip values */
 };
 struct randomid_ctx {
 	struct randomconf *ru_conf;
 #define ru_bits		ru_conf->rc_bits
 #define ru_max		ru_conf->rc_max
 #define ru_gen		ru_conf->rc_gen
 #define ru_n		ru_conf->rc_n
 #define ru_agen		ru_conf->rc_agen
 #define ru_m		ru_conf->rc_m
 #define ru_pfacts	ru_conf->rc_pfacts
 #define ru_skip		ru_conf->rc_skip
-	long ru_out;		/* Time after wich will be reseeded */
+	long ru_out;		/* Time after which will be reseeded */
 	u_int32_t ru_counter;
 	u_int32_t ru_msb;
 	u_int32_t ru_x;
 	u_int32_t ru_seed, ru_seed2;
 	u_int32_t ru_a, ru_b;
 	u_int32_t ru_g;
 	time_t ru_reseed;
 };
 static struct randomconf randomconf[] = {
+  {
 ,			/* resulting bits */

 @@ -1,14 +1,14 @@
-/* $NetBSD: udf_core.c,v 1.10 2022/05/07 08:51:32 reinoud Exp $ */
+/* $NetBSD: udf_core.c,v 1.11 2022/05/15 20:37:50 andvar Exp $ */
 /*
  * Copyright (c) 2006, 2008, 2021, 2022 Reinoud Zandijk
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -20,27 +20,27 @@
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: udf_core.c,v 1.10 2022/05/07 08:51:32 reinoud Exp $");
+__RCSID("$NetBSD: udf_core.c,v 1.11 2022/05/15 20:37:50 andvar Exp $");
 #include <stdio.h>
 #include <stdlib.h>
 #include <stddef.h>
 #include <string.h>
 #include <strings.h>
 #include <unistd.h>
 #include <errno.h>
 #include <time.h>
 #include <assert.h>
 #include <err.h>
 #include <fcntl.h>
 #include <util.h>
 @@ -2425,27 +2425,27 @@ udf_create_new_fe(struct file_entry **fe
 	struct filetimes_extattr_entry *ft_extattr;
 	uint32_t crclen;	/* XXX: should be 16; need to detect overflow */
 	uint16_t icbflags;
 	*fep = NULL;
 	fe = calloc(1, context.sector_size);
 	if (fe == NULL)
 		return ENOMEM;
 	udf_inittag(&fe->tag, TAGID_FENTRY, /* loc */ 0);
 	icb = &fe->icbtag;
 	/*
-	 * Always use strategy type 4 unless on WORM wich we don't support
+	 * Always use strategy type 4 unless on WORM which we don't support
 	 * (yet). Fill in defaults and set for internal allocation of data.
 	 */
 	icb->strat_type      = udf_rw16(4);
 	icb->max_num_entries = udf_rw16(1);
 	icb->file_type       = file_type;	/* 8 bit */
 	icb->flags           = udf_rw16(UDF_ICB_INTERN_ALLOC);
 	fe->perm     = udf_rw32(0x7fff);	/* all is allowed   */
 	fe->link_cnt = udf_rw16(0);		/* explicit setting */
 	fe->ckpoint  = udf_rw32(1);		/* user supplied file version */
 	udf_set_timestamp_now(&birthtime);
 @@ -2525,27 +2525,27 @@ udf_create_new_efe(struct extfile_entry
 	struct icb_tag       *icb;
 	uint32_t crclen;	/* XXX: should be 16; need to detect overflow */
 	uint16_t icbflags;
 	*efep = NULL;
 	efe = calloc(1, context.sector_size);
 	if (efe == NULL)
 		return ENOMEM;
 	udf_inittag(&efe->tag, TAGID_EXTFENTRY, /* loc */ 0);
 	icb = &efe->icbtag;
 	/*
-	 * Always use strategy type 4 unless on WORM wich we don't support
+	 * Always use strategy type 4 unless on WORM which we don't support
 	 * (yet). Fill in defaults and set for internal allocation of data.
 	 */
 	icb->strat_type      = udf_rw16(4);
 	icb->max_num_entries = udf_rw16(1);
 	icb->file_type       = file_type;	/* 8 bit */
 	icb->flags = udf_rw16(UDF_ICB_INTERN_ALLOC);
 	efe->perm     = udf_rw32(0x7fff);	/* all is allowed   */
 	efe->link_cnt = udf_rw16(0);		/* explicit setting */
 	efe->ckpoint  = udf_rw32(1);		/* user supplied file version */
 	udf_set_timestamp_now(&efe->ctime);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: rpc_machdep.c,v 1.100 2021/09/16 20:17:46 andvar Exp $	*/
+/*	$NetBSD: rpc_machdep.c,v 1.101 2022/05/15 20:37:50 andvar Exp $	*/
 /*
  * Copyright (c) 2000-2002 Reinoud Zandijk.
  * Copyright (c) 1994-1998 Mark Brinicombe.
  * Copyright (c) 1994 Brini.
  * All rights reserved.
+ *
  * This code is derived from software written for Brini by Mark Brinicombe
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -44,27 +44,27 @@
  * This file still needs a lot of work
+ *
  * Created      : 17/09/94
  * Updated for yet another new bootloader 28/12/02
  */
 #include "opt_ddb.h"
 #include "opt_modular.h"
 #include "vidcvideo.h"
 #include "podulebus.h"
 #include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.100 2021/09/16 20:17:46 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rpc_machdep.c,v 1.101 2022/05/15 20:37:50 andvar Exp $");
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/reboot.h>
 #include <sys/proc.h>
 #include <sys/msgbuf.h>
 #include <sys/exec.h>
 #include <sys/exec_aout.h>
 #include <sys/ksyms.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/intr.h>
 #include <sys/device.h>
 @@ -447,27 +447,27 @@ initarm(void *cookie)
 	 * This allows a means of generating output during initarm().
 	 * Once all the memory map changes are complete we can call consinit()
 	 * and not have to worry about things moving.
 	 */
 	/* fcomcnattach(DC21285_ARMCSR_BASE, comcnspeed, comcnmode); */
 	/* XXX snif .... i am still not able to this */
 	/*
 	 * We have the following memory map (derived from EBSA)
+	 *
 	 * virtual address == physical address apart from the areas:
 	 * 0x00000000 -> 0x000fffff which is mapped to
 	 * top 1MB of physical memory
-	 * 0xf0000000 -> 0xf0ffffff wich is mapped to
+	 * 0xf0000000 -> 0xf0ffffff which is mapped to
 	 * physical address 0x10000000 -> 0x10ffffff
 	 * or on a Kinetic:
 	 * physical address 0x20400000 -> 0x20ffffff
+	 *
 	 * This means that the kernel is mapped suitably for continuing
 	 * execution, all I/O is mapped 1:1 virtual to physical and
 	 * physical memory is accessible.
+	 *
 	 * The initarm() has the responsibility for creating the kernel
 	 * page tables.
 	 * It must also set up various memory pointers that are used
 	 * by pmap etc.
 	 */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: eb7500atx_machdep.c,v 1.36 2021/09/16 20:17:46 andvar Exp $	*/
+/*	$NetBSD: eb7500atx_machdep.c,v 1.37 2022/05/15 20:37:51 andvar Exp $	*/
 /*
  * Copyright (c) 2000-2002 Reinoud Zandijk.
  * Copyright (c) 1994-1998 Mark Brinicombe.
  * Copyright (c) 1994 Brini.
  * All rights reserved.
+ *
  * This code is derived from software written for Brini by Mark Brinicombe
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -44,27 +44,27 @@
  * This file still needs a lot of work
+ *
  * Created      : 17/09/94
  * Updated for yet another new bootloader 28/12/02
  */
 #include "opt_ddb.h"
 #include "opt_modular.h"
 #include "vidcvideo.h"
 #include "pckbc.h"
 #include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.36 2021/09/16 20:17:46 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eb7500atx_machdep.c,v 1.37 2022/05/15 20:37:51 andvar Exp $");
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/reboot.h>
 #include <sys/proc.h>
 #include <sys/msgbuf.h>
 #include <sys/exec.h>
 #include <sys/exec_aout.h>
 #include <sys/ksyms.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <sys/intr.h>
 #include <sys/device.h>
 @@ -412,27 +412,27 @@ initarm(void *cookie)
 	 * This allows a means of generating output during initarm().
 	 * Once all the memory map changes are complete we can call consinit()
 	 * and not have to worry about things moving.
 	 */
 	/* fcomcnattach(DC21285_ARMCSR_BASE, comcnspeed, comcnmode); */
 	/* XXX snif .... i am still not able to this */
 	/*
 	 * We have the following memory map (derived from EBSA)
+	 *
 	 * virtual address == physical address apart from the areas:
 	 * 0x00000000 -> 0x000fffff which is mapped to
 	 * top 1MB of physical memory
-	 * 0xf0000000 -> 0xf0ffffff wich is mapped to
+	 * 0xf0000000 -> 0xf0ffffff which is mapped to
 	 * physical address 0x01000000 -> 0x01ffffff (DRAM0a, dram[0])
+	 *
 	 * This means that the kernel is mapped suitably for continuing
 	 * execution, all I/O is mapped 1:1 virtual to physical and
 	 * physical memory is accessible.
+	 *
 	 * The initarm() has the responsibility for creating the kernel
 	 * page tables.
 	 * It must also set up various memory pointers that are used
 	 * by pmap etc.
 	 */
 	/* START OF REAL NEW STUFF */

 @@ -1,14 +1,14 @@
-/*	$NetBSD: fd.c,v 1.91 2022/05/03 20:52:31 andvar Exp $	*/
+/*	$NetBSD: fd.c,v 1.92 2022/05/15 20:37:51 andvar Exp $	*/
 /*
  * Copyright (c) 1995 Leo Weppelman.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -34,27 +34,27 @@
  * use of some special DMA accessing code.
+ *
  * Interrupts from the FDC are in fact DMA interrupts which get their
  * first level handling in 'dma.c' . If the floppy driver is currently
  * using DMA the interrupt is signalled to 'fdcint'.
+ *
  * TODO:
  *   - Test it with 2 drives (I don't have them)
  *   - Test it with an HD-drive (Don't have that either)
  *   - Finish ioctl's
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.91 2022/05/03 20:52:31 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.92 2022/05/15 20:37:51 andvar Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/kernel.h>
 #include <sys/malloc.h>
 #include <sys/buf.h>
 #include <sys/bufq.h>
 #include <sys/proc.h>
 #include <sys/device.h>
 #include <sys/ioctl.h>
 #include <sys/fcntl.h>
 #include <sys/conf.h>
 @@ -1245,27 +1245,27 @@ fdmoff(struct fd_softc *fdsoftc)
 	if ((fd_state == FLP_MON) && selected) {
 		tmp = read_fdreg(FDC_CS);
 		if ((tmp & MOTORON) == 0) {
 			fddeselect();
 			fd_state = FLP_IDLE;
 		} else
 			callout_reset(&fdsoftc->sc_motor_ch, 10 * FLP_MONDELAY,
 			    (FPV)fdmotoroff, fdsoftc);
+	}
 	st_dmafree(fdsoftc, &tmp);
+}
 /*
- * Used to find out wich drives are actually connected. We do this by issuing
+ * Used to find out which drives are actually connected. We do this by issuing
  * is 'RESTORE' command and check if the 'track-0' bit is set. This also works
  * if the drive is present but no floppy is inserted.
  */
 static void
 fdtestdrv(struct fd_softc *fdsoftc)
+{
 	int status;
 	/*
 	 * Select the right unit and head.
 	 */
 	fdselect(fdsoftc->unit, 0, FLP_DD);

 @@ -1,14 +1,14 @@
-/* $NetBSD: udf_subr.c,v 1.169 2022/04/22 21:21:10 reinoud Exp $ */
+/* $NetBSD: udf_subr.c,v 1.170 2022/05/15 20:37:51 andvar Exp $ */
 /*
  * Copyright (c) 2006, 2008 Reinoud Zandijk
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -19,27 +19,27 @@
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.169 2022/04/22 21:21:10 reinoud Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.170 2022/05/15 20:37:51 andvar Exp $");
 #endif /* not lint */
 #if defined(_KERNEL_OPT)
 #include "opt_compat_netbsd.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sysctl.h>
 #include <sys/namei.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 @@ -4673,27 +4673,27 @@ udf_create_new_fe(struct udf_mount *ump,
 	struct timespec now;
 	struct icb_tag *icb;
 	struct filetimes_extattr_entry *ft_extattr;
 	uint64_t unique_id;
 	uint32_t fidsize, lb_num;
 	uint8_t *bpos;
 	int crclen, attrlen;
 	lb_num = udf_rw32(node_icb->loc.lb_num);
 	udf_inittag(ump, &fe->tag, TAGID_FENTRY, lb_num);
 	icb = &fe->icbtag;
 	/*
-	 * Always use strategy type 4 unless on WORM wich we don't support
+	 * Always use strategy type 4 unless on WORM which we don't support
 	 * (yet). Fill in defaults and set for internal allocation of data.
 	 */
 	icb->strat_type      = udf_rw16(4);
 	icb->max_num_entries = udf_rw16(1);
 	icb->file_type       = file_type;	/* 8 bit */
 	icb->flags           = udf_rw16(UDF_ICB_INTERN_ALLOC);
 	fe->perm     = udf_rw32(0x7fff);	/* all is allowed   */
 	fe->link_cnt = udf_rw16(0);		/* explicit setting */
 	fe->ckpoint  = udf_rw32(1);		/* user supplied file version */
 	vfs_timestamp(&now);
 @@ -4755,27 +4755,27 @@ udf_create_new_efe(struct udf_mount *ump
+{
 	struct timespec now;
 	struct icb_tag *icb;
 	uint64_t unique_id;
 	uint32_t fidsize, lb_num;
 	uint8_t *bpos;
 	int crclen;
 	lb_num = udf_rw32(node_icb->loc.lb_num);
 	udf_inittag(ump, &efe->tag, TAGID_EXTFENTRY, lb_num);
 	icb = &efe->icbtag;
 	/*
-	 * Always use strategy type 4 unless on WORM wich we don't support
+	 * Always use strategy type 4 unless on WORM which we don't support
 	 * (yet). Fill in defaults and set for internal allocation of data.
 	 */
 	icb->strat_type      = udf_rw16(4);
 	icb->max_num_entries = udf_rw16(1);
 	icb->file_type       = file_type;	/* 8 bit */
 	icb->flags           = udf_rw16(UDF_ICB_INTERN_ALLOC);
 	efe->perm     = udf_rw32(0x7fff);	/* all is allowed   */
 	efe->link_cnt = udf_rw16(0);		/* explicit setting */
 	efe->ckpoint  = udf_rw32(1);		/* user supplied file version */
 	vfs_timestamp(&now);

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tls.c,v 1.19 2021/11/27 22:30:26 rillig Exp $	*/
+/*	$NetBSD: tls.c,v 1.20 2022/05/15 20:37:51 andvar Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Martin Sch�tte.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -35,27 +35,27 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * tls.c TLS related code for syslogd
+ *
  * implements the TLS init and handshake callbacks with all required
  * checks from http://tools.ietf.org/html/draft-ietf-syslog-transport-tls-13
+ *
  * Martin Sch�tte
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: tls.c,v 1.19 2021/11/27 22:30:26 rillig Exp $");
+__RCSID("$NetBSD: tls.c,v 1.20 2022/05/15 20:37:51 andvar Exp $");
 #ifndef DISABLE_TLS
 #include <sys/stat.h>
 #include "syslogd.h"
 #include "tls.h"
 #include <netinet/in.h>
 #include <ifaddrs.h>
 #include "extern.h"
 static unsigned getVerifySetting(const char *x509verifystring);
 /* to output SSL error codes */
 static const char *SSL_ERRCODE[] = {
 @@ -326,27 +326,27 @@ get_fingerprint(const X509 *cert, char *
 	size_t memsize, i;
 	unsigned len;
 	const EVP_MD *digest;
 	const char *openssl_algname;
 	/* RFC nnnn uses hash function names from
 	 * http://www.iana.org/assignments/hash-function-text-names/
 	 * in certificate fingerprints.
 	 * We have to map them to the hash function names used by OpenSSL.
 	 * Actually we use the union of both namespaces to be RFC compliant
 	 * and to let the user use "openssl -fingerprint ..."
+	 *
 	 * Intended behaviour is to prefer the IANA names,
 	 * but allow the user to use OpenSSL names as well
-	 * (e.g. for "RIPEMD160" wich has no IANA name)
+	 * (e.g. for "RIPEMD160" which has no IANA name)
 	 */
 	static const struct hash_alg_namemap {
 		const char *iana;
 		const char *openssl;
 	} hash_alg_namemap[] = {
 		{"md2",	    "MD2"   },
 		{"md5",	    "MD5"   },
 		{"sha-1",   "SHA1"  },
 		{"sha-224", "SHA224"},
 		{"sha-256", "SHA256"},
 		{"sha-384", "SHA384"},
 		{"sha-512", "SHA512"}
 	};