Module Name:    src
Committed By:   sevan
Date:           Wed Sep 13 22:24:46 UTC 2017

Modified Files:
        src/share/man/man4: options.4
        src/share/man/man8: veriexec.8
        src/sys/arch/acorn26/conf: GENERIC
        src/sys/arch/acorn32/conf: GENERIC
        src/sys/arch/alpha/conf: GENERIC
        src/sys/arch/amd64/conf: ALL GENERIC
        src/sys/arch/amiga/conf: DRACO GENERIC GENERIC.in INSTALL
        src/sys/arch/amigappc/conf: GENERIC NULL
        src/sys/arch/arc/conf: GENERIC
        src/sys/arch/bebox/conf: GENERIC
        src/sys/arch/cats/conf: GENERIC
        src/sys/arch/cesfic/conf: GENERIC
        src/sys/arch/cobalt/conf: GENERIC
        src/sys/arch/dreamcast/conf: G1IDE GENERIC
        src/sys/arch/evbarm/conf: ARMADILLO-IOT-G3 CUBOX CUBOX-I DUOVERO
            GENERIC.common GUMSTIX HPT5325 IMX6UL-STARTER MARVELL_NAS
            MMNET_GENERIC MPCSA_GENERIC MV2120 NITROGEN6X OPENBLOCKS_A6
            OPENBLOCKS_AX3 OVERO PEPPER SHEEVAPLUG
        src/sys/arch/evbarm64/conf: A64EMUL
        src/sys/arch/evbmips/conf: GDIUM LOONGSON SBMIPS
        src/sys/arch/ews4800mips/conf: GENERIC
        src/sys/arch/hp300/conf: GENERIC
        src/sys/arch/hpcmips/conf: GENERIC
        src/sys/arch/hpcsh/conf: GENERIC
        src/sys/arch/hppa/conf: GENERIC
        src/sys/arch/i386/conf: ALL GENERIC
        src/sys/arch/ibmnws/conf: GENERIC
        src/sys/arch/iyonix/conf: GENERIC
        src/sys/arch/landisk/conf: GENERIC
        src/sys/arch/luna68k/conf: GENERIC INSTALL
        src/sys/arch/mac68k/conf: GENERIC
        src/sys/arch/macppc/conf: GENERIC GENERIC_601
        src/sys/arch/mipsco/conf: GENERIC
        src/sys/arch/mmeye/conf: GENERIC MMEYE_WLF
        src/sys/arch/mvme68k/conf: GENERIC
        src/sys/arch/netwinder/conf: GENERIC
        src/sys/arch/news68k/conf: GENERIC
        src/sys/arch/newsmips/conf: GENERIC
        src/sys/arch/next68k/conf: GENERIC
        src/sys/arch/ofppc/conf: GENERIC
        src/sys/arch/playstation2/conf: GENERIC
        src/sys/arch/pmax/conf: GENERIC GENERIC64
        src/sys/arch/prep/conf: GENERIC
        src/sys/arch/rs6000/conf: GENERIC
        src/sys/arch/sandpoint/conf: GENERIC
        src/sys/arch/sbmips/conf: GENERIC
        src/sys/arch/sgimips/conf: GENERIC32_IP12 GENERIC32_IP2x GENERIC32_IP3x
        src/sys/arch/shark/conf: GENERIC
        src/sys/arch/sparc/conf: GENERIC KRUPS
        src/sys/arch/sparc64/conf: GENERIC
        src/sys/arch/sun2/conf: GENERIC
        src/sys/arch/sun3/conf: GENERIC GENERIC3X
        src/sys/arch/vax/conf: GENERIC VAX780
        src/sys/arch/x68k/conf: GENERIC
        src/sys/conf: files
        src/sys/kern: kern_veriexec.c

Log Message:
Remove support for VERIFIED_EXEC_FP_RMD160, VERIFIED_EXEC_FP_SHA1, and 
VERIFIED_EXEC_FP_MD5 options.
These algorithms are either broken or on their way to being broken.

Discussed on tech-security
http://mail-index.netbsd.org/tech-security/2017/08/21/msg000936.html

ok riastradh


To generate a diff of this commit:
cvs rdiff -u -r1.473 -r1.474 src/share/man/man4/options.4
cvs rdiff -u -r1.6 -r1.7 src/share/man/man8/veriexec.8
cvs rdiff -u -r1.83 -r1.84 src/sys/arch/acorn26/conf/GENERIC
cvs rdiff -u -r1.121 -r1.122 src/sys/arch/acorn32/conf/GENERIC
cvs rdiff -u -r1.376 -r1.377 src/sys/arch/alpha/conf/GENERIC
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.464 -r1.465 src/sys/arch/amd64/conf/GENERIC
cvs rdiff -u -r1.182 -r1.183 src/sys/arch/amiga/conf/DRACO
cvs rdiff -u -r1.316 -r1.317 src/sys/arch/amiga/conf/GENERIC
cvs rdiff -u -r1.134 -r1.135 src/sys/arch/amiga/conf/GENERIC.in
cvs rdiff -u -r1.126 -r1.127 src/sys/arch/amiga/conf/INSTALL
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/amigappc/conf/GENERIC
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/amigappc/conf/NULL
cvs rdiff -u -r1.186 -r1.187 src/sys/arch/arc/conf/GENERIC
cvs rdiff -u -r1.154 -r1.155 src/sys/arch/bebox/conf/GENERIC
cvs rdiff -u -r1.163 -r1.164 src/sys/arch/cats/conf/GENERIC
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/cesfic/conf/GENERIC
cvs rdiff -u -r1.152 -r1.153 src/sys/arch/cobalt/conf/GENERIC
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/dreamcast/conf/G1IDE
cvs rdiff -u -r1.127 -r1.128 src/sys/arch/dreamcast/conf/GENERIC
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/CUBOX
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/conf/CUBOX-I
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/DUOVERO
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/conf/GENERIC.common
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/evbarm/conf/GUMSTIX
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbarm/conf/HPT5325
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/IMX6UL-STARTER
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/evbarm/conf/MARVELL_NAS
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/evbarm/conf/MMNET_GENERIC
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/evbarm/conf/MPCSA_GENERIC
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/evbarm/conf/MV2120
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/evbarm/conf/NITROGEN6X
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/evbarm/conf/OPENBLOCKS_A6
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3
cvs rdiff -u -r1.48 -r1.49 src/sys/arch/evbarm/conf/OVERO
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/PEPPER
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/evbarm/conf/SHEEVAPLUG
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm64/conf/A64EMUL
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbmips/conf/GDIUM
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/evbmips/conf/LOONGSON
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbmips/conf/SBMIPS
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/ews4800mips/conf/GENERIC
cvs rdiff -u -r1.195 -r1.196 src/sys/arch/hp300/conf/GENERIC
cvs rdiff -u -r1.233 -r1.234 src/sys/arch/hpcmips/conf/GENERIC
cvs rdiff -u -r1.107 -r1.108 src/sys/arch/hpcsh/conf/GENERIC
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/hppa/conf/GENERIC
cvs rdiff -u -r1.428 -r1.429 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.1166 -r1.1167 src/sys/arch/i386/conf/GENERIC
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/ibmnws/conf/GENERIC
cvs rdiff -u -r1.94 -r1.95 src/sys/arch/iyonix/conf/GENERIC
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/landisk/conf/GENERIC
cvs rdiff -u -r1.122 -r1.123 src/sys/arch/luna68k/conf/GENERIC
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/luna68k/conf/INSTALL
cvs rdiff -u -r1.222 -r1.223 src/sys/arch/mac68k/conf/GENERIC
cvs rdiff -u -r1.332 -r1.333 src/sys/arch/macppc/conf/GENERIC
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/macppc/conf/GENERIC_601
cvs rdiff -u -r1.89 -r1.90 src/sys/arch/mipsco/conf/GENERIC
cvs rdiff -u -r1.122 -r1.123 src/sys/arch/mmeye/conf/GENERIC
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/mmeye/conf/MMEYE_WLF
cvs rdiff -u -r1.95 -r1.96 src/sys/arch/mvme68k/conf/GENERIC
cvs rdiff -u -r1.131 -r1.132 src/sys/arch/netwinder/conf/GENERIC
cvs rdiff -u -r1.127 -r1.128 src/sys/arch/news68k/conf/GENERIC
cvs rdiff -u -r1.130 -r1.131 src/sys/arch/newsmips/conf/GENERIC
cvs rdiff -u -r1.142 -r1.143 src/sys/arch/next68k/conf/GENERIC
cvs rdiff -u -r1.163 -r1.164 src/sys/arch/ofppc/conf/GENERIC
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/playstation2/conf/GENERIC
cvs rdiff -u -r1.192 -r1.193 src/sys/arch/pmax/conf/GENERIC
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/pmax/conf/GENERIC64
cvs rdiff -u -r1.182 -r1.183 src/sys/arch/prep/conf/GENERIC
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/rs6000/conf/GENERIC
cvs rdiff -u -r1.94 -r1.95 src/sys/arch/sandpoint/conf/GENERIC
cvs rdiff -u -r1.103 -r1.104 src/sys/arch/sbmips/conf/GENERIC
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/sgimips/conf/GENERIC32_IP12
cvs rdiff -u -r1.109 -r1.110 src/sys/arch/sgimips/conf/GENERIC32_IP2x
cvs rdiff -u -r1.112 -r1.113 src/sys/arch/sgimips/conf/GENERIC32_IP3x
cvs rdiff -u -r1.128 -r1.129 src/sys/arch/shark/conf/GENERIC
cvs rdiff -u -r1.254 -r1.255 src/sys/arch/sparc/conf/GENERIC
cvs rdiff -u -r1.73 -r1.74 src/sys/arch/sparc/conf/KRUPS
cvs rdiff -u -r1.200 -r1.201 src/sys/arch/sparc64/conf/GENERIC
cvs rdiff -u -r1.96 -r1.97 src/sys/arch/sun2/conf/GENERIC
cvs rdiff -u -r1.173 -r1.174 src/sys/arch/sun3/conf/GENERIC
cvs rdiff -u -r1.127 -r1.128 src/sys/arch/sun3/conf/GENERIC3X
cvs rdiff -u -r1.201 -r1.202 src/sys/arch/vax/conf/GENERIC
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/vax/conf/VAX780
cvs rdiff -u -r1.184 -r1.185 src/sys/arch/x68k/conf/GENERIC
cvs rdiff -u -r1.1180 -r1.1181 src/sys/conf/files
cvs rdiff -u -r1.16 -r1.17 src/sys/kern/kern_veriexec.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man4/options.4
diff -u src/share/man/man4/options.4:1.473 src/share/man/man4/options.4:1.474
--- src/share/man/man4/options.4:1.473	Wed Sep 13 08:26:38 2017
+++ src/share/man/man4/options.4	Wed Sep 13 22:24:42 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: options.4,v 1.473 2017/09/13 08:26:38 wiz Exp $
+.\"	$NetBSD: options.4,v 1.474 2017/09/13 22:24:42 sevan Exp $
 .\"
 .\" Copyright (c) 1996
 .\" 	Perry E. Metzger.  All rights reserved.
@@ -30,7 +30,7 @@
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
 .\"
-.Dd September 12, 2017
+.Dd September 13, 2017
 .Dt OPTIONS 4
 .Os
 .Sh NAME
@@ -2320,12 +2320,6 @@ See also
 .Xr sysctl 8
 and
 .Xr sysctl 3 .
-.It Cd options VERIFIED_EXEC_FP_MD5
-Enables support for MD5 hashes in Veriexec.
-.It Cd options VERIFIED_EXEC_FP_SHA1
-Enables support for SHA1 hashes in Veriexec.
-.It Cd options VERIFIED_EXEC_FP_RMD160
-Enables support for RMD160 hashes in Veriexec.
 .It Cd options VERIFIED_EXEC_FP_SHA256
 Enables support for SHA256 hashes in Veriexec.
 .It Cd options VERIFIED_EXEC_FP_SHA384

Index: src/share/man/man8/veriexec.8
diff -u src/share/man/man8/veriexec.8:1.6 src/share/man/man8/veriexec.8:1.7
--- src/share/man/man8/veriexec.8:1.6	Wed Sep 13 22:15:25 2017
+++ src/share/man/man8/veriexec.8	Wed Sep 13 22:24:42 2017
@@ -1,4 +1,4 @@
-.\" $NetBSD: veriexec.8,v 1.6 2017/09/13 22:15:25 sevan Exp $
+.\" $NetBSD: veriexec.8,v 1.7 2017/09/13 22:24:42 sevan Exp $
 .\"
 .\" Copyright (c) 2008 Elad Efrat <e...@netbsd.org>
 .\" All rights reserved.
@@ -165,7 +165,7 @@ exports runtime information that may be 
 It reports the currently supported fingerprinting algorithms, for example:
 .Bd -literal -offset indent
 # /sbin/sysctl kern.veriexec.algorithms
-kern.veriexec.algorithms = RMD160 SHA256 SHA384 SHA512 SHA1 MD5
+kern.veriexec.algorithms = SHA256 SHA384 SHA512
 .Ed
 .Pp
 It reports the current verbosity and strict levels, for example:

Index: src/sys/arch/acorn26/conf/GENERIC
diff -u src/sys/arch/acorn26/conf/GENERIC:1.83 src/sys/arch/acorn26/conf/GENERIC:1.84
--- src/sys/arch/acorn26/conf/GENERIC:1.83	Sat Jul 29 18:08:56 2017
+++ src/sys/arch/acorn26/conf/GENERIC	Wed Sep 13 22:24:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.83 2017/07/29 18:08:56 maxv Exp $
+# $NetBSD: GENERIC,v 1.84 2017/09/13 22:24:42 sevan Exp $
 #
 # GENERIC machine description file
 # 
@@ -272,9 +272,6 @@ pseudo-device	putter		# for puffs and pu
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/acorn32/conf/GENERIC
diff -u src/sys/arch/acorn32/conf/GENERIC:1.121 src/sys/arch/acorn32/conf/GENERIC:1.122
--- src/sys/arch/acorn32/conf/GENERIC:1.121	Fri Jul 28 19:26:15 2017
+++ src/sys/arch/acorn32/conf/GENERIC	Wed Sep 13 22:24:42 2017
@@ -1,4 +1,4 @@
-# 	$NetBSD: GENERIC,v 1.121 2017/07/28 19:26:15 maxv Exp $
+# 	$NetBSD: GENERIC,v 1.122 2017/09/13 22:24:42 sevan Exp $
 #
 #	GENERIC --- NetBSD/acorn32 complete configuration
 #
@@ -22,7 +22,7 @@ include		"arch/acorn32/conf/std.acorn32"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.121 $"
+#ident		"GENERIC-$Revision: 1.122 $"
 
 # estimated number of users
 maxusers	32
@@ -353,12 +353,9 @@ pseudo-device   accf_http		# "httpready"
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5
 
 # If the standard modes don't work for your monitor, you can specify
 # a RISC-OS-format monitor definition file and a list of modes here.

Index: src/sys/arch/alpha/conf/GENERIC
diff -u src/sys/arch/alpha/conf/GENERIC:1.376 src/sys/arch/alpha/conf/GENERIC:1.377
--- src/sys/arch/alpha/conf/GENERIC:1.376	Sat Jul 29 18:08:56 2017
+++ src/sys/arch/alpha/conf/GENERIC	Wed Sep 13 22:24:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.376 2017/07/29 18:08:56 maxv Exp $
+# $NetBSD: GENERIC,v 1.377 2017/09/13 22:24:42 sevan Exp $
 #
 # This machine description file is used to generate the default NetBSD
 # kernel.
@@ -19,7 +19,7 @@ include 	"arch/alpha/conf/std.alpha"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-ident		"GENERIC-$Revision: 1.376 $"
+ident		"GENERIC-$Revision: 1.377 $"
 
 maxusers 32
 
@@ -790,12 +790,9 @@ pseudo-device	putter			# for puffs and p
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options 	VERIFIED_EXEC_FP_RMD160
 #options 	VERIFIED_EXEC_FP_SHA256
 #options 	VERIFIED_EXEC_FP_SHA384
 #options 	VERIFIED_EXEC_FP_SHA512
-#options 	VERIFIED_EXEC_FP_SHA1
-#options 	VERIFIED_EXEC_FP_MD5
 
 options PAX_MPROTECT=0			# PaX mprotect(2) restrictions
 options PAX_ASLR=0			# PaX Address Space Layout Randomization

Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.69 src/sys/arch/amd64/conf/ALL:1.70
--- src/sys/arch/amd64/conf/ALL:1.69	Sun Sep  3 08:52:18 2017
+++ src/sys/arch/amd64/conf/ALL	Wed Sep 13 22:24:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.69 2017/09/03 08:52:18 maxv Exp $
+# $NetBSD: ALL,v 1.70 2017/09/13 22:24:42 sevan Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@ include 	"arch/amd64/conf/std.amd64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"ALL-$Revision: 1.69 $"
+#ident		"ALL-$Revision: 1.70 $"
 
 maxusers	64		# estimated number of users
 
@@ -1703,12 +1703,9 @@ pseudo-device	veriexec
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-options 	VERIFIED_EXEC_FP_RMD160
 options 	VERIFIED_EXEC_FP_SHA256
 options 	VERIFIED_EXEC_FP_SHA384
 options 	VERIFIED_EXEC_FP_SHA512
-options 	VERIFIED_EXEC_FP_SHA1
-options 	VERIFIED_EXEC_FP_MD5
 
 options 	PAX_SEGVGUARD=0		# PaX Segmentation fault guard
 options 	PAX_MPROTECT=1		# PaX mprotect(2) restrictions

Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.464 src/sys/arch/amd64/conf/GENERIC:1.465
--- src/sys/arch/amd64/conf/GENERIC:1.464	Sun Aug 13 08:48:30 2017
+++ src/sys/arch/amd64/conf/GENERIC	Wed Sep 13 22:24:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.464 2017/08/13 08:48:30 christos Exp $
+# $NetBSD: GENERIC,v 1.465 2017/09/13 22:24:42 sevan Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/amd64/conf/std.amd64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.464 $"
+#ident		"GENERIC-$Revision: 1.465 $"
 
 maxusers	64		# estimated number of users
 
@@ -1334,12 +1334,9 @@ pseudo-device	veriexec
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-options VERIFIED_EXEC_FP_RMD160
 options VERIFIED_EXEC_FP_SHA256
 options VERIFIED_EXEC_FP_SHA384
 options VERIFIED_EXEC_FP_SHA512
-options VERIFIED_EXEC_FP_SHA1
-options VERIFIED_EXEC_FP_MD5
 
 options 	PAX_SEGVGUARD=0		# PaX Segmentation fault guard
 options 	PAX_MPROTECT=1		# PaX mprotect(2) restrictions

Index: src/sys/arch/amiga/conf/DRACO
diff -u src/sys/arch/amiga/conf/DRACO:1.182 src/sys/arch/amiga/conf/DRACO:1.183
--- src/sys/arch/amiga/conf/DRACO:1.182	Sun Jul 30 13:12:49 2017
+++ src/sys/arch/amiga/conf/DRACO	Wed Sep 13 22:24:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: DRACO,v 1.182 2017/07/30 13:12:49 maxv Exp $
+# $NetBSD: DRACO,v 1.183 2017/09/13 22:24:42 sevan Exp $
 #
 # This file was automatically created.
 # Changes will be lost when make is run in this directory.
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.182 $"
+#ident 		"GENERIC-$Revision: 1.183 $"
 
 makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
 
@@ -375,11 +375,8 @@ pseudo-device	nsmb			# experimental - SM
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5
 
 config	netbsd root on ? type ?

Index: src/sys/arch/amiga/conf/GENERIC
diff -u src/sys/arch/amiga/conf/GENERIC:1.316 src/sys/arch/amiga/conf/GENERIC:1.317
--- src/sys/arch/amiga/conf/GENERIC:1.316	Sun Jul 30 13:12:49 2017
+++ src/sys/arch/amiga/conf/GENERIC	Wed Sep 13 22:24:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.316 2017/07/30 13:12:49 maxv Exp $
+# $NetBSD: GENERIC,v 1.317 2017/09/13 22:24:42 sevan Exp $
 #
 # This file was automatically created.
 # Changes will be lost when make is run in this directory.
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.316 $"
+#ident 		"GENERIC-$Revision: 1.317 $"
 
 makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
 
@@ -622,11 +622,8 @@ pseudo-device   btuart                  
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5
 
 config	netbsd root on ? type ?

Index: src/sys/arch/amiga/conf/GENERIC.in
diff -u src/sys/arch/amiga/conf/GENERIC.in:1.134 src/sys/arch/amiga/conf/GENERIC.in:1.135
--- src/sys/arch/amiga/conf/GENERIC.in:1.134	Sun Jul 30 13:12:49 2017
+++ src/sys/arch/amiga/conf/GENERIC.in	Wed Sep 13 22:24:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.in,v 1.134 2017/07/30 13:12:49 maxv Exp $
+# $NetBSD: GENERIC.in,v 1.135 2017/09/13 22:24:42 sevan Exp $
 #
 ##
 # GENERIC machine description file
@@ -52,7 +52,7 @@ include "arch/amiga/conf/std.amiga"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.134 $"
+#ident 		"GENERIC-$Revision: 1.135 $"
 
 m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl
 makeoptions	COPTS="-Os"
@@ -731,11 +731,8 @@ pseudo-device   btuart                  
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5
 
 config	netbsd root on ? type ?

Index: src/sys/arch/amiga/conf/INSTALL
diff -u src/sys/arch/amiga/conf/INSTALL:1.126 src/sys/arch/amiga/conf/INSTALL:1.127
--- src/sys/arch/amiga/conf/INSTALL:1.126	Fri Aug 21 01:52:07 2015
+++ src/sys/arch/amiga/conf/INSTALL	Wed Sep 13 22:24:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.126 2015/08/21 01:52:07 uebayasi Exp $
+# $NetBSD: INSTALL,v 1.127 2017/09/13 22:24:42 sevan Exp $
 #
 # This file was automatically created.
 # Changes will be lost when make is run in this directory.
@@ -29,7 +29,7 @@ include "arch/amiga/conf/std.amiga"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.126 $"
+#ident 		"GENERIC-$Revision: 1.127 $"
 
 makeoptions	COPTS="-Os"
 
@@ -554,11 +554,8 @@ pseudo-device   btuart                  
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5
 
 config	netbsd root on ? type ?

Index: src/sys/arch/amigappc/conf/GENERIC
diff -u src/sys/arch/amigappc/conf/GENERIC:1.30 src/sys/arch/amigappc/conf/GENERIC:1.31
--- src/sys/arch/amigappc/conf/GENERIC:1.30	Sat Jul 29 18:08:56 2017
+++ src/sys/arch/amigappc/conf/GENERIC	Wed Sep 13 22:24:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.30 2017/07/29 18:08:56 maxv Exp $
+# $NetBSD: GENERIC,v 1.31 2017/09/13 22:24:42 sevan Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include "arch/amigappc/conf/std.amigappc
 
 options 	INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident          "GENERIC-$Revision: 1.30 $"
+#ident          "GENERIC-$Revision: 1.31 $"
 
 maxusers	8
 
@@ -459,12 +459,9 @@ pseudo-device	nsmb			# experimental - SM
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5
 
 # Kernel root file system and dump configuration
 config		netbsd	root on ? type ?

Index: src/sys/arch/amigappc/conf/NULL
diff -u src/sys/arch/amigappc/conf/NULL:1.50 src/sys/arch/amigappc/conf/NULL:1.51
--- src/sys/arch/amigappc/conf/NULL:1.50	Sat Jul 29 18:08:56 2017
+++ src/sys/arch/amigappc/conf/NULL	Wed Sep 13 22:24:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: NULL,v 1.50 2017/07/29 18:08:56 maxv Exp $
+# $NetBSD: NULL,v 1.51 2017/09/13 22:24:42 sevan Exp $
 #
 # NULL machine description file
 # 
@@ -7,7 +7,7 @@ include "arch/amigappc/conf/std.amigappc
 
 #options 	INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident          "GENERIC-$Revision: 1.50 $"
+#ident          "GENERIC-$Revision: 1.51 $"
 
 maxusers	8
 
@@ -440,12 +440,9 @@ pseudo-device	ksyms			# /dev/ksyms (kern
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5
 
 # Kernel root file system and dump configuration
 config		netbsd	root on ? type ?

Index: src/sys/arch/arc/conf/GENERIC
diff -u src/sys/arch/arc/conf/GENERIC:1.186 src/sys/arch/arc/conf/GENERIC:1.187
--- src/sys/arch/arc/conf/GENERIC:1.186	Sat Jul 29 18:08:56 2017
+++ src/sys/arch/arc/conf/GENERIC	Wed Sep 13 22:24:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.186 2017/07/29 18:08:56 maxv Exp $
+# $NetBSD: GENERIC,v 1.187 2017/09/13 22:24:42 sevan Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include		"arch/arc/conf/std.arc"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.186 $"
+#ident		"GENERIC-$Revision: 1.187 $"
 
 maxusers	32		# estimated number of users
 
@@ -512,9 +512,6 @@ pseudo-device	ksyms			# /dev/ksyms
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/bebox/conf/GENERIC
diff -u src/sys/arch/bebox/conf/GENERIC:1.154 src/sys/arch/bebox/conf/GENERIC:1.155
--- src/sys/arch/bebox/conf/GENERIC:1.154	Sat Jul 29 18:08:56 2017
+++ src/sys/arch/bebox/conf/GENERIC	Wed Sep 13 22:24:42 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.154 2017/07/29 18:08:56 maxv Exp $
+# $NetBSD: GENERIC,v 1.155 2017/09/13 22:24:42 sevan Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/bebox/conf/std.bebox"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.154 $"
+#ident 		"GENERIC-$Revision: 1.155 $"
 
 maxusers	32
 
@@ -357,12 +357,9 @@ pseudo-device	wsfont
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options 	VERIFIED_EXEC_FP_RMD160
 #options 	VERIFIED_EXEC_FP_SHA256
 #options 	VERIFIED_EXEC_FP_SHA384
 #options 	VERIFIED_EXEC_FP_SHA512
-#options 	VERIFIED_EXEC_FP_SHA1
-#options 	VERIFIED_EXEC_FP_MD5
 
 #options 	PAX_MPROTECT=0		# PaX mprotect(2) restrictions
 #options 	PAX_ASLR=0		# PaX Address Space Layout Randomization

Index: src/sys/arch/cats/conf/GENERIC
diff -u src/sys/arch/cats/conf/GENERIC:1.163 src/sys/arch/cats/conf/GENERIC:1.164
--- src/sys/arch/cats/conf/GENERIC:1.163	Sat Jul 29 18:08:57 2017
+++ src/sys/arch/cats/conf/GENERIC	Wed Sep 13 22:24:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.163 2017/07/29 18:08:57 maxv Exp $
+# $NetBSD: GENERIC,v 1.164 2017/09/13 22:24:43 sevan Exp $
 #
 # GENERIC machine description file
 # 
@@ -601,9 +601,6 @@ pseudo-device	ksyms			# /dev/ksyms
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/cesfic/conf/GENERIC
diff -u src/sys/arch/cesfic/conf/GENERIC:1.66 src/sys/arch/cesfic/conf/GENERIC:1.67
--- src/sys/arch/cesfic/conf/GENERIC:1.66	Sat Jul 29 12:28:27 2017
+++ src/sys/arch/cesfic/conf/GENERIC	Wed Sep 13 22:24:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.66 2017/07/29 12:28:27 maxv Exp $
+# $NetBSD: GENERIC,v 1.67 2017/09/13 22:24:43 sevan Exp $
 #
 # GENERIC machine description file
 # 
@@ -163,9 +163,6 @@ pseudo-device	ksyms			# /dev/ksyms
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/cobalt/conf/GENERIC
diff -u src/sys/arch/cobalt/conf/GENERIC:1.152 src/sys/arch/cobalt/conf/GENERIC:1.153
--- src/sys/arch/cobalt/conf/GENERIC:1.152	Sat Jul 29 18:08:57 2017
+++ src/sys/arch/cobalt/conf/GENERIC	Wed Sep 13 22:24:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.152 2017/07/29 18:08:57 maxv Exp $
+# $NetBSD: GENERIC,v 1.153 2017/09/13 22:24:43 sevan Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/cobalt/conf/std.cobalt"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.152 $"
+#ident 		"GENERIC-$Revision: 1.153 $"
 
 maxusers	32
 
@@ -381,9 +381,6 @@ pseudo-device	ksyms				# /dev/ksyms
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/dreamcast/conf/G1IDE
diff -u src/sys/arch/dreamcast/conf/G1IDE:1.3 src/sys/arch/dreamcast/conf/G1IDE:1.4
--- src/sys/arch/dreamcast/conf/G1IDE:1.3	Sat Jul 29 18:08:57 2017
+++ src/sys/arch/dreamcast/conf/G1IDE	Wed Sep 13 22:24:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: G1IDE,v 1.3 2017/07/29 18:08:57 maxv Exp $
+# $NetBSD: G1IDE,v 1.4 2017/09/13 22:24:43 sevan Exp $
 
 include 	"arch/dreamcast/conf/std.dreamcast"
 
@@ -239,9 +239,6 @@ pseudo-device	ksyms			# /dev/ksyms
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/dreamcast/conf/GENERIC
diff -u src/sys/arch/dreamcast/conf/GENERIC:1.127 src/sys/arch/dreamcast/conf/GENERIC:1.128
--- src/sys/arch/dreamcast/conf/GENERIC:1.127	Sat Jul 29 18:08:57 2017
+++ src/sys/arch/dreamcast/conf/GENERIC	Wed Sep 13 22:24:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.127 2017/07/29 18:08:57 maxv Exp $
+# $NetBSD: GENERIC,v 1.128 2017/09/13 22:24:43 sevan Exp $
 #
 # GENERIC machine description file
 # 
@@ -240,9 +240,6 @@ pseudo-device	ksyms			# /dev/ksyms
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3
diff -u src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3:1.7 src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3:1.8
--- src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3:1.7	Sat Jul 29 18:08:57 2017
+++ src/sys/arch/evbarm/conf/ARMADILLO-IOT-G3	Wed Sep 13 22:24:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: ARMADILLO-IOT-G3,v 1.7 2017/07/29 18:08:57 maxv Exp $
+# $NetBSD: ARMADILLO-IOT-G3,v 1.8 2017/09/13 22:24:43 sevan Exp $
 #
 # ARMADILLO-IOT-G3 -- Atmark Techno, Armadillo-IoT G3
 #
@@ -411,12 +411,9 @@ pseudo-device	veriexec
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-options VERIFIED_EXEC_FP_RMD160
 options VERIFIED_EXEC_FP_SHA256
 options VERIFIED_EXEC_FP_SHA384
 options VERIFIED_EXEC_FP_SHA512
-options VERIFIED_EXEC_FP_SHA1
-options VERIFIED_EXEC_FP_MD5
 
 options 	PAX_SEGVGUARD=0		# PaX Segmentation fault guard
 options 	PAX_MPROTECT=0		# PaX mprotect(2) restrictions

Index: src/sys/arch/evbarm/conf/CUBOX
diff -u src/sys/arch/evbarm/conf/CUBOX:1.3 src/sys/arch/evbarm/conf/CUBOX:1.4
--- src/sys/arch/evbarm/conf/CUBOX:1.3	Sat Jul 29 18:08:57 2017
+++ src/sys/arch/evbarm/conf/CUBOX	Wed Sep 13 22:24:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CUBOX,v 1.3 2017/07/29 18:08:57 maxv Exp $
+# $NetBSD: CUBOX,v 1.4 2017/09/13 22:24:43 sevan Exp $
 #
 #	CUBOX -- SolidRun Ltd. Cubox kernel
 #
@@ -406,12 +406,9 @@ pseudo-device	veriexec
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-options VERIFIED_EXEC_FP_RMD160
 options VERIFIED_EXEC_FP_SHA256
 options VERIFIED_EXEC_FP_SHA384
 options VERIFIED_EXEC_FP_SHA512
-options VERIFIED_EXEC_FP_SHA1
-options VERIFIED_EXEC_FP_MD5
 
 options 	PAX_MPROTECT=0		# PaX mprotect(2) restrictions
 options 	PAX_ASLR=0		# PaX Address Space Layout Randomization

Index: src/sys/arch/evbarm/conf/CUBOX-I
diff -u src/sys/arch/evbarm/conf/CUBOX-I:1.9 src/sys/arch/evbarm/conf/CUBOX-I:1.10
--- src/sys/arch/evbarm/conf/CUBOX-I:1.9	Sat Jul 29 18:08:57 2017
+++ src/sys/arch/evbarm/conf/CUBOX-I	Wed Sep 13 22:24:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CUBOX-I,v 1.9 2017/07/29 18:08:57 maxv Exp $
+# $NetBSD: CUBOX-I,v 1.10 2017/09/13 22:24:43 sevan Exp $
 #
 # CuBox-i
 # - http://www.solid-run.com/products/cubox-i-mini-computer/
@@ -431,12 +431,9 @@ pseudo-device	veriexec
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-options VERIFIED_EXEC_FP_RMD160
 options VERIFIED_EXEC_FP_SHA256
 options VERIFIED_EXEC_FP_SHA384
 options VERIFIED_EXEC_FP_SHA512
-options VERIFIED_EXEC_FP_SHA1
-options VERIFIED_EXEC_FP_MD5
 
 options 	PAX_MPROTECT=0		# PaX mprotect(2) restrictions
 options 	PAX_ASLR=0		# PaX Address Space Layout Randomization

Index: src/sys/arch/evbarm/conf/DUOVERO
diff -u src/sys/arch/evbarm/conf/DUOVERO:1.4 src/sys/arch/evbarm/conf/DUOVERO:1.5
--- src/sys/arch/evbarm/conf/DUOVERO:1.4	Sat Jul 29 18:08:57 2017
+++ src/sys/arch/evbarm/conf/DUOVERO	Wed Sep 13 22:24:43 2017
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: DUOVERO,v 1.4 2017/07/29 18:08:57 maxv Exp $
+#	$NetBSD: DUOVERO,v 1.5 2017/09/13 22:24:43 sevan Exp $
 #
 #	DUOOVERO -- Gumstix. Inc. DuoVero COMS platforms kernel
 #
@@ -326,12 +326,9 @@ pseudo-device	drvctl
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options 	VERIFIED_EXEC_FP_RMD160
 #options 	VERIFIED_EXEC_FP_SHA256
 #options 	VERIFIED_EXEC_FP_SHA384
 #options 	VERIFIED_EXEC_FP_SHA512
-#options 	VERIFIED_EXEC_FP_SHA1
-#options 	VERIFIED_EXEC_FP_MD5
 
 #options 	PAX_MPROTECT=0		# PaX mprotect(2) restrictions
 #options 	PAX_ASLR=0		# PaX Address Space Layout Randomization

Index: src/sys/arch/evbarm/conf/GENERIC.common
diff -u src/sys/arch/evbarm/conf/GENERIC.common:1.20 src/sys/arch/evbarm/conf/GENERIC.common:1.21
--- src/sys/arch/evbarm/conf/GENERIC.common:1.20	Thu Aug 10 18:11:47 2017
+++ src/sys/arch/evbarm/conf/GENERIC.common	Wed Sep 13 22:24:43 2017
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: GENERIC.common,v 1.20 2017/08/10 18:11:47 jakllsch Exp $
+#	$NetBSD: GENERIC.common,v 1.21 2017/09/13 22:24:43 sevan Exp $
 #
 #	GENERIC evbarm kernel config (template)
 #
@@ -177,13 +177,9 @@ pseudo-device   veriexec
 # removing fingerprint methods will have almost no impact on the kernel  
 # code size.
 # 
-options VERIFIED_EXEC_FP_RMD160
 options VERIFIED_EXEC_FP_SHA256
 options VERIFIED_EXEC_FP_SHA384
 options VERIFIED_EXEC_FP_SHA512
-options VERIFIED_EXEC_FP_SHA1
-options VERIFIED_EXEC_FP_MD5
-
 
 options 	PAX_ASLR_DEBUG=1	# PaX ASLR debug
 options 	PAX_SEGVGUARD=0		# PaX Segmentation fault guard

Index: src/sys/arch/evbarm/conf/GUMSTIX
diff -u src/sys/arch/evbarm/conf/GUMSTIX:1.92 src/sys/arch/evbarm/conf/GUMSTIX:1.93
--- src/sys/arch/evbarm/conf/GUMSTIX:1.92	Sat Jul 29 18:08:57 2017
+++ src/sys/arch/evbarm/conf/GUMSTIX	Wed Sep 13 22:24:43 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: GUMSTIX,v 1.92 2017/07/29 18:08:57 maxv Exp $
+#	$NetBSD: GUMSTIX,v 1.93 2017/09/13 22:24:43 sevan Exp $
 #
 #	GUMSTIX -- Gumstix. Inc. gumstix platforms kernel
 #
@@ -430,12 +430,9 @@ pseudo-device	drvctl
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5
 
 #options 	PAX_MPROTECT=0		# PaX mprotect(2) restrictions
 #options 	PAX_ASLR=0		# PaX Address Space Layout Randomization

Index: src/sys/arch/evbarm/conf/HPT5325
diff -u src/sys/arch/evbarm/conf/HPT5325:1.33 src/sys/arch/evbarm/conf/HPT5325:1.34
--- src/sys/arch/evbarm/conf/HPT5325:1.33	Sat Jul 29 18:08:57 2017
+++ src/sys/arch/evbarm/conf/HPT5325	Wed Sep 13 22:24:43 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: HPT5325,v 1.33 2017/07/29 18:08:57 maxv Exp $
+#	$NetBSD: HPT5325,v 1.34 2017/09/13 22:24:43 sevan Exp $
 #
 #  This configuration supports for HP T5325 Thin Client
 #
@@ -518,12 +518,9 @@ pseudo-device	wsfont
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options 	VERIFIED_EXEC_FP_RMD160
 #options 	VERIFIED_EXEC_FP_SHA256
 #options 	VERIFIED_EXEC_FP_SHA384
 #options 	VERIFIED_EXEC_FP_SHA512
-#options 	VERIFIED_EXEC_FP_SHA1
-#options 	VERIFIED_EXEC_FP_MD5
 
 #options 	PAX_MPROTECT=0		# PaX mprotect(2) restrictions
 #options 	PAX_ASLR=0		# PaX Address Space Layout Randomization

Index: src/sys/arch/evbarm/conf/IMX6UL-STARTER
diff -u src/sys/arch/evbarm/conf/IMX6UL-STARTER:1.2 src/sys/arch/evbarm/conf/IMX6UL-STARTER:1.3
--- src/sys/arch/evbarm/conf/IMX6UL-STARTER:1.2	Sat Jul 29 18:08:57 2017
+++ src/sys/arch/evbarm/conf/IMX6UL-STARTER	Wed Sep 13 22:24:43 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: IMX6UL-STARTER,v 1.2 2017/07/29 18:08:57 maxv Exp $
+#	$NetBSD: IMX6UL-STARTER,v 1.3 2017/09/13 22:24:43 sevan Exp $
 #
 #	IMX6UL-STARTER - Freescale i.MX6UL Evaluation Board
 #
@@ -419,12 +419,9 @@ pseudo-device	veriexec
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-options VERIFIED_EXEC_FP_RMD160
 options VERIFIED_EXEC_FP_SHA256
 options VERIFIED_EXEC_FP_SHA384
 options VERIFIED_EXEC_FP_SHA512
-options VERIFIED_EXEC_FP_SHA1
-options VERIFIED_EXEC_FP_MD5
 
 options 	PAX_SEGVGUARD=0		# PaX Segmentation fault guard
 options 	PAX_MPROTECT=1		# PaX mprotect(2) restrictions

Index: src/sys/arch/evbarm/conf/MARVELL_NAS
diff -u src/sys/arch/evbarm/conf/MARVELL_NAS:1.26 src/sys/arch/evbarm/conf/MARVELL_NAS:1.27
--- src/sys/arch/evbarm/conf/MARVELL_NAS:1.26	Sat Jul 29 18:08:57 2017
+++ src/sys/arch/evbarm/conf/MARVELL_NAS	Wed Sep 13 22:24:43 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: MARVELL_NAS,v 1.26 2017/07/29 18:08:57 maxv Exp $
+#	$NetBSD: MARVELL_NAS,v 1.27 2017/09/13 22:24:43 sevan Exp $
 #
 #  This configuration supports for generically Marvell NAS.
 
@@ -343,12 +343,9 @@ pseudo-device	veriexec
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-options 	VERIFIED_EXEC_FP_RMD160
 options 	VERIFIED_EXEC_FP_SHA256
 options 	VERIFIED_EXEC_FP_SHA384
 options 	VERIFIED_EXEC_FP_SHA512
-options 	VERIFIED_EXEC_FP_SHA1
-options 	VERIFIED_EXEC_FP_MD5
 
 options 	PAX_MPROTECT=0		# PaX mprotect(2) restrictions
 options 	PAX_ASLR=0		# PaX Address Space Layout Randomization

Index: src/sys/arch/evbarm/conf/MMNET_GENERIC
diff -u src/sys/arch/evbarm/conf/MMNET_GENERIC:1.31 src/sys/arch/evbarm/conf/MMNET_GENERIC:1.32
--- src/sys/arch/evbarm/conf/MMNET_GENERIC:1.31	Wed Aug  9 19:18:59 2017
+++ src/sys/arch/evbarm/conf/MMNET_GENERIC	Wed Sep 13 22:24:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: MMNET_GENERIC,v 1.31 2017/08/09 19:18:59 maxv Exp $
+# $NetBSD: MMNET_GENERIC,v 1.32 2017/09/13 22:24:43 sevan Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include		"arch/evbarm/conf/std.mmnet"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.31 $"
+#ident 		"GENERIC-$Revision: 1.32 $"
 
 maxusers	32		# estimated number of users
 
@@ -625,11 +625,8 @@ pseudo-device	ksyms			# /dev/ksyms
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5
 
 options PAX_MPROTECT=0			# PaX mprotect(2) restrictions

Index: src/sys/arch/evbarm/conf/MPCSA_GENERIC
diff -u src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.52 src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.53
--- src/sys/arch/evbarm/conf/MPCSA_GENERIC:1.52	Wed Aug  9 19:18:59 2017
+++ src/sys/arch/evbarm/conf/MPCSA_GENERIC	Wed Sep 13 22:24:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: MPCSA_GENERIC,v 1.52 2017/08/09 19:18:59 maxv Exp $
+# $NetBSD: MPCSA_GENERIC,v 1.53 2017/09/13 22:24:43 sevan Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include		"arch/evbarm/conf/std.mpcsa"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.52 $"
+#ident 		"GENERIC-$Revision: 1.53 $"
 
 maxusers	32		# estimated number of users
 
@@ -691,11 +691,8 @@ pseudo-device	ksyms			# /dev/ksyms
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5
 
 options PAX_MPROTECT=0			# PaX mprotect(2) restrictions

Index: src/sys/arch/evbarm/conf/MV2120
diff -u src/sys/arch/evbarm/conf/MV2120:1.32 src/sys/arch/evbarm/conf/MV2120:1.33
--- src/sys/arch/evbarm/conf/MV2120:1.32	Sat Jul 29 18:08:57 2017
+++ src/sys/arch/evbarm/conf/MV2120	Wed Sep 13 22:24:43 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: MV2120,v 1.32 2017/07/29 18:08:57 maxv Exp $
+#	$NetBSD: MV2120,v 1.33 2017/09/13 22:24:43 sevan Exp $
 #
 #  This configuration supports for HP MV2120/MV5140/MV5150.
 
@@ -335,12 +335,9 @@ pseudo-device	veriexec
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-options 	VERIFIED_EXEC_FP_RMD160
 options 	VERIFIED_EXEC_FP_SHA256
 options 	VERIFIED_EXEC_FP_SHA384
 options 	VERIFIED_EXEC_FP_SHA512
-options 	VERIFIED_EXEC_FP_SHA1
-options 	VERIFIED_EXEC_FP_MD5
 
 options 	PAX_MPROTECT=0		# PaX mprotect(2) restrictions
 options 	PAX_ASLR=0		# PaX Address Space Layout Randomization

Index: src/sys/arch/evbarm/conf/NITROGEN6X
diff -u src/sys/arch/evbarm/conf/NITROGEN6X:1.11 src/sys/arch/evbarm/conf/NITROGEN6X:1.12
--- src/sys/arch/evbarm/conf/NITROGEN6X:1.11	Sat Jul 29 18:08:57 2017
+++ src/sys/arch/evbarm/conf/NITROGEN6X	Wed Sep 13 22:24:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: NITROGEN6X,v 1.11 2017/07/29 18:08:57 maxv Exp $
+# $NetBSD: NITROGEN6X,v 1.12 2017/09/13 22:24:43 sevan Exp $
 #
 # Nitrogen6X
 # - http://boundarydevices.com/products/nitrogen6x-board-imx6-arm-cortex-a9-sbc/
@@ -420,12 +420,9 @@ pseudo-device	veriexec
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-options VERIFIED_EXEC_FP_RMD160
 options VERIFIED_EXEC_FP_SHA256
 options VERIFIED_EXEC_FP_SHA384
 options VERIFIED_EXEC_FP_SHA512
-options VERIFIED_EXEC_FP_SHA1
-options VERIFIED_EXEC_FP_MD5
 
 options 	PAX_MPROTECT=0		# PaX mprotect(2) restrictions
 options 	PAX_ASLR=0		# PaX Address Space Layout Randomization

Index: src/sys/arch/evbarm/conf/OPENBLOCKS_A6
diff -u src/sys/arch/evbarm/conf/OPENBLOCKS_A6:1.28 src/sys/arch/evbarm/conf/OPENBLOCKS_A6:1.29
--- src/sys/arch/evbarm/conf/OPENBLOCKS_A6:1.28	Sat Jul 29 18:08:57 2017
+++ src/sys/arch/evbarm/conf/OPENBLOCKS_A6	Wed Sep 13 22:24:43 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: OPENBLOCKS_A6,v 1.28 2017/07/29 18:08:57 maxv Exp $
+#	$NetBSD: OPENBLOCKS_A6,v 1.29 2017/09/13 22:24:43 sevan Exp $
 #
 #	OPENBLOCKS_A6 -- Plat'Home. OpenBlockS A6 kernel
 #
@@ -402,12 +402,9 @@ pseudo-device	dmoverio		# /dev/dmover dm
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options 	VERIFIED_EXEC_FP_RMD160
 #options 	VERIFIED_EXEC_FP_SHA256
 #options 	VERIFIED_EXEC_FP_SHA384
 #options 	VERIFIED_EXEC_FP_SHA512
-#options 	VERIFIED_EXEC_FP_SHA1
-#options 	VERIFIED_EXEC_FP_MD5
 
 #options 	PAX_MPROTECT=0		# PaX mprotect(2) restrictions
 #options 	PAX_ASLR=0		# PaX Address Space Layout Randomization

Index: src/sys/arch/evbarm/conf/OPENBLOCKS_AX3
diff -u src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.21 src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.22
--- src/sys/arch/evbarm/conf/OPENBLOCKS_AX3:1.21	Sat Jul 29 18:08:57 2017
+++ src/sys/arch/evbarm/conf/OPENBLOCKS_AX3	Wed Sep 13 22:24:43 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: OPENBLOCKS_AX3,v 1.21 2017/07/29 18:08:57 maxv Exp $
+#	$NetBSD: OPENBLOCKS_AX3,v 1.22 2017/09/13 22:24:43 sevan Exp $
 #
 #	OPENBLOCKS_AX3 -- Plat'Home. OpenBlockS AX3 kernel
 #
@@ -348,12 +348,9 @@ pseudo-device	dmoverio		# /dev/dmover dm
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options 	VERIFIED_EXEC_FP_RMD160
 #options 	VERIFIED_EXEC_FP_SHA256
 #options 	VERIFIED_EXEC_FP_SHA384
 #options 	VERIFIED_EXEC_FP_SHA512
-#options 	VERIFIED_EXEC_FP_SHA1
-#options 	VERIFIED_EXEC_FP_MD5
 
 #options 	PAX_MPROTECT=0		# PaX mprotect(2) restrictions
 #options 	PAX_ASLR=0		# PaX Address Space Layout Randomization

Index: src/sys/arch/evbarm/conf/OVERO
diff -u src/sys/arch/evbarm/conf/OVERO:1.48 src/sys/arch/evbarm/conf/OVERO:1.49
--- src/sys/arch/evbarm/conf/OVERO:1.48	Sat Jul 29 18:08:57 2017
+++ src/sys/arch/evbarm/conf/OVERO	Wed Sep 13 22:24:43 2017
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: OVERO,v 1.48 2017/07/29 18:08:57 maxv Exp $
+#	$NetBSD: OVERO,v 1.49 2017/09/13 22:24:43 sevan Exp $
 #
 #	OVERO -- Gumstix. Inc. Overo COMS platforms kernel
 #
@@ -382,12 +382,9 @@ pseudo-device	drvctl
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options 	VERIFIED_EXEC_FP_RMD160
 #options 	VERIFIED_EXEC_FP_SHA256
 #options 	VERIFIED_EXEC_FP_SHA384
 #options 	VERIFIED_EXEC_FP_SHA512
-#options 	VERIFIED_EXEC_FP_SHA1
-#options 	VERIFIED_EXEC_FP_MD5
 
 #options 	PAX_MPROTECT=0		# PaX mprotect(2) restrictions
 #options 	PAX_ASLR=0		# PaX Address Space Layout Randomization

Index: src/sys/arch/evbarm/conf/PEPPER
diff -u src/sys/arch/evbarm/conf/PEPPER:1.5 src/sys/arch/evbarm/conf/PEPPER:1.6
--- src/sys/arch/evbarm/conf/PEPPER:1.5	Sat Jul 29 18:08:57 2017
+++ src/sys/arch/evbarm/conf/PEPPER	Wed Sep 13 22:24:43 2017
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: PEPPER,v 1.5 2017/07/29 18:08:57 maxv Exp $
+#	$NetBSD: PEPPER,v 1.6 2017/09/13 22:24:43 sevan Exp $
 #
 #	PEPPER -- Gumstix. Inc. Pepper Single Board Computer platforms kernel
 #
@@ -390,12 +390,9 @@ pseudo-device	drvctl
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options 	VERIFIED_EXEC_FP_RMD160
 #options 	VERIFIED_EXEC_FP_SHA256
 #options 	VERIFIED_EXEC_FP_SHA384
 #options 	VERIFIED_EXEC_FP_SHA512
-#options 	VERIFIED_EXEC_FP_SHA1
-#options 	VERIFIED_EXEC_FP_MD5
 
 #options 	PAX_MPROTECT=0		# PaX mprotect(2) restrictions
 #options 	PAX_ASLR=0		# PaX Address Space Layout Randomization

Index: src/sys/arch/evbarm/conf/SHEEVAPLUG
diff -u src/sys/arch/evbarm/conf/SHEEVAPLUG:1.56 src/sys/arch/evbarm/conf/SHEEVAPLUG:1.57
--- src/sys/arch/evbarm/conf/SHEEVAPLUG:1.56	Sat Jul 29 18:08:57 2017
+++ src/sys/arch/evbarm/conf/SHEEVAPLUG	Wed Sep 13 22:24:43 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: SHEEVAPLUG,v 1.56 2017/07/29 18:08:57 maxv Exp $
+#	$NetBSD: SHEEVAPLUG,v 1.57 2017/09/13 22:24:43 sevan Exp $
 #
 #  This configuration supports for generically Marvell SheevaPlug
 #
@@ -519,12 +519,9 @@ pseudo-device	dmoverio		# /dev/dmover dm
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options 	VERIFIED_EXEC_FP_RMD160
 #options 	VERIFIED_EXEC_FP_SHA256
 #options 	VERIFIED_EXEC_FP_SHA384
 #options 	VERIFIED_EXEC_FP_SHA512
-#options 	VERIFIED_EXEC_FP_SHA1
-#options 	VERIFIED_EXEC_FP_MD5
 
 #options 	PAX_MPROTECT=0		# PaX mprotect(2) restrictions
 #options 	PAX_ASLR=0		# PaX Address Space Layout Randomization

Index: src/sys/arch/evbarm64/conf/A64EMUL
diff -u src/sys/arch/evbarm64/conf/A64EMUL:1.8 src/sys/arch/evbarm64/conf/A64EMUL:1.9
--- src/sys/arch/evbarm64/conf/A64EMUL:1.8	Sat Jul 29 18:08:57 2017
+++ src/sys/arch/evbarm64/conf/A64EMUL	Wed Sep 13 22:24:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: A64EMUL,v 1.8 2017/07/29 18:08:57 maxv Exp $
+# $NetBSD: A64EMUL,v 1.9 2017/09/13 22:24:43 sevan Exp $
 #
 # This machine description file is used to generate the default NetBSD
 # kernel.
@@ -19,7 +19,7 @@ include 	"arch/evbarm64/conf/std.a64emul
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-ident		"A64EMUL-$Revision: 1.8 $"
+ident		"A64EMUL-$Revision: 1.9 $"
 
 maxusers 32
 
@@ -260,12 +260,9 @@ pseudo-device	putter			# for puffs and p
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options 	VERIFIED_EXEC_FP_RMD160
 #options 	VERIFIED_EXEC_FP_SHA256
 #options 	VERIFIED_EXEC_FP_SHA384
 #options 	VERIFIED_EXEC_FP_SHA512
-#options 	VERIFIED_EXEC_FP_SHA1
-#options 	VERIFIED_EXEC_FP_MD5
 
 #options PAX_MPROTECT=0			# PaX mprotect(2) restrictions
 #options PAX_ASLR=0			# PaX Address Space Layout Randomization

Index: src/sys/arch/evbmips/conf/GDIUM
diff -u src/sys/arch/evbmips/conf/GDIUM:1.27 src/sys/arch/evbmips/conf/GDIUM:1.28
--- src/sys/arch/evbmips/conf/GDIUM:1.27	Sun Feb 19 07:47:00 2017
+++ src/sys/arch/evbmips/conf/GDIUM	Wed Sep 13 22:24:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GDIUM,v 1.27 2017/02/19 07:47:00 rin Exp $
+# $NetBSD: GDIUM,v 1.28 2017/09/13 22:24:43 sevan Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/evbmips/conf/std.gdium"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GDIUM-$Revision: 1.27 $"
+#ident 		"GDIUM-$Revision: 1.28 $"
 
 maxusers	16
 
@@ -289,9 +289,6 @@ pseudo-device	ksyms			# /dev/ksyms
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/evbmips/conf/LOONGSON
diff -u src/sys/arch/evbmips/conf/LOONGSON:1.33 src/sys/arch/evbmips/conf/LOONGSON:1.34
--- src/sys/arch/evbmips/conf/LOONGSON:1.33	Sun Aug 20 09:00:15 2017
+++ src/sys/arch/evbmips/conf/LOONGSON	Wed Sep 13 22:24:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: LOONGSON,v 1.33 2017/08/20 09:00:15 maya Exp $
+# $NetBSD: LOONGSON,v 1.34 2017/09/13 22:24:43 sevan Exp $
 #
 # LOONGSON machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/evbmips/conf/std.loongson
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"LOONGSON-$Revision: 1.33 $"
+#ident 		"LOONGSON-$Revision: 1.34 $"
 
 maxusers	16
 
@@ -372,9 +372,6 @@ pseudo-device	drvctl			# driver control
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/evbmips/conf/SBMIPS
diff -u src/sys/arch/evbmips/conf/SBMIPS:1.3 src/sys/arch/evbmips/conf/SBMIPS:1.4
--- src/sys/arch/evbmips/conf/SBMIPS:1.3	Sat Jul 29 18:08:57 2017
+++ src/sys/arch/evbmips/conf/SBMIPS	Wed Sep 13 22:24:43 2017
@@ -1,10 +1,10 @@
-# $NetBSD: SBMIPS,v 1.3 2017/07/29 18:08:57 maxv Exp $
+# $NetBSD: SBMIPS,v 1.4 2017/09/13 22:24:43 sevan Exp $
 
 include 	"arch/evbmips/conf/std.sbmips"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.3 $"
+#ident 		"GENERIC-$Revision: 1.4 $"
 
 #options 	LOCKDEBUG	# XXX XXX XXX XXX
 #options 	DEBUG		# extra kernel debugging support
@@ -231,9 +231,6 @@ pseudo-device	ksyms			# /dev/ksyms
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/ews4800mips/conf/GENERIC
diff -u src/sys/arch/ews4800mips/conf/GENERIC:1.53 src/sys/arch/ews4800mips/conf/GENERIC:1.54
--- src/sys/arch/ews4800mips/conf/GENERIC:1.53	Sat Jul 29 18:08:57 2017
+++ src/sys/arch/ews4800mips/conf/GENERIC	Wed Sep 13 22:24:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.53 2017/07/29 18:08:57 maxv Exp $
+# $NetBSD: GENERIC,v 1.54 2017/09/13 22:24:43 sevan Exp $
 #
 # GENERIC machine description file
 # This machine description file is used to generate the default NetBSD
@@ -25,7 +25,7 @@ include 	"arch/ews4800mips/conf/std.ews4
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.53 $"
+#ident		"GENERIC-$Revision: 1.54 $"
 
 maxusers	16
 
@@ -296,9 +296,6 @@ pseudo-device	wsmux
 # Uncomment the fingerprint methods below that are desired. Note that
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
-#options 	VERIFIED_EXEC_FP_RMD160
 #options 	VERIFIED_EXEC_FP_SHA256
 #options 	VERIFIED_EXEC_FP_SHA384
 #options 	VERIFIED_EXEC_FP_SHA512
-#options 	VERIFIED_EXEC_FP_SHA1
-#options 	VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/hp300/conf/GENERIC
diff -u src/sys/arch/hp300/conf/GENERIC:1.195 src/sys/arch/hp300/conf/GENERIC:1.196
--- src/sys/arch/hp300/conf/GENERIC:1.195	Fri Jul 28 19:26:16 2017
+++ src/sys/arch/hp300/conf/GENERIC	Wed Sep 13 22:24:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.195 2017/07/28 19:26:16 maxv Exp $
+# $NetBSD: GENERIC,v 1.196 2017/09/13 22:24:43 sevan Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/hp300/conf/std.hp300"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.195 $"
+#ident 		"GENERIC-$Revision: 1.196 $"
 
 makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
 
@@ -354,9 +354,6 @@ pseudo-device	wsfont
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options 	VERIFIED_EXEC_FP_RMD160
 #options 	VERIFIED_EXEC_FP_SHA256
 #options 	VERIFIED_EXEC_FP_SHA384
 #options 	VERIFIED_EXEC_FP_SHA512
-#options 	VERIFIED_EXEC_FP_SHA1
-#options 	VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/hpcmips/conf/GENERIC
diff -u src/sys/arch/hpcmips/conf/GENERIC:1.233 src/sys/arch/hpcmips/conf/GENERIC:1.234
--- src/sys/arch/hpcmips/conf/GENERIC:1.233	Tue Dec 13 20:42:18 2016
+++ src/sys/arch/hpcmips/conf/GENERIC	Wed Sep 13 22:24:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.233 2016/12/13 20:42:18 christos Exp $
+# $NetBSD: GENERIC,v 1.234 2017/09/13 22:24:43 sevan Exp $
 #
 # GENERIC machine description file
 # 
@@ -24,7 +24,7 @@ include		"arch/hpcmips/conf/std.hpcmips.
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.233 $"
+#ident 		"GENERIC-$Revision: 1.234 $"
 
 maxusers	16
 
@@ -719,9 +719,6 @@ pseudo-device	ksyms			# /dev/ksyms
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/hpcsh/conf/GENERIC
diff -u src/sys/arch/hpcsh/conf/GENERIC:1.107 src/sys/arch/hpcsh/conf/GENERIC:1.108
--- src/sys/arch/hpcsh/conf/GENERIC:1.107	Sat Aug  8 06:36:25 2015
+++ src/sys/arch/hpcsh/conf/GENERIC	Wed Sep 13 22:24:43 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.107 2015/08/08 06:36:25 maxv Exp $
+# $NetBSD: GENERIC,v 1.108 2017/09/13 22:24:43 sevan Exp $
 #
 # GENERIC machine description file
 #
@@ -392,9 +392,6 @@ pseudo-device	wsmux			# mouse & keyboard
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/hppa/conf/GENERIC
diff -u src/sys/arch/hppa/conf/GENERIC:1.13 src/sys/arch/hppa/conf/GENERIC:1.14
--- src/sys/arch/hppa/conf/GENERIC:1.13	Sat Jul 29 18:08:58 2017
+++ src/sys/arch/hppa/conf/GENERIC	Wed Sep 13 22:24:44 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.13 2017/07/29 18:08:58 maxv Exp $
+# $NetBSD: GENERIC,v 1.14 2017/09/13 22:24:44 sevan Exp $
 #
 # GENERIC machine description file
 #
@@ -23,7 +23,7 @@ include 	"arch/hppa/conf/std.hppa"
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 options 	SYSCTL_INCLUDE_DESCR	# Include sysctl descriptions in kernel
 
-#ident 		"GENERIC-$Revision: 1.13 $"
+#ident 		"GENERIC-$Revision: 1.14 $"
 
 maxusers	32		# estimated number of users
 
@@ -787,9 +787,6 @@ pseudo-device	drvctl
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.428 src/sys/arch/i386/conf/ALL:1.429
--- src/sys/arch/i386/conf/ALL:1.428	Wed Aug 30 15:44:01 2017
+++ src/sys/arch/i386/conf/ALL	Wed Sep 13 22:24:44 2017
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.428 2017/08/30 15:44:01 maxv Exp $
+# $NetBSD: ALL,v 1.429 2017/09/13 22:24:44 sevan Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"ALL-$Revision: 1.428 $"
+#ident		"ALL-$Revision: 1.429 $"
 
 maxusers	64		# estimated number of users
 
@@ -1840,12 +1840,9 @@ pseudo-device	veriexec
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-options 	VERIFIED_EXEC_FP_RMD160
 options 	VERIFIED_EXEC_FP_SHA256
 options 	VERIFIED_EXEC_FP_SHA384
 options 	VERIFIED_EXEC_FP_SHA512
-options 	VERIFIED_EXEC_FP_SHA1
-options 	VERIFIED_EXEC_FP_MD5
 
 options 	PAX_MPROTECT=0		# PaX mprotect(2) restrictions
 options 	PAX_ASLR=0		# PaX Address Space Layout Randomization

Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.1166 src/sys/arch/i386/conf/GENERIC:1.1167
--- src/sys/arch/i386/conf/GENERIC:1.1166	Sun Aug 13 08:48:30 2017
+++ src/sys/arch/i386/conf/GENERIC	Wed Sep 13 22:24:44 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1166 2017/08/13 08:48:30 christos Exp $
+# $NetBSD: GENERIC,v 1.1167 2017/09/13 22:24:44 sevan Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.1166 $"
+#ident		"GENERIC-$Revision: 1.1167 $"
 
 maxusers	64		# estimated number of users
 
@@ -1723,12 +1723,9 @@ pseudo-device	veriexec
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-options 	VERIFIED_EXEC_FP_RMD160
 options 	VERIFIED_EXEC_FP_SHA256
 options 	VERIFIED_EXEC_FP_SHA384
 options 	VERIFIED_EXEC_FP_SHA512
-options 	VERIFIED_EXEC_FP_SHA1
-options 	VERIFIED_EXEC_FP_MD5
 
 options 	PAX_ASLR_DEBUG=1	# PaX ASLR debug
 options 	PAX_SEGVGUARD=0		# PaX Segmentation fault guard

Index: src/sys/arch/ibmnws/conf/GENERIC
diff -u src/sys/arch/ibmnws/conf/GENERIC:1.50 src/sys/arch/ibmnws/conf/GENERIC:1.51
--- src/sys/arch/ibmnws/conf/GENERIC:1.50	Sun Feb 19 07:47:01 2017
+++ src/sys/arch/ibmnws/conf/GENERIC	Wed Sep 13 22:24:44 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.50 2017/02/19 07:47:01 rin Exp $
+#	$NetBSD: GENERIC,v 1.51 2017/09/13 22:24:44 sevan Exp $
 #
 #
 
@@ -307,9 +307,6 @@ pseudo-device	clockctl
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/iyonix/conf/GENERIC
diff -u src/sys/arch/iyonix/conf/GENERIC:1.94 src/sys/arch/iyonix/conf/GENERIC:1.95
--- src/sys/arch/iyonix/conf/GENERIC:1.94	Sat Jul 29 18:08:58 2017
+++ src/sys/arch/iyonix/conf/GENERIC	Wed Sep 13 22:24:44 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.94 2017/07/29 18:08:58 maxv Exp $
+#	$NetBSD: GENERIC,v 1.95 2017/09/13 22:24:44 sevan Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include	"arch/iyonix/conf/std.iyonix"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.94 $"
+#ident 		"GENERIC-$Revision: 1.95 $"
 
 maxusers	32		# estimated number of users
 
@@ -858,11 +858,8 @@ pseudo-device	wsfont
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5
 
 #options PAX_MPROTECT=0			# PaX mprotect(2) restrictions

Index: src/sys/arch/landisk/conf/GENERIC
diff -u src/sys/arch/landisk/conf/GENERIC:1.55 src/sys/arch/landisk/conf/GENERIC:1.56
--- src/sys/arch/landisk/conf/GENERIC:1.55	Sat Jul 29 18:08:58 2017
+++ src/sys/arch/landisk/conf/GENERIC	Wed Sep 13 22:24:44 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.55 2017/07/29 18:08:58 maxv Exp $
+# $NetBSD: GENERIC,v 1.56 2017/09/13 22:24:44 sevan Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include		"arch/landisk/conf/std.landisk"
 
 options         INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident          "GENERIC-$Revision: 1.55 $"
+#ident          "GENERIC-$Revision: 1.56 $"
 
 maxusers	16		# estimated number of users
 
@@ -489,12 +489,9 @@ pseudo-device	veriexec
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-options 	VERIFIED_EXEC_FP_RMD160
 options 	VERIFIED_EXEC_FP_SHA256
 options 	VERIFIED_EXEC_FP_SHA384
 options 	VERIFIED_EXEC_FP_SHA512
-options 	VERIFIED_EXEC_FP_SHA1
-options 	VERIFIED_EXEC_FP_MD5
 
 options 	PAX_ASLR_DEBUG=1	# PaX ASLR debug
 options 	PAX_SEGVGUARD=0		# PaX Segmentation fault guard

Index: src/sys/arch/luna68k/conf/GENERIC
diff -u src/sys/arch/luna68k/conf/GENERIC:1.122 src/sys/arch/luna68k/conf/GENERIC:1.123
--- src/sys/arch/luna68k/conf/GENERIC:1.122	Sat Jul 29 18:08:58 2017
+++ src/sys/arch/luna68k/conf/GENERIC	Wed Sep 13 22:24:44 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.122 2017/07/29 18:08:58 maxv Exp $
+# $NetBSD: GENERIC,v 1.123 2017/09/13 22:24:44 sevan Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/luna68k/conf/std.luna68k"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.122 $"
+#ident 		"GENERIC-$Revision: 1.123 $"
 
 makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
 
@@ -227,9 +227,6 @@ pseudo-device	wsmux			# mouse & keyboard
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/luna68k/conf/INSTALL
diff -u src/sys/arch/luna68k/conf/INSTALL:1.22 src/sys/arch/luna68k/conf/INSTALL:1.23
--- src/sys/arch/luna68k/conf/INSTALL:1.22	Sat Jul 29 18:08:58 2017
+++ src/sys/arch/luna68k/conf/INSTALL	Wed Sep 13 22:24:44 2017
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.22 2017/07/29 18:08:58 maxv Exp $
+# $NetBSD: INSTALL,v 1.23 2017/09/13 22:24:44 sevan Exp $
 #
 # config for installation ramdisk kernel
 # 
@@ -201,9 +201,6 @@ pseudo-device	pty			# pseudo-terminals
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/mac68k/conf/GENERIC
diff -u src/sys/arch/mac68k/conf/GENERIC:1.222 src/sys/arch/mac68k/conf/GENERIC:1.223
--- src/sys/arch/mac68k/conf/GENERIC:1.222	Sat Jul 29 18:08:58 2017
+++ src/sys/arch/mac68k/conf/GENERIC	Wed Sep 13 22:24:44 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.222 2017/07/29 18:08:58 maxv Exp $
+# $NetBSD: GENERIC,v 1.223 2017/09/13 22:24:44 sevan Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/mac68k/conf/std.mac68k"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.222 $"
+#ident 		"GENERIC-$Revision: 1.223 $"
 
 makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
 
@@ -369,9 +369,6 @@ pseudo-device	ksyms			# /dev/ksyms
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/macppc/conf/GENERIC
diff -u src/sys/arch/macppc/conf/GENERIC:1.332 src/sys/arch/macppc/conf/GENERIC:1.333
--- src/sys/arch/macppc/conf/GENERIC:1.332	Fri Sep  1 20:58:14 2017
+++ src/sys/arch/macppc/conf/GENERIC	Wed Sep 13 22:24:44 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.332 2017/09/01 20:58:14 macallan Exp $
+# $NetBSD: GENERIC,v 1.333 2017/09/13 22:24:44 sevan Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/macppc/conf/std.macppc"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.332 $"
+#ident 		"GENERIC-$Revision: 1.333 $"
 
 maxusers	32
 
@@ -667,11 +667,8 @@ pseudo-device   drvctl
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5
 
 #options PAX_MPROTECT=0			# PaX mprotect(2) restrictions

Index: src/sys/arch/macppc/conf/GENERIC_601
diff -u src/sys/arch/macppc/conf/GENERIC_601:1.13 src/sys/arch/macppc/conf/GENERIC_601:1.14
--- src/sys/arch/macppc/conf/GENERIC_601:1.13	Sat Jul 29 18:08:58 2017
+++ src/sys/arch/macppc/conf/GENERIC_601	Wed Sep 13 22:24:44 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_601,v 1.13 2017/07/29 18:08:58 maxv Exp $
+# $NetBSD: GENERIC_601,v 1.14 2017/09/13 22:24:44 sevan Exp $
 #
 # GENERIC machine description file
 # 
@@ -28,7 +28,7 @@ include		"arch/macppc/conf/std.macppc.60
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-ident 		"GENERIC-$Revision: 1.13 $"
+ident 		"GENERIC-$Revision: 1.14 $"
 
 maxusers	32
 
@@ -377,11 +377,8 @@ pseudo-device   drvctl
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5
 
 #options PAX_MPROTECT=0			# PaX mprotect(2) restrictions

Index: src/sys/arch/mipsco/conf/GENERIC
diff -u src/sys/arch/mipsco/conf/GENERIC:1.89 src/sys/arch/mipsco/conf/GENERIC:1.90
--- src/sys/arch/mipsco/conf/GENERIC:1.89	Fri Jul 28 19:26:16 2017
+++ src/sys/arch/mipsco/conf/GENERIC	Wed Sep 13 22:24:44 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.89 2017/07/28 19:26:16 maxv Exp $
+# $NetBSD: GENERIC,v 1.90 2017/09/13 22:24:44 sevan Exp $
 #
 # GENERIC machine description file
 # 
@@ -208,9 +208,6 @@ pseudo-device	ksyms			# /dev/ksyms
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/mmeye/conf/GENERIC
diff -u src/sys/arch/mmeye/conf/GENERIC:1.122 src/sys/arch/mmeye/conf/GENERIC:1.123
--- src/sys/arch/mmeye/conf/GENERIC:1.122	Sat Jul 29 18:08:58 2017
+++ src/sys/arch/mmeye/conf/GENERIC	Wed Sep 13 22:24:44 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.122 2017/07/29 18:08:58 maxv Exp $
+# $NetBSD: GENERIC,v 1.123 2017/09/13 22:24:44 sevan Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/mmeye/conf/std.mmeye"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.122 $"
+#ident 		"GENERIC-$Revision: 1.123 $"
 
 maxusers	16		# estimated number of users
 
@@ -246,9 +246,6 @@ pseudo-device	putter			# for puffs and p
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/mmeye/conf/MMEYE_WLF
diff -u src/sys/arch/mmeye/conf/MMEYE_WLF:1.21 src/sys/arch/mmeye/conf/MMEYE_WLF:1.22
--- src/sys/arch/mmeye/conf/MMEYE_WLF:1.21	Sat Jul 29 18:08:58 2017
+++ src/sys/arch/mmeye/conf/MMEYE_WLF	Wed Sep 13 22:24:44 2017
@@ -1,4 +1,4 @@
-# $NetBSD: MMEYE_WLF,v 1.21 2017/07/29 18:08:58 maxv Exp $
+# $NetBSD: MMEYE_WLF,v 1.22 2017/09/13 22:24:44 sevan Exp $
 #
 # MMEYE_WLF -- Brains Inc. MMEYE-WLF platforms kernel
 #
@@ -22,7 +22,7 @@ include 	"arch/mmeye/conf/std.mmeye"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.21 $"
+#ident 		"GENERIC-$Revision: 1.22 $"
 
 maxusers	16		# estimated number of users
 
@@ -285,9 +285,6 @@ pseudo-device	btuart			# Bluetooth HCI U
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/mvme68k/conf/GENERIC
diff -u src/sys/arch/mvme68k/conf/GENERIC:1.95 src/sys/arch/mvme68k/conf/GENERIC:1.96
--- src/sys/arch/mvme68k/conf/GENERIC:1.95	Sat Jul 29 18:08:58 2017
+++ src/sys/arch/mvme68k/conf/GENERIC	Wed Sep 13 22:24:44 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.95 2017/07/29 18:08:58 maxv Exp $
+# $NetBSD: GENERIC,v 1.96 2017/09/13 22:24:44 sevan Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/mvme68k/conf/std.mvme68k"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.95 $"
+#ident 		"GENERIC-$Revision: 1.96 $"
 
 makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
 
@@ -167,12 +167,9 @@ pseudo-device	ksyms			# /dev/ksyms
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5
 
 mainbus0	at root
 

Index: src/sys/arch/netwinder/conf/GENERIC
diff -u src/sys/arch/netwinder/conf/GENERIC:1.131 src/sys/arch/netwinder/conf/GENERIC:1.132
--- src/sys/arch/netwinder/conf/GENERIC:1.131	Sat Jul 29 18:08:58 2017
+++ src/sys/arch/netwinder/conf/GENERIC	Wed Sep 13 22:24:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.131 2017/07/29 18:08:58 maxv Exp $
+# $NetBSD: GENERIC,v 1.132 2017/09/13 22:24:45 sevan Exp $
 #
 # GENERIC machine description file
 # 
@@ -320,9 +320,6 @@ pseudo-device	wsmux			# mouse & keyboard
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/news68k/conf/GENERIC
diff -u src/sys/arch/news68k/conf/GENERIC:1.127 src/sys/arch/news68k/conf/GENERIC:1.128
--- src/sys/arch/news68k/conf/GENERIC:1.127	Sat Jul 29 18:08:58 2017
+++ src/sys/arch/news68k/conf/GENERIC	Wed Sep 13 22:24:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.127 2017/07/29 18:08:58 maxv Exp $
+# $NetBSD: GENERIC,v 1.128 2017/09/13 22:24:45 sevan Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include		"arch/news68k/conf/std.news68k"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.127 $"
+#ident 		"GENERIC-$Revision: 1.128 $"
 
 makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
 
@@ -278,9 +278,6 @@ pseudo-device	putter			# for puffs and p
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options 	VERIFIED_EXEC_FP_RMD160
 #options 	VERIFIED_EXEC_FP_SHA256
 #options 	VERIFIED_EXEC_FP_SHA384
 #options 	VERIFIED_EXEC_FP_SHA512
-#options 	VERIFIED_EXEC_FP_SHA1
-#options 	VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/newsmips/conf/GENERIC
diff -u src/sys/arch/newsmips/conf/GENERIC:1.130 src/sys/arch/newsmips/conf/GENERIC:1.131
--- src/sys/arch/newsmips/conf/GENERIC:1.130	Fri Jul 28 19:26:16 2017
+++ src/sys/arch/newsmips/conf/GENERIC	Wed Sep 13 22:24:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.130 2017/07/28 19:26:16 maxv Exp $
+# $NetBSD: GENERIC,v 1.131 2017/09/13 22:24:45 sevan Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/newsmips/conf/std.newsmip
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.130 $"
+#ident 		"GENERIC-$Revision: 1.131 $"
 
 maxusers	16
 
@@ -249,9 +249,6 @@ pseudo-device	putter			# for puffs and p
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/next68k/conf/GENERIC
diff -u src/sys/arch/next68k/conf/GENERIC:1.142 src/sys/arch/next68k/conf/GENERIC:1.143
--- src/sys/arch/next68k/conf/GENERIC:1.142	Sat Jul 29 18:08:59 2017
+++ src/sys/arch/next68k/conf/GENERIC	Wed Sep 13 22:24:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.142 2017/07/29 18:08:59 maxv Exp $
+# $NetBSD: GENERIC,v 1.143 2017/09/13 22:24:45 sevan Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include 	"arch/next68k/conf/std.next68k"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.142 $"
+#ident 		"GENERIC-$Revision: 1.143 $"
 
 makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
 
@@ -286,9 +286,6 @@ pseudo-device	putter			# for puffs and p
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/ofppc/conf/GENERIC
diff -u src/sys/arch/ofppc/conf/GENERIC:1.163 src/sys/arch/ofppc/conf/GENERIC:1.164
--- src/sys/arch/ofppc/conf/GENERIC:1.163	Sat Jul 29 18:08:59 2017
+++ src/sys/arch/ofppc/conf/GENERIC	Wed Sep 13 22:24:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.163 2017/07/29 18:08:59 maxv Exp $
+# $NetBSD: GENERIC,v 1.164 2017/09/13 22:24:45 sevan Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include 	"arch/ofppc/conf/std.ofppc"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.163 $"
+#ident 		"GENERIC-$Revision: 1.164 $"
 
 maxusers	32
 
@@ -467,9 +467,6 @@ pseudo-device	drvctl
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/playstation2/conf/GENERIC
diff -u src/sys/arch/playstation2/conf/GENERIC:1.10 src/sys/arch/playstation2/conf/GENERIC:1.11
--- src/sys/arch/playstation2/conf/GENERIC:1.10	Mon Mar 31 11:25:49 2014
+++ src/sys/arch/playstation2/conf/GENERIC	Wed Sep 13 22:24:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.10 2014/03/31 11:25:49 martin Exp $
+# $NetBSD: GENERIC,v 1.11 2017/09/13 22:24:45 sevan Exp $
 #
 # GENERIC machine description file
 # 
@@ -50,9 +50,6 @@ config		netbsd		root on ? type ?
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/pmax/conf/GENERIC
diff -u src/sys/arch/pmax/conf/GENERIC:1.192 src/sys/arch/pmax/conf/GENERIC:1.193
--- src/sys/arch/pmax/conf/GENERIC:1.192	Sun Aug  6 11:50:21 2017
+++ src/sys/arch/pmax/conf/GENERIC	Wed Sep 13 22:24:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.192 2017/08/06 11:50:21 christos Exp $
+# $NetBSD: GENERIC,v 1.193 2017/09/13 22:24:45 sevan Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/pmax/conf/std.pmax"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.192 $"
+#ident		"GENERIC-$Revision: 1.193 $"
 
 maxusers	64
 
@@ -335,12 +335,9 @@ pseudo-device	veriexec
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-options 	VERIFIED_EXEC_FP_RMD160
 options 	VERIFIED_EXEC_FP_SHA256
 options 	VERIFIED_EXEC_FP_SHA384
 options 	VERIFIED_EXEC_FP_SHA512
-options 	VERIFIED_EXEC_FP_SHA1
-options 	VERIFIED_EXEC_FP_MD5
 
 options 	PAX_ASLR_DEBUG=1	# PaX ASLR debug
 options 	PAX_SEGVGUARD=0		# PaX Segmentation fault guard

Index: src/sys/arch/pmax/conf/GENERIC64
diff -u src/sys/arch/pmax/conf/GENERIC64:1.25 src/sys/arch/pmax/conf/GENERIC64:1.26
--- src/sys/arch/pmax/conf/GENERIC64:1.25	Fri Jul 28 19:26:16 2017
+++ src/sys/arch/pmax/conf/GENERIC64	Wed Sep 13 22:24:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC64,v 1.25 2017/07/28 19:26:16 maxv Exp $
+# $NetBSD: GENERIC64,v 1.26 2017/09/13 22:24:45 sevan Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/pmax/conf/std.pmax64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.25 $"
+#ident		"GENERIC-$Revision: 1.26 $"
 
 maxusers	64
 
@@ -312,9 +312,6 @@ pseudo-device	wsmux			# wsmux control de
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/prep/conf/GENERIC
diff -u src/sys/arch/prep/conf/GENERIC:1.182 src/sys/arch/prep/conf/GENERIC:1.183
--- src/sys/arch/prep/conf/GENERIC:1.182	Fri Jul 28 19:26:16 2017
+++ src/sys/arch/prep/conf/GENERIC	Wed Sep 13 22:24:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.182 2017/07/28 19:26:16 maxv Exp $
+# $NetBSD: GENERIC,v 1.183 2017/09/13 22:24:45 sevan Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/prep/conf/std.prep"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.182 $"
+#ident		"GENERIC-$Revision: 1.183 $"
 
 maxusers	32
 
@@ -597,9 +597,6 @@ pseudo-device	veriexec
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-options VERIFIED_EXEC_FP_RMD160
 options VERIFIED_EXEC_FP_SHA256
 options VERIFIED_EXEC_FP_SHA384
 options VERIFIED_EXEC_FP_SHA512
-options VERIFIED_EXEC_FP_SHA1
-options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/rs6000/conf/GENERIC
diff -u src/sys/arch/rs6000/conf/GENERIC:1.36 src/sys/arch/rs6000/conf/GENERIC:1.37
--- src/sys/arch/rs6000/conf/GENERIC:1.36	Sat Jul 29 18:08:59 2017
+++ src/sys/arch/rs6000/conf/GENERIC	Wed Sep 13 22:24:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.36 2017/07/29 18:08:59 maxv Exp $
+# $NetBSD: GENERIC,v 1.37 2017/09/13 22:24:45 sevan Exp $
 #
 # GENERIC machine description file
 # 
@@ -24,7 +24,7 @@ options 	INCLUDE_CONFIG_FILE	# embed con
 
 #makeoptions	COPTS="-O2 -mno-powerpc -mno-power"	# wheeee
 
-#ident		"GENERIC-$Revision: 1.36 $"
+#ident		"GENERIC-$Revision: 1.37 $"
 
 maxusers	32
 
@@ -278,9 +278,6 @@ pseudo-device	wsfont
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/sandpoint/conf/GENERIC
diff -u src/sys/arch/sandpoint/conf/GENERIC:1.94 src/sys/arch/sandpoint/conf/GENERIC:1.95
--- src/sys/arch/sandpoint/conf/GENERIC:1.94	Sat Jul 29 18:08:59 2017
+++ src/sys/arch/sandpoint/conf/GENERIC	Wed Sep 13 22:24:45 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.94 2017/07/29 18:08:59 maxv Exp $
+# $NetBSD: GENERIC,v 1.95 2017/09/13 22:24:45 sevan Exp $
 #
 # machine description file for GENERIC NAS
 # 
@@ -22,7 +22,7 @@ include 	"arch/sandpoint/conf/std.sandpo
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.94 $"
+#ident 		"GENERIC-$Revision: 1.95 $"
 
 maxusers	32
 
@@ -365,12 +365,9 @@ pseudo-device	drvctl
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options 	VERIFIED_EXEC_FP_RMD160
 #options 	VERIFIED_EXEC_FP_SHA256
 #options 	VERIFIED_EXEC_FP_SHA384
 #options 	VERIFIED_EXEC_FP_SHA512
-#options 	VERIFIED_EXEC_FP_SHA1
-#options 	VERIFIED_EXEC_FP_MD5
 
 #options 	PAX_MPROTECT=0		# PaX mprotect(2) restrictions
 #options 	PAX_ASLR=0		# PaX Address Space Layout Randomization

Index: src/sys/arch/sbmips/conf/GENERIC
diff -u src/sys/arch/sbmips/conf/GENERIC:1.103 src/sys/arch/sbmips/conf/GENERIC:1.104
--- src/sys/arch/sbmips/conf/GENERIC:1.103	Sat Jul 29 18:08:59 2017
+++ src/sys/arch/sbmips/conf/GENERIC	Wed Sep 13 22:24:45 2017
@@ -1,10 +1,10 @@
-# $NetBSD: GENERIC,v 1.103 2017/07/29 18:08:59 maxv Exp $
+# $NetBSD: GENERIC,v 1.104 2017/09/13 22:24:45 sevan Exp $
 
 include 	"arch/sbmips/conf/std.sbmips"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.103 $"
+#ident 		"GENERIC-$Revision: 1.104 $"
 
 #options 	LOCKDEBUG	# XXX XXX XXX XXX
 #options 	DEBUG		# extra kernel debugging support
@@ -231,9 +231,6 @@ pseudo-device	ksyms			# /dev/ksyms
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/sgimips/conf/GENERIC32_IP12
diff -u src/sys/arch/sgimips/conf/GENERIC32_IP12:1.30 src/sys/arch/sgimips/conf/GENERIC32_IP12:1.31
--- src/sys/arch/sgimips/conf/GENERIC32_IP12:1.30	Fri Jul 28 19:26:16 2017
+++ src/sys/arch/sgimips/conf/GENERIC32_IP12	Wed Sep 13 22:24:45 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC32_IP12,v 1.30 2017/07/28 19:26:16 maxv Exp $
+#	$NetBSD: GENERIC32_IP12,v 1.31 2017/09/13 22:24:45 sevan Exp $
 #
 # GENERIC32_IP12 machine description file
 # 
@@ -32,7 +32,7 @@ makeoptions	TEXTADDR=0x80002000	# entry 
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC32-IP2x-$Revision: 1.30 $"
+#ident		"GENERIC32-IP2x-$Revision: 1.31 $"
 
 maxusers	32
 
@@ -289,9 +289,6 @@ pseudo-device	wsfont
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/sgimips/conf/GENERIC32_IP2x
diff -u src/sys/arch/sgimips/conf/GENERIC32_IP2x:1.109 src/sys/arch/sgimips/conf/GENERIC32_IP2x:1.110
--- src/sys/arch/sgimips/conf/GENERIC32_IP2x:1.109	Fri Jul 28 19:26:16 2017
+++ src/sys/arch/sgimips/conf/GENERIC32_IP2x	Wed Sep 13 22:24:45 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC32_IP2x,v 1.109 2017/07/28 19:26:16 maxv Exp $
+#	$NetBSD: GENERIC32_IP2x,v 1.110 2017/09/13 22:24:45 sevan Exp $
 #
 # GENERIC32_IP2x machine description file
 # 
@@ -29,7 +29,7 @@ makeoptions	TEXTADDR=0x88069000	# entry 
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC32-IP2x-$Revision: 1.109 $"
+#ident		"GENERIC32-IP2x-$Revision: 1.110 $"
 
 maxusers	32
 
@@ -337,9 +337,6 @@ pseudo-device	vcoda			# coda minicache <
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/sgimips/conf/GENERIC32_IP3x
diff -u src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.112 src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.113
--- src/sys/arch/sgimips/conf/GENERIC32_IP3x:1.112	Fri Jul 28 19:26:16 2017
+++ src/sys/arch/sgimips/conf/GENERIC32_IP3x	Wed Sep 13 22:24:45 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC32_IP3x,v 1.112 2017/07/28 19:26:16 maxv Exp $
+#	$NetBSD: GENERIC32_IP3x,v 1.113 2017/09/13 22:24:45 sevan Exp $
 #
 # GENERIC32_IP3x machine description file
 # 
@@ -28,7 +28,7 @@ makeoptions	TEXTADDR="0x80069000"	# entr
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC32_IP3x-$Revision: 1.112 $"
+#ident		"GENERIC32_IP3x-$Revision: 1.113 $"
 
 maxusers	32
 
@@ -483,9 +483,6 @@ pseudo-device	vcoda			# coda minicache <
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/shark/conf/GENERIC
diff -u src/sys/arch/shark/conf/GENERIC:1.128 src/sys/arch/shark/conf/GENERIC:1.129
--- src/sys/arch/shark/conf/GENERIC:1.128	Sat Jul 29 18:08:59 2017
+++ src/sys/arch/shark/conf/GENERIC	Wed Sep 13 22:24:46 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: GENERIC,v 1.128 2017/07/29 18:08:59 maxv Exp $
+#	$NetBSD: GENERIC,v 1.129 2017/09/13 22:24:46 sevan Exp $
 #
 # Generic Shark configuration.
 #
@@ -7,7 +7,7 @@ include	"arch/shark/conf/std.shark"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.128 $"
+#ident		"GENERIC-$Revision: 1.129 $"
 
 # estimated number of users
 maxusers	32
@@ -327,12 +327,9 @@ pseudo-device	putter			# for puffs and p
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5
 
 options PAX_MPROTECT=0			# PaX mprotect(2) restrictions
 options PAX_ASLR=0			# PaX Address Space Layout Randomization

Index: src/sys/arch/sparc/conf/GENERIC
diff -u src/sys/arch/sparc/conf/GENERIC:1.254 src/sys/arch/sparc/conf/GENERIC:1.255
--- src/sys/arch/sparc/conf/GENERIC:1.254	Sun Jul 30 13:12:49 2017
+++ src/sys/arch/sparc/conf/GENERIC	Wed Sep 13 22:24:46 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.254 2017/07/30 13:12:49 maxv Exp $
+# $NetBSD: GENERIC,v 1.255 2017/09/13 22:24:46 sevan Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include 	"arch/sparc/conf/std.sparc"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.254 $"
+#ident 		"GENERIC-$Revision: 1.255 $"
 
 maxusers	32
 
@@ -752,12 +752,9 @@ pseudo-device	putter			# for puffs and p
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5
 
 #options PAX_MPROTECT=0			# PaX mprotect(2) restrictions
 					# (for static binaries only for now)

Index: src/sys/arch/sparc/conf/KRUPS
diff -u src/sys/arch/sparc/conf/KRUPS:1.73 src/sys/arch/sparc/conf/KRUPS:1.74
--- src/sys/arch/sparc/conf/KRUPS:1.73	Sun Jul 30 13:12:49 2017
+++ src/sys/arch/sparc/conf/KRUPS	Wed Sep 13 22:24:46 2017
@@ -1,4 +1,4 @@
-# $NetBSD: KRUPS,v 1.73 2017/07/30 13:12:49 maxv Exp $
+# $NetBSD: KRUPS,v 1.74 2017/09/13 22:24:46 sevan Exp $
 # From: NetBSD: GENERIC,v 1.197 2006/12/04 23:43:35 elad Exp
 #
 # Krups (JavaStation-NC) machine description file
@@ -8,7 +8,7 @@ include 	"arch/sparc/conf/std.sparc"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"KRUPS-$Revision: 1.73 $"
+#ident 		"KRUPS-$Revision: 1.74 $"
 
 maxusers	32
 
@@ -372,12 +372,9 @@ pseudo-device	putter			# for puffs and p
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5
 
 #options PAX_MPROTECT=0			# PaX mprotect(2) restrictions
 					# (for static binaries only for now)

Index: src/sys/arch/sparc64/conf/GENERIC
diff -u src/sys/arch/sparc64/conf/GENERIC:1.200 src/sys/arch/sparc64/conf/GENERIC:1.201
--- src/sys/arch/sparc64/conf/GENERIC:1.200	Sun Jul 30 13:12:49 2017
+++ src/sys/arch/sparc64/conf/GENERIC	Wed Sep 13 22:24:46 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.200 2017/07/30 13:12:49 maxv Exp $
+# $NetBSD: GENERIC,v 1.201 2017/09/13 22:24:46 sevan Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/sparc64/conf/std.sparc64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.200 $"
+#ident		"GENERIC-$Revision: 1.201 $"
 
 maxusers	64
 
@@ -1015,12 +1015,9 @@ pseudo-device	veriexec
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-options 	VERIFIED_EXEC_FP_RMD160
 options 	VERIFIED_EXEC_FP_SHA256
 options 	VERIFIED_EXEC_FP_SHA384
 options 	VERIFIED_EXEC_FP_SHA512
-options 	VERIFIED_EXEC_FP_SHA1
-options 	VERIFIED_EXEC_FP_MD5
 
 # a pseudo device needed for SMBFS
 pseudo-device	nsmb		# experimental - SMB requester

Index: src/sys/arch/sun2/conf/GENERIC
diff -u src/sys/arch/sun2/conf/GENERIC:1.96 src/sys/arch/sun2/conf/GENERIC:1.97
--- src/sys/arch/sun2/conf/GENERIC:1.96	Sat Jul 29 18:08:59 2017
+++ src/sys/arch/sun2/conf/GENERIC	Wed Sep 13 22:24:46 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.96 2017/07/29 18:08:59 maxv Exp $
+# $NetBSD: GENERIC,v 1.97 2017/09/13 22:24:46 sevan Exp $
 #
 # GENERIC machine description file
 # 
@@ -25,7 +25,7 @@ include 	"arch/sun2/conf/std.sun2"
 
 #options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.96 $"
+#ident 		"GENERIC-$Revision: 1.97 $"
 
 makeoptions	COPTS="-Os"	# optimize for size
 
@@ -306,9 +306,6 @@ pseudo-device	ksyms			# /dev/ksyms
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/sun3/conf/GENERIC
diff -u src/sys/arch/sun3/conf/GENERIC:1.173 src/sys/arch/sun3/conf/GENERIC:1.174
--- src/sys/arch/sun3/conf/GENERIC:1.173	Fri Jul 28 19:26:16 2017
+++ src/sys/arch/sun3/conf/GENERIC	Wed Sep 13 22:24:46 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.173 2017/07/28 19:26:16 maxv Exp $
+# $NetBSD: GENERIC,v 1.174 2017/09/13 22:24:46 sevan Exp $
 #
 # GENERIC machine description file
 # 
@@ -25,7 +25,7 @@ include 	"arch/sun3/conf/std.sun3"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC-$Revision: 1.173 $"
+#ident		"GENERIC-$Revision: 1.174 $"
 
 makeoptions	COPTS="-Os"		# bootloader has size limit (~2MB)
 
@@ -309,9 +309,6 @@ pseudo-device	ksyms			# /dev/ksyms
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/sun3/conf/GENERIC3X
diff -u src/sys/arch/sun3/conf/GENERIC3X:1.127 src/sys/arch/sun3/conf/GENERIC3X:1.128
--- src/sys/arch/sun3/conf/GENERIC3X:1.127	Fri Jul 28 19:26:16 2017
+++ src/sys/arch/sun3/conf/GENERIC3X	Wed Sep 13 22:24:46 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC3X,v 1.127 2017/07/28 19:26:16 maxv Exp $
+# $NetBSD: GENERIC3X,v 1.128 2017/09/13 22:24:46 sevan Exp $
 
 # GENERIC Sun3X (3/80, 3/470)
 # Supports root on: ie0, le0, sd*, ...
@@ -7,7 +7,7 @@ include 	"arch/sun3/conf/std.sun3x"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"GENERIC3X-$Revision: 1.127 $"
+#ident		"GENERIC3X-$Revision: 1.128 $"
 
 makeoptions	COPTS="-Os"	# bootloader has size limit (~2MB)
 
@@ -296,9 +296,6 @@ pseudo-device	ksyms			# /dev/ksyms
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/vax/conf/GENERIC
diff -u src/sys/arch/vax/conf/GENERIC:1.201 src/sys/arch/vax/conf/GENERIC:1.202
--- src/sys/arch/vax/conf/GENERIC:1.201	Fri Aug  4 09:33:03 2017
+++ src/sys/arch/vax/conf/GENERIC	Wed Sep 13 22:24:46 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.201 2017/08/04 09:33:03 maxv Exp $
+# $NetBSD: GENERIC,v 1.202 2017/09/13 22:24:46 sevan Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include		"arch/vax/conf/std.vax"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.201 $"
+#ident 		"GENERIC-$Revision: 1.202 $"
 
 # Here are all different supported CPU types listed.
 #options 	VAX8800		# VAX 8500, 8530, 8550, 8700, 8800
@@ -352,9 +352,6 @@ pseudo-device	wsmux			# mouse & keyboard
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/vax/conf/VAX780
diff -u src/sys/arch/vax/conf/VAX780:1.22 src/sys/arch/vax/conf/VAX780:1.23
--- src/sys/arch/vax/conf/VAX780:1.22	Fri Aug  4 09:33:03 2017
+++ src/sys/arch/vax/conf/VAX780	Wed Sep 13 22:24:46 2017
@@ -1,4 +1,4 @@
-# $NetBSD: VAX780,v 1.22 2017/08/04 09:33:03 maxv Exp $
+# $NetBSD: VAX780,v 1.23 2017/09/13 22:24:46 sevan Exp $
 #
 # 11/780,750,730 machine description file
 # 
@@ -330,9 +330,6 @@ pseudo-device	ksyms			# /dev/ksyms
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/arch/x68k/conf/GENERIC
diff -u src/sys/arch/x68k/conf/GENERIC:1.184 src/sys/arch/x68k/conf/GENERIC:1.185
--- src/sys/arch/x68k/conf/GENERIC:1.184	Sat Jul 29 18:08:59 2017
+++ src/sys/arch/x68k/conf/GENERIC	Wed Sep 13 22:24:46 2017
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.184 2017/07/29 18:08:59 maxv Exp $
+# $NetBSD: GENERIC,v 1.185 2017/09/13 22:24:46 sevan Exp $
 #
 # GENERIC machine description file
 # 
@@ -22,7 +22,7 @@ include 	"arch/x68k/conf/std.x68k"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.184 $"
+#ident 		"GENERIC-$Revision: 1.185 $"
 
 makeoptions	COPTS="-O2 -fno-reorder-blocks"	# see share/mk/sys.mk
 
@@ -532,9 +532,6 @@ pseudo-device	ksyms			# /dev/ksyms
 # removing fingerprint methods will have almost no impact on the kernel
 # code size.
 #
-#options VERIFIED_EXEC_FP_RMD160
 #options VERIFIED_EXEC_FP_SHA256
 #options VERIFIED_EXEC_FP_SHA384
 #options VERIFIED_EXEC_FP_SHA512
-#options VERIFIED_EXEC_FP_SHA1
-#options VERIFIED_EXEC_FP_MD5

Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1180 src/sys/conf/files:1.1181
--- src/sys/conf/files:1.1180	Sat Jul  8 00:54:37 2017
+++ src/sys/conf/files	Wed Sep 13 22:24:46 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.1180 2017/07/08 00:54:37 jmcneill Exp $
+#	$NetBSD: files,v 1.1181 2017/09/13 22:24:46 sevan Exp $
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
 version 	20170615
@@ -92,12 +92,9 @@ defflag	opt_dkwedge.h		DKWEDGE_AUTODISCO
 				DKWEDGE_METHOD_APPLE
 				DKWEDGE_METHOD_RDB
 
-defflag	opt_veriexec.h		VERIFIED_EXEC_FP_SHA1
-				VERIFIED_EXEC_FP_SHA256
+defflag	opt_veriexec.h		VERIFIED_EXEC_FP_SHA256
 				VERIFIED_EXEC_FP_SHA384
 				VERIFIED_EXEC_FP_SHA512
-				VERIFIED_EXEC_FP_MD5
-				VERIFIED_EXEC_FP_RMD160
 
 # Per system call number counts and times
 defflag opt_syscall_stats.h	SYSCALL_STATS

Index: src/sys/kern/kern_veriexec.c
diff -u src/sys/kern/kern_veriexec.c:1.16 src/sys/kern/kern_veriexec.c:1.17
--- src/sys/kern/kern_veriexec.c:1.16	Thu Aug 31 08:47:19 2017
+++ src/sys/kern/kern_veriexec.c	Wed Sep 13 22:24:46 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: kern_veriexec.c,v 1.16 2017/08/31 08:47:19 pgoyette Exp $	*/
+/*	$NetBSD: kern_veriexec.c,v 1.17 2017/09/13 22:24:46 sevan Exp $	*/
 
 /*-
  * Copyright (c) 2005, 2006 Elad Efrat <e...@netbsd.org>
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_veriexec.c,v 1.16 2017/08/31 08:47:19 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_veriexec.c,v 1.17 2017/09/13 22:24:46 sevan Exp $");
 
 #include "opt_veriexec.h"
 
@@ -354,11 +354,6 @@ veriexec_init(void)
 	veriexec_fpops_add(a, b, c, (veriexec_fpop_init_t)d, \
 	 (veriexec_fpop_update_t)e, (veriexec_fpop_final_t)f)
 
-#ifdef VERIFIED_EXEC_FP_RMD160
-	FPOPS_ADD("RMD160", RMD160_DIGEST_LENGTH, sizeof(RMD160_CTX),
-	    RMD160Init, RMD160Update, RMD160Final);
-#endif /* VERIFIED_EXEC_FP_RMD160 */
-
 #ifdef VERIFIED_EXEC_FP_SHA256
 	FPOPS_ADD("SHA256", SHA256_DIGEST_LENGTH, sizeof(SHA256_CTX),
 	    SHA256_Init, SHA256_Update, SHA256_Final);
@@ -374,16 +369,6 @@ veriexec_init(void)
 	    SHA512_Init, SHA512_Update, SHA512_Final);
 #endif /* VERIFIED_EXEC_FP_SHA512 */
 
-#ifdef VERIFIED_EXEC_FP_SHA1
-	FPOPS_ADD("SHA1", SHA1_DIGEST_LENGTH, sizeof(SHA1_CTX),
-	    SHA1Init, SHA1Update, SHA1Final);
-#endif /* VERIFIED_EXEC_FP_SHA1 */
-
-#ifdef VERIFIED_EXEC_FP_MD5
-	FPOPS_ADD("MD5", MD5_DIGEST_LENGTH, sizeof(MD5_CTX),
-	    MD5Init, MD5Update, MD5Final);
-#endif /* VERIFIED_EXEC_FP_MD5 */
-
 #undef FPOPS_ADD
 }
 

Reply via email to