25 files changed, 94 insertions, 725 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index ae5598ab7ca..1ed10b94d9b 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -101,8 +101,6 @@
 ./usr/lib/libgssapi.so.6.0
 ./usr/lib/libhdb.so.0.0
 ./usr/lib/libheimbase.so.0.0
-./usr/lib/libheimntlm.so.0.0
-./usr/lib/libhx509.so.0.0
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
@@ -1733,18 +1731,15 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/cms_asn1.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/com_err.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/com_right.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/crmf_asn1.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/der-private.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/der-protos.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/der.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/digest_asn1.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/getarg.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/gssapi
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/gssapi.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/gssapi/gssapi.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/gssapi/gssapi_krb5.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/gssapi/gssapi_oid.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/gssapi/gssapi_spnego.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/hdb-protos.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/hdb.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/hdb_asn1.ph
@@ -1753,13 +1748,7 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/heim_err.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/heim_threads.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/heimbase.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/heimntlm-protos.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/heimntlm.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/hex.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/hx509-private.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/hx509-protos.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/hx509.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/hx509_err.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/k524_err.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/kadm5
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/kadm5/admin.ph
@@ -1784,17 +1773,9 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/krb5_ccapi.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/krb5_err.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/krb_err.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/kx509_asn1.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/ntlm_err.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/ocsp_asn1.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/parse_bytes.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/parse_time.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/parse_units.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/pkcs10_asn1.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/pkcs12_asn1.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/pkcs8_asn1.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/pkcs9_asn1.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/pkinit_asn1.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/resolve.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/rfc2459_asn1.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/kerberosV/roken-common.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 7deb1931919..9b7445cff62 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -107,8 +107,6 @@
 ./usr/lib/libgssapi.so.6.0
 ./usr/lib/libhdb.so.0.0
 ./usr/lib/libheimbase.so.0.0
-./usr/lib/libheimntlm.so.0.0
-./usr/lib/libhx509.so.0.0
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
@@ -1760,18 +1758,15 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/cms_asn1.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/com_err.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/com_right.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/crmf_asn1.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/der-private.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/der-protos.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/der.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/digest_asn1.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/getarg.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/gssapi
 ./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/gssapi.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/gssapi/gssapi.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/gssapi/gssapi_krb5.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/gssapi/gssapi_oid.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/gssapi/gssapi_spnego.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/hdb-protos.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/hdb.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/hdb_asn1.ph
@@ -1780,13 +1775,7 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/heim_err.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/heim_threads.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/heimbase.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/heimntlm-protos.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/heimntlm.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/hex.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/hx509-private.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/hx509-protos.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/hx509.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/hx509_err.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/k524_err.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/kadm5
 ./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/kadm5/admin.ph
@@ -1811,17 +1800,9 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/krb5_ccapi.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/krb5_err.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/krb_err.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/kx509_asn1.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/ntlm_err.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/ocsp_asn1.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/parse_bytes.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/parse_time.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/parse_units.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/pkcs10_asn1.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/pkcs12_asn1.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/pkcs8_asn1.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/pkcs9_asn1.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/pkinit_asn1.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/resolve.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/rfc2459_asn1.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/kerberosV/roken-common.ph
diff --git a/distrib/sets/lists/base/md.armish b/distrib/sets/lists/base/md.armish
index 76ae7e341be..35cce1f8e59 100644
--- a/distrib/sets/lists/base/md.armish
+++ b/distrib/sets/lists/base/md.armish
@@ -73,8 +73,6 @@
 ./usr/lib/libgssapi.so.6.0
 ./usr/lib/libhdb.so.0.0
 ./usr/lib/libheimbase.so.0.0
-./usr/lib/libheimntlm.so.0.0
-./usr/lib/libhx509.so.0.0
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
@@ -1746,18 +1744,15 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/cms_asn1.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/com_err.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/com_right.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/crmf_asn1.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/der-private.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/der-protos.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/der.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/digest_asn1.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/getarg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/gssapi
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/gssapi.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/gssapi/gssapi.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/gssapi/gssapi_krb5.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/gssapi/gssapi_oid.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/gssapi/gssapi_spnego.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/hdb-protos.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/hdb.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/hdb_asn1.ph
@@ -1766,13 +1761,7 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/heim_err.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/heim_threads.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/heimbase.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/heimntlm-protos.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/heimntlm.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/hex.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/hx509-private.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/hx509-protos.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/hx509.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/hx509_err.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/k524_err.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/kadm5
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/kadm5/admin.ph
@@ -1797,17 +1786,9 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/krb5_ccapi.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/krb5_err.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/krb_err.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/kx509_asn1.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/ntlm_err.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/ocsp_asn1.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/parse_bytes.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/parse_time.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/parse_units.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/pkcs10_asn1.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/pkcs12_asn1.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/pkcs8_asn1.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/pkcs9_asn1.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/pkinit_asn1.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/resolve.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/rfc2459_asn1.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/roken-common.ph
diff --git a/distrib/sets/lists/base/md.aviion b/distrib/sets/lists/base/md.aviion
index b97fff01f39..0803e3ed822 100644
--- a/distrib/sets/lists/base/md.aviion
+++ b/distrib/sets/lists/base/md.aviion
@@ -19,8 +19,6 @@
 ./usr/lib/gcc-lib/m88k-unknown-openbsd5.3/3.3.6/specs
 ./usr/lib/libhdb.so.0.0
 ./usr/lib/libheimbase.so.0.0
-./usr/lib/libheimntlm.so.0.0
-./usr/lib/libhx509.so.0.0
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
 ./usr/lib/libkafs5.so.0.0
@@ -146,6 +144,12 @@
 ./usr/libdata/perl5/m88k-openbsd/5.16.3/auto/threads/threads.a
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rtsxreg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/dev/ic/rtsxvar.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/cms_asn1.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/hdb_asn1.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/heim_asn1.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/krb5_asn1.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/rfc2459_asn1.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/asn1.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd
 ./usr/libdata/perl5/site_perl/m88k-openbsd/_h2ph_pre.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/a.out.ph
@@ -1198,36 +1202,24 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/asn1-common.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/asn1_err.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/base64.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/cms_asn1.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/com_err.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/com_right.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/crmf_asn1.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/der-private.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/der-protos.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/der.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/digest_asn1.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/getarg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/gssapi
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/gssapi.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/gssapi/gssapi.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/gssapi/gssapi_krb5.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/gssapi/gssapi_oid.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/gssapi/gssapi_spnego.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/hdb-protos.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/hdb.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/hdb_asn1.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/hdb_err.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/heim_asn1.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/heim_err.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/heim_threads.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/heimbase.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/heimntlm-protos.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/heimntlm.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/hex.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/hx509-private.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/hx509-protos.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/hx509.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/hx509_err.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/k524_err.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/kadm5
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/kadm5/admin.ph
@@ -1248,23 +1240,13 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/krb5/locate_plugin.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/krb5/send_to_kdc_plugin.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/krb5/windc_plugin.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/krb5_asn1.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/krb5_ccapi.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/krb5_err.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/krb_err.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/kx509_asn1.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/ntlm_err.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/ocsp_asn1.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/parse_bytes.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/parse_time.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/parse_units.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/pkcs10_asn1.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/pkcs12_asn1.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/pkcs8_asn1.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/pkcs9_asn1.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/pkinit_asn1.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/resolve.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/rfc2459_asn1.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/roken-common.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/roken.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/rtbl.ph
@@ -1513,7 +1495,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/ohash.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/aes.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/asn1.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/asn1_mac.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/asn1t.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/bio.ph
diff --git a/distrib/sets/lists/base/md.beagle b/distrib/sets/lists/base/md.beagle
index 913e25dc2a9..d9ac02f7add 100644
--- a/distrib/sets/lists/base/md.beagle
+++ b/distrib/sets/lists/base/md.beagle
@@ -37,8 +37,6 @@
 ./usr/lib/libgssapi.so.6.0
 ./usr/lib/libhdb.so.0.0
 ./usr/lib/libheimbase.so.0.0
-./usr/lib/libheimntlm.so.0.0
-./usr/lib/libhx509.so.0.0
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
@@ -533,6 +531,12 @@
 ./usr/libdata/perl5/arm-openbsd/5.16.3/threads.pm
 ./usr/libdata/perl5/arm-openbsd/5.16.3/threads/shared.pm
 ./usr/libdata/perl5/site_perl/arm-openbsd
+./usr/libdata/perl5/site_perl/arm-openbsd-openbsd/kerberosV/cms_asn1.ph
+./usr/libdata/perl5/site_perl/arm-openbsd-openbsd/kerberosV/hdb_asn1.ph
+./usr/libdata/perl5/site_perl/arm-openbsd-openbsd/kerberosV/heim_asn1.ph
+./usr/libdata/perl5/site_perl/arm-openbsd-openbsd/kerberosV/krb5_asn1.ph
+./usr/libdata/perl5/site_perl/arm-openbsd-openbsd/kerberosV/rfc2459_asn1.ph
+./usr/libdata/perl5/site_perl/arm-openbsd-openbsd/openssl/asn1.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/_h2ph_pre.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/a.out.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/altq
@@ -548,6 +552,56 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/altq/if_altq.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/ar.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/arm
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/_float.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/_types.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/apmvar.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/arm-openbsd_intr.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/asm.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/atomic.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/bootconfig.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/bus.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/cdefs.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/conf.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/cpu.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/cpufunc.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/db_machdep.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/disklabel.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/elf_abi.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/endian.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/exec.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/fenv.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/fp.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/frame.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/ieee.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/ieeefp.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/intr.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/irqhandler.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/isa_machdep.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/limits.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/loadfile_machdep.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/lock.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/machine_reg.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/math.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/mutex.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/param.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/pcb.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/pio.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/pmap.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/proc.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/profile.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/ptrace.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/reg.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/reloc.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/rtc.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/setjmp.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/signal.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/spinlock.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/stdarg.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/sysarch.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/tcb.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/trap.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/arm-openbsd/vmparam.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/arm/_float.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/arm/_types.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/arm/apmvar.ph
@@ -604,56 +658,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/arpa/telnet.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/arpa/tftp.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/assert.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/_float.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/_types.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/apmvar.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/asm.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/atomic.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/beagle_intr.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/bootconfig.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/bus.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/cdefs.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/conf.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/cpu.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/cpufunc.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/db_machdep.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/disklabel.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/elf_abi.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/endian.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/exec.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/fenv.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/fp.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/frame.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/ieee.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/ieeefp.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/intr.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/irqhandler.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/isa_machdep.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/limits.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/loadfile_machdep.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/lock.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/machine_reg.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/math.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/mutex.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/param.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/pcb.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/pio.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/pmap.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/proc.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/profile.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/ptrace.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/reg.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/reloc.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/rtc.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/setjmp.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/signal.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/spinlock.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/stdarg.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/sysarch.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/tcb.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/trap.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/beagle/vmparam.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/bitstring.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/blf.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/bm.ph
@@ -1712,36 +1716,24 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/asn1-common.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/asn1_err.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/base64.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/cms_asn1.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/com_err.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/com_right.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/crmf_asn1.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/der-private.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/der-protos.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/der.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/digest_asn1.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/getarg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/gssapi
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/gssapi.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/gssapi/gssapi.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/gssapi/gssapi_krb5.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/gssapi/gssapi_oid.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/gssapi/gssapi_spnego.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/hdb-protos.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/hdb.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/hdb_asn1.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/hdb_err.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/heim_asn1.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/heim_err.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/heim_threads.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/heimbase.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/heimntlm-protos.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/heimntlm.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/hex.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/hx509-private.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/hx509-protos.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/hx509.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/hx509_err.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/k524_err.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/kadm5
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/kadm5/admin.ph
@@ -1762,23 +1754,13 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/krb5/locate_plugin.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/krb5/send_to_kdc_plugin.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/krb5/windc_plugin.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/krb5_asn1.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/krb5_ccapi.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/krb5_err.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/krb_err.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/kx509_asn1.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/ntlm_err.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/ocsp_asn1.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/parse_bytes.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/parse_time.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/parse_units.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/pkcs10_asn1.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/pkcs12_asn1.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/pkcs8_asn1.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/pkcs9_asn1.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/pkinit_asn1.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/resolve.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/rfc2459_asn1.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/roken-common.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/roken.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/rtbl.ph
@@ -1986,7 +1968,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/ohash.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/aes.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/openssl/asn1.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/asn1_mac.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/asn1t.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/bio.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index dc0b3558b55..4aea96eb385 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -39,8 +39,6 @@
 ./usr/lib/libgssapi.so.6.0
 ./usr/lib/libhdb.so.0.0
 ./usr/lib/libheimbase.so.0.0
-./usr/lib/libheimntlm.so.0.0
-./usr/lib/libhx509.so.0.0
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
@@ -1593,18 +1591,15 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/cms_asn1.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/com_err.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/com_right.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/crmf_asn1.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/der-private.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/der-protos.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/der.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/digest_asn1.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/getarg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/gssapi
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/gssapi.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/gssapi/gssapi.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/gssapi/gssapi_krb5.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/gssapi/gssapi_oid.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/gssapi/gssapi_spnego.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/hdb-protos.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/hdb.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/hdb_asn1.ph
@@ -1613,13 +1608,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/heim_err.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/heim_threads.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/heimbase.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/heimntlm-protos.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/heimntlm.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/hex.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/hx509-private.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/hx509-protos.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/hx509.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/hx509_err.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/k524_err.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/kadm5
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/kadm5/admin.ph
@@ -1644,17 +1633,9 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/krb5_ccapi.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/krb5_err.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/krb_err.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/kx509_asn1.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/ntlm_err.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/ocsp_asn1.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/parse_bytes.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/parse_time.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/parse_units.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/pkcs10_asn1.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/pkcs12_asn1.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/pkcs8_asn1.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/pkcs9_asn1.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/pkinit_asn1.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/resolve.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/rfc2459_asn1.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/roken-common.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 97fee65932c..e3dd15075ea 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -102,8 +102,6 @@
 ./usr/lib/libgssapi.so.6.0
 ./usr/lib/libhdb.so.0.0
 ./usr/lib/libheimbase.so.0.0
-./usr/lib/libheimntlm.so.0.0
-./usr/lib/libhx509.so.0.0
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
@@ -1734,18 +1732,15 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/cms_asn1.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/com_err.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/com_right.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/crmf_asn1.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/der-private.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/der-protos.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/der.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/digest_asn1.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/getarg.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/gssapi
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/gssapi.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/gssapi/gssapi.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/gssapi/gssapi_krb5.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/gssapi/gssapi_oid.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/gssapi/gssapi_spnego.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/hdb-protos.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/hdb.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/hdb_asn1.ph
@@ -1754,13 +1749,7 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/heim_err.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/heim_threads.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/heimbase.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/heimntlm-protos.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/heimntlm.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/hex.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/hx509-private.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/hx509-protos.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/hx509.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/hx509_err.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/k524_err.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/kadm5
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/kadm5/admin.ph
@@ -1785,17 +1774,9 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/krb5_ccapi.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/krb5_err.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/krb_err.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/kx509_asn1.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/ntlm_err.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/ocsp_asn1.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/parse_bytes.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/parse_time.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/parse_units.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/pkcs10_asn1.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/pkcs12_asn1.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/pkcs8_asn1.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/pkcs9_asn1.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/pkinit_asn1.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/resolve.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/rfc2459_asn1.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/kerberosV/roken-common.ph
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index ecf66995844..09010c4ecab 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -103,8 +103,6 @@
 ./usr/lib/libgssapi.so.6.0
 ./usr/lib/libhdb.so.0.0
 ./usr/lib/libheimbase.so.0.0
-./usr/lib/libheimntlm.so.0.0
-./usr/lib/libhx509.so.0.0
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
@@ -1667,18 +1665,15 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/cms_asn1.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/com_err.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/com_right.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/crmf_asn1.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/der-private.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/der-protos.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/der.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/digest_asn1.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/getarg.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/gssapi
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/gssapi.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/gssapi/gssapi.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/gssapi/gssapi_krb5.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/gssapi/gssapi_oid.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/gssapi/gssapi_spnego.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/hdb-protos.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/hdb.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/hdb_asn1.ph
@@ -1687,13 +1682,7 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/heim_err.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/heim_threads.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/heimbase.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/heimntlm-protos.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/heimntlm.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/hex.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/hx509-private.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/hx509-protos.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/hx509.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/hx509_err.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/k524_err.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/kadm5
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/kadm5/admin.ph
@@ -1718,17 +1707,9 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/krb5_ccapi.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/krb5_err.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/krb_err.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/kx509_asn1.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/ntlm_err.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/ocsp_asn1.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/parse_bytes.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/parse_time.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/parse_units.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/pkcs10_asn1.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/pkcs12_asn1.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/pkcs8_asn1.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/pkcs9_asn1.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/pkinit_asn1.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/resolve.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/rfc2459_asn1.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/kerberosV/roken-common.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 6f1b5dbcab3..79fbd8b3293 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -109,8 +109,6 @@
 ./usr/lib/libgssapi.so.6.0
 ./usr/lib/libhdb.so.0.0
 ./usr/lib/libheimbase.so.0.0
-./usr/lib/libheimntlm.so.0.0
-./usr/lib/libhx509.so.0.0
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
@@ -1766,18 +1764,15 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/cms_asn1.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/com_err.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/com_right.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/crmf_asn1.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/der-private.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/der-protos.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/der.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/digest_asn1.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/getarg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/gssapi
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/gssapi.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/gssapi/gssapi.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/gssapi/gssapi_krb5.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/gssapi/gssapi_oid.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/gssapi/gssapi_spnego.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/hdb-protos.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/hdb.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/hdb_asn1.ph
@@ -1786,13 +1781,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/heim_err.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/heim_threads.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/heimbase.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/heimntlm-protos.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/heimntlm.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/hex.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/hx509-private.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/hx509-protos.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/hx509.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/hx509_err.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/k524_err.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/kadm5
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/kadm5/admin.ph
@@ -1817,17 +1806,9 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/krb5_ccapi.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/krb5_err.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/krb_err.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/kx509_asn1.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/ntlm_err.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/ocsp_asn1.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/parse_bytes.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/parse_time.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/parse_units.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/pkcs10_asn1.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/pkcs12_asn1.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/pkcs8_asn1.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/pkcs9_asn1.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/pkinit_asn1.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/resolve.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/rfc2459_asn1.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/roken-common.ph
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index 440a405e3c9..55935114ef9 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -63,8 +63,6 @@
 ./usr/lib/libgssapi.so.6.0
 ./usr/lib/libhdb.so.0.0
 ./usr/lib/libheimbase.so.0.0
-./usr/lib/libheimntlm.so.0.0
-./usr/lib/libhx509.so.0.0
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
@@ -1641,18 +1639,15 @@
 ./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/cms_asn1.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/com_err.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/com_right.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/crmf_asn1.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/der-private.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/der-protos.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/der.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/digest_asn1.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/getarg.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/gssapi
 ./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/gssapi.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/gssapi/gssapi.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/gssapi/gssapi_krb5.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/gssapi/gssapi_oid.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/gssapi/gssapi_spnego.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/hdb-protos.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/hdb.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/hdb_asn1.ph
@@ -1661,13 +1656,7 @@
 ./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/heim_err.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/heim_threads.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/heimbase.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/heimntlm-protos.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/heimntlm.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/hex.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/hx509-private.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/hx509-protos.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/hx509.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/hx509_err.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/k524_err.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/kadm5
 ./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/kadm5/admin.ph
@@ -1692,17 +1681,9 @@
 ./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/krb5_ccapi.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/krb5_err.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/krb_err.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/kx509_asn1.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/ntlm_err.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/ocsp_asn1.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/parse_bytes.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/parse_time.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/parse_units.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/pkcs10_asn1.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/pkcs12_asn1.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/pkcs8_asn1.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/pkcs9_asn1.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/pkinit_asn1.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/resolve.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/rfc2459_asn1.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/kerberosV/roken-common.ph
diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson
index 897cd27b27b..32225b06dea 100644
--- a/distrib/sets/lists/base/md.loongson
+++ b/distrib/sets/lists/base/md.loongson
@@ -69,8 +69,6 @@
 ./usr/lib/libgssapi.so.6.0
 ./usr/lib/libhdb.so.0.0
 ./usr/lib/libheimbase.so.0.0
-./usr/lib/libheimntlm.so.0.0
-./usr/lib/libhx509.so.0.0
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
@@ -1648,18 +1646,15 @@
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/cms_asn1.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/com_err.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/com_right.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/crmf_asn1.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/der-private.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/der-protos.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/der.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/digest_asn1.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/getarg.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/gssapi
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/gssapi.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/gssapi/gssapi.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/gssapi/gssapi_krb5.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/gssapi/gssapi_oid.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/gssapi/gssapi_spnego.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/hdb-protos.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/hdb.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/hdb_asn1.ph
@@ -1668,13 +1663,7 @@
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/heim_err.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/heim_threads.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/heimbase.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/heimntlm-protos.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/heimntlm.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/hex.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/hx509-private.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/hx509-protos.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/hx509.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/hx509_err.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/k524_err.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/kadm5
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/kadm5/admin.ph
@@ -1699,17 +1688,9 @@
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/krb5_ccapi.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/krb5_err.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/krb_err.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/kx509_asn1.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/ntlm_err.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/ocsp_asn1.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/parse_bytes.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/parse_time.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/parse_units.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/pkcs10_asn1.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/pkcs12_asn1.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/pkcs8_asn1.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/pkcs9_asn1.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/pkinit_asn1.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/resolve.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/rfc2459_asn1.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/kerberosV/roken-common.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index f8e3e33b129..bd1ffe8e7bb 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -52,8 +52,6 @@
 ./usr/lib/libgssapi.so.6.0
 ./usr/lib/libhdb.so.0.0
 ./usr/lib/libheimbase.so.0.0
-./usr/lib/libheimntlm.so.0.0
-./usr/lib/libhx509.so.0.0
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
@@ -1550,18 +1548,15 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/cms_asn1.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/com_err.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/com_right.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/crmf_asn1.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/der-private.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/der-protos.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/der.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/digest_asn1.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/getarg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/gssapi
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/gssapi.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/gssapi/gssapi.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/gssapi/gssapi_krb5.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/gssapi/gssapi_oid.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/gssapi/gssapi_spnego.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/hdb-protos.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/hdb.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/hdb_asn1.ph
@@ -1570,13 +1565,7 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/heim_err.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/heim_threads.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/heimbase.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/heimntlm-protos.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/heimntlm.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/hex.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/hx509-private.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/hx509-protos.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/hx509.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/hx509_err.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/k524_err.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/kadm5
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/kadm5/admin.ph
@@ -1601,17 +1590,9 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/krb5_ccapi.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/krb5_err.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/krb_err.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/kx509_asn1.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/ntlm_err.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/ocsp_asn1.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/parse_bytes.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/parse_time.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/parse_units.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/pkcs10_asn1.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/pkcs12_asn1.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/pkcs8_asn1.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/pkcs9_asn1.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/pkinit_asn1.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/resolve.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/rfc2459_asn1.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/roken-common.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index d5dc712687a..d9d8ae59a02 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -104,8 +104,6 @@
 ./usr/lib/libgssapi.so.6.0
 ./usr/lib/libhdb.so.0.0
 ./usr/lib/libheimbase.so.0.0
-./usr/lib/libheimntlm.so.0.0
-./usr/lib/libhx509.so.0.0
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
@@ -1683,18 +1681,15 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/cms_asn1.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/com_err.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/com_right.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/crmf_asn1.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/der-private.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/der-protos.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/der.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/digest_asn1.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/getarg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/gssapi
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/gssapi.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/gssapi/gssapi.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/gssapi/gssapi_krb5.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/gssapi/gssapi_oid.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/gssapi/gssapi_spnego.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/hdb-protos.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/hdb.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/hdb_asn1.ph
@@ -1703,13 +1698,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/heim_err.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/heim_threads.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/heimbase.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/heimntlm-protos.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/heimntlm.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/hex.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/hx509-private.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/hx509-protos.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/hx509.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/hx509_err.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/k524_err.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/kadm5
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/kadm5/admin.ph
@@ -1734,17 +1723,9 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/krb5_ccapi.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/krb5_err.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/krb_err.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/kx509_asn1.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/ntlm_err.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/ocsp_asn1.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/parse_bytes.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/parse_time.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/parse_units.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/pkcs10_asn1.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/pkcs12_asn1.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/pkcs8_asn1.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/pkcs9_asn1.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/pkinit_asn1.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/resolve.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/rfc2459_asn1.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/roken-common.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 4fb05fa8247..bf9c75fde1e 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -37,8 +37,6 @@
 ./usr/lib/libgssapi.so.6.0
 ./usr/lib/libhdb.so.0.0
 ./usr/lib/libheimbase.so.0.0
-./usr/lib/libheimntlm.so.0.0
-./usr/lib/libhx509.so.0.0
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
@@ -1548,18 +1546,15 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/cms_asn1.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/com_err.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/com_right.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/crmf_asn1.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/der-private.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/der-protos.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/der.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/digest_asn1.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/getarg.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/gssapi
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/gssapi.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/gssapi/gssapi.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/gssapi/gssapi_krb5.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/gssapi/gssapi_oid.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/gssapi/gssapi_spnego.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/hdb-protos.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/hdb.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/hdb_asn1.ph
@@ -1568,13 +1563,7 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/heim_err.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/heim_threads.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/heimbase.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/heimntlm-protos.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/heimntlm.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/hex.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/hx509-private.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/hx509-protos.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/hx509.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/hx509_err.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/k524_err.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/kadm5
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/kadm5/admin.ph
@@ -1599,17 +1588,9 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/krb5_ccapi.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/krb5_err.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/krb_err.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/kx509_asn1.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/ntlm_err.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/ocsp_asn1.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/parse_bytes.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/parse_time.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/parse_units.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/pkcs10_asn1.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/pkcs12_asn1.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/pkcs8_asn1.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/pkcs9_asn1.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/pkinit_asn1.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/resolve.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/rfc2459_asn1.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/kerberosV/roken-common.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index 41d5611314b..86caa586089 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -51,8 +51,6 @@
 ./usr/lib/libgssapi.so.6.0
 ./usr/lib/libhdb.so.0.0
 ./usr/lib/libheimbase.so.0.0
-./usr/lib/libheimntlm.so.0.0
-./usr/lib/libhx509.so.0.0
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
@@ -1546,36 +1544,24 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/asn1-common.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/asn1_err.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/base64.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/cms_asn1.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/com_err.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/com_right.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/crmf_asn1.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/der-private.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/der-protos.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/der.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/digest_asn1.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/getarg.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/gssapi
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/gssapi.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/gssapi/gssapi.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/gssapi/gssapi_krb5.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/gssapi/gssapi_oid.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/gssapi/gssapi_spnego.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/hdb-protos.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/hdb.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/hdb_asn1.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/hdb_err.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/heim_asn1.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/heim_err.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/heim_threads.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/heimbase.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/heimntlm-protos.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/heimntlm.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/hex.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/hx509-private.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/hx509-protos.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/hx509.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/hx509_err.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/k524_err.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/kadm5
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/kadm5/admin.ph
@@ -1596,23 +1582,13 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/krb5/locate_plugin.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/krb5/send_to_kdc_plugin.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/krb5/windc_plugin.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/krb5_asn1.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/krb5_ccapi.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/krb5_err.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/krb_err.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/kx509_asn1.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/ntlm_err.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/ocsp_asn1.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/parse_bytes.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/parse_time.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/parse_units.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/pkcs10_asn1.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/pkcs12_asn1.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/pkcs8_asn1.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/pkcs9_asn1.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/pkinit_asn1.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/resolve.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/rfc2459_asn1.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/roken-common.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/roken.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/kerberosV/rtbl.ph
@@ -1921,7 +1897,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/ohash.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/aes.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/asn1.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/asn1_mac.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/asn1t.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/bio.ph
@@ -2304,6 +2279,12 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/wctype.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/zconf.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/zlib.ph
+./usr/libdata/perl5/site_perl/mvme88k-openbsd/kerberosV/cms_asn1.ph
+./usr/libdata/perl5/site_perl/mvme88k-openbsd/kerberosV/hdb_asn1.ph
+./usr/libdata/perl5/site_perl/mvme88k-openbsd/kerberosV/heim_asn1.ph
+./usr/libdata/perl5/site_perl/mvme88k-openbsd/kerberosV/krb5_asn1.ph
+./usr/libdata/perl5/site_perl/mvme88k-openbsd/kerberosV/rfc2459_asn1.ph
+./usr/libdata/perl5/site_perl/mvme88k-openbsd/openssl/asn1.ph
 ./usr/libexec/ld.so
 ./usr/libexec/sudo_noexec.so
 ./usr/local/libdata/perl5/site_perl/m88k-openbsd
diff --git a/distrib/sets/lists/base/md.octeon b/distrib/sets/lists/base/md.octeon
index b67a3bef2e1..aad45030869 100644
--- a/distrib/sets/lists/base/md.octeon
+++ b/distrib/sets/lists/base/md.octeon
@@ -33,8 +33,6 @@
 ./usr/lib/libgssapi.so.6.0
 ./usr/lib/libhdb.so.0.0
 ./usr/lib/libheimbase.so.0.0
-./usr/lib/libheimntlm.so.0.0
-./usr/lib/libhx509.so.0.0
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
@@ -1609,36 +1607,24 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/asn1-common.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/asn1_err.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/base64.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/cms_asn1.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/com_err.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/com_right.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/crmf_asn1.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/der-private.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/der-protos.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/der.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/digest_asn1.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/getarg.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/gssapi
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/gssapi.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/gssapi/gssapi.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/gssapi/gssapi_krb5.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/gssapi/gssapi_oid.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/gssapi/gssapi_spnego.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/hdb-protos.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/hdb.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/hdb_asn1.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/hdb_err.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/heim_asn1.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/heim_err.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/heim_threads.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/heimbase.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/heimntlm-protos.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/heimntlm.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/hex.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/hx509-private.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/hx509-protos.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/hx509.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/hx509_err.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/k524_err.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/kadm5
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/kadm5/admin.ph
@@ -1659,23 +1645,13 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/krb5/locate_plugin.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/krb5/send_to_kdc_plugin.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/krb5/windc_plugin.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/krb5_asn1.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/krb5_ccapi.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/krb5_err.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/krb_err.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/kx509_asn1.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/ntlm_err.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/ocsp_asn1.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/parse_bytes.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/parse_time.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/parse_units.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/pkcs10_asn1.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/pkcs12_asn1.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/pkcs8_asn1.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/pkcs9_asn1.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/pkinit_asn1.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/resolve.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/rfc2459_asn1.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/roken-common.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/roken.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/rtbl.ph
@@ -1980,7 +1956,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/ohash.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/aes.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/asn1.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/asn1_mac.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/asn1t.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/bio.ph
@@ -2363,6 +2338,12 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/wctype.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/zconf.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/zlib.ph
+./usr/libdata/perl5/site_perl/octeon-openbsd/kerberosV/cms_asn1.ph
+./usr/libdata/perl5/site_perl/octeon-openbsd/kerberosV/hdb_asn1.ph
+./usr/libdata/perl5/site_perl/octeon-openbsd/kerberosV/heim_asn1.ph
+./usr/libdata/perl5/site_perl/octeon-openbsd/kerberosV/krb5_asn1.ph
+./usr/libdata/perl5/site_perl/octeon-openbsd/kerberosV/rfc2459_asn1.ph
+./usr/libdata/perl5/site_perl/octeon-openbsd/openssl/asn1.ph
 ./usr/libexec/ld.so
 ./usr/libexec/sudo_noexec.so
 ./usr/local/libdata/perl5/site_perl/mips64-openbsd
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index aeb9e903641..6a816f30f93 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -99,8 +99,6 @@
 ./usr/lib/libgssapi.so.6.0
 ./usr/lib/libhdb.so.0.0
 ./usr/lib/libheimbase.so.0.0
-./usr/lib/libheimntlm.so.0.0
-./usr/lib/libhx509.so.0.0
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
@@ -1680,7 +1678,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/gssapi.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/hdb-protos.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/hdb.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/hdb_asn1.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/hdb_err.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/heim_err.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/k524_err.ph
@@ -1695,7 +1692,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/krb5-protos.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/krb5-types.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/krb5.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/krb5_asn1.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kerberosV/krb5_err.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/keynote.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/kvm.ph
@@ -1944,7 +1940,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/ohash.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/aes.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/asn1.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/asn1_mac.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/asn1t.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/bio.ph
@@ -2381,27 +2376,16 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/zconf.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/zlib.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/base64.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/cms_asn1.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/crmf_asn1.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/der-private.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/der-protos.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/digest_asn1.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/getarg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/gssapi
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/gssapi/gssapi.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/gssapi/gssapi_krb5.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/gssapi/gssapi_oid.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/gssapi/gssapi_spnego.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/heim_asn1.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/heim_threads.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/heimbase.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/heimntlm-protos.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/heimntlm.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/hex.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/hx509-private.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/hx509-protos.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/hx509.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/hx509_err.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/kadm5/kadm5-pwcheck.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/kdc-protos.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/kdc.ph
@@ -2412,25 +2396,22 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/krb5/windc_plugin.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/krb5_ccapi.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/krb_err.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/kx509_asn1.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/ntlm_err.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/ocsp_asn1.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/parse_bytes.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/parse_time.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/parse_units.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/pkcs10_asn1.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/pkcs12_asn1.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/pkcs8_asn1.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/pkcs9_asn1.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/pkinit_asn1.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/resolve.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/rfc2459_asn1.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/roken-common.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/roken.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/rtbl.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/wind.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/wind_err.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/xdbm.ph
+./usr/libdata/perl5/site_perl/sgi-openbsd/kerberosV/cms_asn1.ph
+./usr/libdata/perl5/site_perl/sgi-openbsd/kerberosV/hdb_asn1.ph
+./usr/libdata/perl5/site_perl/sgi-openbsd/kerberosV/heim_asn1.ph
+./usr/libdata/perl5/site_perl/sgi-openbsd/kerberosV/krb5_asn1.ph
+./usr/libdata/perl5/site_perl/sgi-openbsd/kerberosV/rfc2459_asn1.ph
+./usr/libdata/perl5/site_perl/sgi-openbsd/openssl/asn1.ph
 ./usr/libexec/ld.so
 ./usr/libexec/sudo_noexec.so
 ./usr/local/libdata/perl5/site_perl/mips64-openbsd
diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc
index 93c80205246..5362bb9366c 100644
--- a/distrib/sets/lists/base/md.socppc
+++ b/distrib/sets/lists/base/md.socppc
@@ -96,8 +96,6 @@
 ./usr/lib/libgssapi.so.6.0
 ./usr/lib/libhdb.so.0.0
 ./usr/lib/libheimbase.so.0.0
-./usr/lib/libheimntlm.so.0.0
-./usr/lib/libhx509.so.0.0
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
@@ -1672,36 +1670,24 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/asn1-common.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/asn1_err.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/base64.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/cms_asn1.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/com_err.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/com_right.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/crmf_asn1.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/der-private.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/der-protos.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/der.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/digest_asn1.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/getarg.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/gssapi
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/gssapi.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/gssapi/gssapi.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/gssapi/gssapi_krb5.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/gssapi/gssapi_oid.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/gssapi/gssapi_spnego.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/hdb-protos.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/hdb.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/hdb_asn1.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/hdb_err.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/heim_asn1.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/heim_err.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/heim_threads.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/heimbase.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/heimntlm-protos.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/heimntlm.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/hex.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/hx509-private.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/hx509-protos.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/hx509.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/hx509_err.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/k524_err.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/kadm5
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/kadm5/admin.ph
@@ -1722,23 +1708,13 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/krb5/locate_plugin.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/krb5/send_to_kdc_plugin.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/krb5/windc_plugin.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/krb5_asn1.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/krb5_ccapi.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/krb5_err.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/krb_err.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/kx509_asn1.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/ntlm_err.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/ocsp_asn1.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/parse_bytes.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/parse_time.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/parse_units.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/pkcs10_asn1.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/pkcs12_asn1.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/pkcs8_asn1.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/pkcs9_asn1.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/pkinit_asn1.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/resolve.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/rfc2459_asn1.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/roken-common.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/roken.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/kerberosV/rtbl.ph
@@ -1945,7 +1921,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/ohash.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/aes.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/asn1.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/asn1_mac.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/asn1t.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/bio.ph
@@ -2417,6 +2392,12 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/wctype.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/zconf.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/zlib.ph
+./usr/libdata/perl5/site_perl/socppc-openbsd/kerberosV/cms_asn1.ph
+./usr/libdata/perl5/site_perl/socppc-openbsd/kerberosV/hdb_asn1.ph
+./usr/libdata/perl5/site_perl/socppc-openbsd/kerberosV/heim_asn1.ph
+./usr/libdata/perl5/site_perl/socppc-openbsd/kerberosV/krb5_asn1.ph
+./usr/libdata/perl5/site_perl/socppc-openbsd/kerberosV/rfc2459_asn1.ph
+./usr/libdata/perl5/site_perl/socppc-openbsd/openssl/asn1.ph
 ./usr/libexec/ld.so
 ./usr/libexec/sudo_noexec.so
 ./usr/local/libdata/perl5/site_perl/powerpc-openbsd
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index b47bc752936..2810a4ed90d 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -44,8 +44,6 @@
 ./usr/lib/libgssapi.so.6.0
 ./usr/lib/libhdb.so.0.0
 ./usr/lib/libheimbase.so.0.0
-./usr/lib/libheimntlm.so.0.0
-./usr/lib/libhx509.so.0.0
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
@@ -1166,18 +1164,15 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/cms_asn1.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/com_err.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/com_right.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/crmf_asn1.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/der-private.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/der-protos.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/der.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/digest_asn1.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/getarg.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/gssapi
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/gssapi.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/gssapi/gssapi.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/gssapi/gssapi_krb5.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/gssapi/gssapi_oid.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/gssapi/gssapi_spnego.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/hdb-protos.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/hdb.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/hdb_asn1.ph
@@ -1186,13 +1181,7 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/heim_err.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/heim_threads.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/heimbase.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/heimntlm-protos.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/heimntlm.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/hex.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/hx509-private.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/hx509-protos.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/hx509.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/hx509_err.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/k524_err.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/kadm5
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/kadm5/admin.ph
@@ -1217,17 +1206,9 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/krb5_ccapi.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/krb5_err.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/krb_err.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/kx509_asn1.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/ntlm_err.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/ocsp_asn1.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/parse_bytes.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/parse_time.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/parse_units.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/pkcs10_asn1.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/pkcs12_asn1.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/pkcs8_asn1.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/pkcs9_asn1.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/pkinit_asn1.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/resolve.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/rfc2459_asn1.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/kerberosV/roken-common.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 002beb7b7f8..3f0d0057905 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -104,8 +104,6 @@
 ./usr/lib/libgssapi.so.6.0
 ./usr/lib/libhdb.so.0.0
 ./usr/lib/libheimbase.so.0.0
-./usr/lib/libheimntlm.so.0.0
-./usr/lib/libhx509.so.0.0
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
@@ -1226,18 +1224,15 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/cms_asn1.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/com_err.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/com_right.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/crmf_asn1.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/der-private.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/der-protos.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/der.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/digest_asn1.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/getarg.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/gssapi
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/gssapi.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/gssapi/gssapi.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/gssapi/gssapi_krb5.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/gssapi/gssapi_oid.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/gssapi/gssapi_spnego.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/hdb-protos.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/hdb.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/hdb_asn1.ph
@@ -1246,13 +1241,7 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/heim_err.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/heim_threads.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/heimbase.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/heimntlm-protos.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/heimntlm.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/hex.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/hx509-private.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/hx509-protos.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/hx509.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/hx509_err.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/k524_err.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/kadm5
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/kadm5/admin.ph
@@ -1277,17 +1266,9 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/krb5_ccapi.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/krb5_err.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/krb_err.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/kx509_asn1.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/ntlm_err.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/ocsp_asn1.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/parse_bytes.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/parse_time.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/parse_units.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/pkcs10_asn1.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/pkcs12_asn1.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/pkcs8_asn1.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/pkcs9_asn1.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/pkinit_asn1.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/resolve.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/rfc2459_asn1.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/kerberosV/roken-common.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 89c1d5041b5..45203f18b44 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -9,8 +9,6 @@
 ./usr/lib/gcc-lib/vax-unknown-openbsd5.3/2.95.3/specs
 ./usr/lib/libhdb.so.0.0
 ./usr/lib/libheimbase.so.0.0
-./usr/lib/libheimntlm.so.0.0
-./usr/lib/libhx509.so.0.0
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
 ./usr/lib/libkafs5.so.0.0
@@ -1017,18 +1015,15 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/cms_asn1.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/com_err.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/com_right.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/crmf_asn1.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/der-private.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/der-protos.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/der.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/digest_asn1.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/getarg.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/gssapi
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/gssapi.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/gssapi/gssapi.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/gssapi/gssapi_krb5.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/gssapi/gssapi_oid.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/gssapi/gssapi_spnego.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/hdb-protos.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/hdb.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/hdb_asn1.ph
@@ -1037,13 +1032,7 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/heim_err.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/heim_threads.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/heimbase.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/heimntlm-protos.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/heimntlm.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/hex.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/hx509-private.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/hx509-protos.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/hx509.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/hx509_err.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/k524_err.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/kadm5
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/kadm5/admin.ph
@@ -1068,17 +1057,9 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/krb5_ccapi.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/krb5_err.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/krb_err.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/kx509_asn1.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/ntlm_err.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/ocsp_asn1.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/parse_bytes.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/parse_time.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/parse_units.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/pkcs10_asn1.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/pkcs12_asn1.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/pkcs8_asn1.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/pkcs9_asn1.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/pkinit_asn1.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/resolve.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/rfc2459_asn1.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/kerberosV/roken-common.ph
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index 2c16677f688..b8dfdaf7ac5 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -71,8 +71,6 @@
 ./usr/lib/libgssapi.so.6.0
 ./usr/lib/libhdb.so.0.0
 ./usr/lib/libheimbase.so.0.0
-./usr/lib/libheimntlm.so.0.0
-./usr/lib/libhx509.so.0.0
 ./usr/lib/libiberty.so.10.1
 ./usr/lib/libkadm5clnt.so.0.0
 ./usr/lib/libkadm5srv.so.0.0
@@ -1697,36 +1695,24 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/asn1-common.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/asn1_err.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/base64.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/cms_asn1.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/com_err.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/com_right.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/crmf_asn1.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/der-private.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/der-protos.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/der.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/digest_asn1.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/getarg.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/gssapi
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/gssapi.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/gssapi/gssapi.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/gssapi/gssapi_krb5.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/gssapi/gssapi_oid.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/gssapi/gssapi_spnego.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/hdb-protos.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/hdb.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/hdb_asn1.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/hdb_err.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/heim_asn1.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/heim_err.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/heim_threads.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/heimbase.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/heimntlm-protos.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/heimntlm.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/hex.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/hx509-private.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/hx509-protos.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/hx509.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/hx509_err.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/k524_err.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/kadm5
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/kadm5/admin.ph
@@ -1747,23 +1733,13 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/krb5/locate_plugin.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/krb5/send_to_kdc_plugin.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/krb5/windc_plugin.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/krb5_asn1.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/krb5_ccapi.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/krb5_err.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/krb_err.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/kx509_asn1.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/ntlm_err.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/ocsp_asn1.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/parse_bytes.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/parse_time.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/parse_units.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/pkcs10_asn1.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/pkcs12_asn1.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/pkcs8_asn1.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/pkcs9_asn1.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/pkinit_asn1.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/resolve.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/rfc2459_asn1.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/roken-common.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/roken.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/kerberosV/rtbl.ph
@@ -1971,7 +1947,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/ohash.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/aes.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/openssl/asn1.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/asn1_mac.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/asn1t.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/bio.ph
@@ -2398,6 +2373,12 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/zaurus/zaurus_var.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/zconf.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/zlib.ph
+./usr/libdata/perl5/site_perl/zaurus-openbsd/kerberosV/cms_asn1.ph
+./usr/libdata/perl5/site_perl/zaurus-openbsd/kerberosV/hdb_asn1.ph
+./usr/libdata/perl5/site_perl/zaurus-openbsd/kerberosV/heim_asn1.ph
+./usr/libdata/perl5/site_perl/zaurus-openbsd/kerberosV/krb5_asn1.ph
+./usr/libdata/perl5/site_perl/zaurus-openbsd/kerberosV/rfc2459_asn1.ph
+./usr/libdata/perl5/site_perl/zaurus-openbsd/openssl/asn1.ph
 ./usr/libexec/ld.so
 ./usr/libexec/sudo_noexec.so
 ./usr/local/libdata/perl5/site_perl/arm-openbsd
diff --git a/distrib/sets/lists/base/mi b/distrib/sets/lists/base/mi
index 8825a02f08a..81b0fa6ce91 100644
--- a/distrib/sets/lists/base/mi
+++ b/distrib/sets/lists/base/mi
@@ -281,7 +281,6 @@
 ./usr/bin/hoststat
 ./usr/bin/htdigest
 ./usr/bin/htpasswd
-./usr/bin/hxtool
 ./usr/bin/id
 ./usr/bin/ident
 ./usr/bin/indent
@@ -296,7 +295,6 @@
 ./usr/bin/ipcs
 ./usr/bin/join
 ./usr/bin/jot
-./usr/bin/kadmin
 ./usr/bin/kcc
 ./usr/bin/kdestroy
 ./usr/bin/kdump
@@ -306,7 +304,6 @@
 ./usr/bin/kinit
 ./usr/bin/klist
 ./usr/bin/krb5-config
-./usr/bin/ksu
 ./usr/bin/kswitch
 ./usr/bin/ktrace
 ./usr/bin/lam
@@ -2584,7 +2581,6 @@
 ./usr/libexec/cvs/contrib/rcslock
 ./usr/libexec/cvs/contrib/sccs2rcs
 ./usr/libexec/diff3prog
-./usr/libexec/digest-service
 ./usr/libexec/fingerd
 ./usr/libexec/ftpd
 ./usr/libexec/getty
@@ -2594,11 +2590,8 @@
 ./usr/libexec/ipropd-master
 ./usr/libexec/ipropd-slave
 ./usr/libexec/kadmind
-./usr/libexec/kcm
 ./usr/libexec/kdc
-./usr/libexec/kdigest
 ./usr/libexec/kfd
-./usr/libexec/kimpersonate
 ./usr/libexec/kpasswdd
 ./usr/libexec/locate.bigram
 ./usr/libexec/locate.code
@@ -2718,6 +2711,8 @@
 ./usr/sbin/iprop-log
 ./usr/sbin/iscsictl
 ./usr/sbin/iscsid
+./usr/sbin/kadmin
+./usr/sbin/kimpersonate
 ./usr/sbin/kstash
 ./usr/sbin/ktutil
 ./usr/sbin/kvm_mkdb
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 95c19420bd6..1cf4beb6dcd 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -964,18 +964,15 @@
 ./usr/include/kerberosV/cms_asn1.h
 ./usr/include/kerberosV/com_err.h
 ./usr/include/kerberosV/com_right.h
-./usr/include/kerberosV/crmf_asn1.h
 ./usr/include/kerberosV/der-private.h
 ./usr/include/kerberosV/der-protos.h
 ./usr/include/kerberosV/der.h
-./usr/include/kerberosV/digest_asn1.h
 ./usr/include/kerberosV/getarg.h
 ./usr/include/kerberosV/gssapi
 ./usr/include/kerberosV/gssapi.h
 ./usr/include/kerberosV/gssapi/gssapi.h
 ./usr/include/kerberosV/gssapi/gssapi_krb5.h
 ./usr/include/kerberosV/gssapi/gssapi_oid.h
-./usr/include/kerberosV/gssapi/gssapi_spnego.h
 ./usr/include/kerberosV/hdb-protos.h
 ./usr/include/kerberosV/hdb.h
 ./usr/include/kerberosV/hdb_asn1.h
@@ -984,13 +981,7 @@
 ./usr/include/kerberosV/heim_err.h
 ./usr/include/kerberosV/heim_threads.h
 ./usr/include/kerberosV/heimbase.h
-./usr/include/kerberosV/heimntlm-protos.h
-./usr/include/kerberosV/heimntlm.h
 ./usr/include/kerberosV/hex.h
-./usr/include/kerberosV/hx509-private.h
-./usr/include/kerberosV/hx509-protos.h
-./usr/include/kerberosV/hx509.h
-./usr/include/kerberosV/hx509_err.h
 ./usr/include/kerberosV/k524_err.h
 ./usr/include/kerberosV/kadm5
 ./usr/include/kerberosV/kadm5/admin.h
@@ -1015,17 +1006,9 @@
 ./usr/include/kerberosV/krb5_ccapi.h
 ./usr/include/kerberosV/krb5_err.h
 ./usr/include/kerberosV/krb_err.h
-./usr/include/kerberosV/kx509_asn1.h
-./usr/include/kerberosV/ntlm_err.h
-./usr/include/kerberosV/ocsp_asn1.h
 ./usr/include/kerberosV/parse_bytes.h
 ./usr/include/kerberosV/parse_time.h
 ./usr/include/kerberosV/parse_units.h
-./usr/include/kerberosV/pkcs10_asn1.h
-./usr/include/kerberosV/pkcs12_asn1.h
-./usr/include/kerberosV/pkcs8_asn1.h
-./usr/include/kerberosV/pkcs9_asn1.h
-./usr/include/kerberosV/pkinit_asn1.h
 ./usr/include/kerberosV/resolve.h
 ./usr/include/kerberosV/rfc2459_asn1.h
 ./usr/include/kerberosV/roken-common.h
@@ -1713,10 +1696,6 @@
 ./usr/lib/libhdb_p.a
 ./usr/lib/libheimbase.a
 ./usr/lib/libheimbase_p.a
-./usr/lib/libheimntlm.a
-./usr/lib/libheimntlm_p.a
-./usr/lib/libhx509.a
-./usr/lib/libhx509_p.a
 ./usr/lib/libiberty.a
 ./usr/lib/libiberty_p.a
 ./usr/lib/libkadm5clnt.a
@@ -4209,25 +4188,6 @@
 ./usr/share/man/man3/hdb_unlock.3
 ./usr/share/man/man3/hdestroy.3
 ./usr/share/man/man3/heapsort.3
-./usr/share/man/man3/heim_ntlm_build_ntlm1_master.3
-./usr/share/man/man3/heim_ntlm_build_ntlm2_master.3
-./usr/share/man/man3/heim_ntlm_calculate_lm2.3
-./usr/share/man/man3/heim_ntlm_calculate_ntlm1.3
-./usr/share/man/man3/heim_ntlm_calculate_ntlm2.3
-./usr/share/man/man3/heim_ntlm_decode_targetinfo.3
-./usr/share/man/man3/heim_ntlm_encode_targetinfo.3
-./usr/share/man/man3/heim_ntlm_encode_type1.3
-./usr/share/man/man3/heim_ntlm_encode_type2.3
-./usr/share/man/man3/heim_ntlm_encode_type3.3
-./usr/share/man/man3/heim_ntlm_free_buf.3
-./usr/share/man/man3/heim_ntlm_free_targetinfo.3
-./usr/share/man/man3/heim_ntlm_free_type1.3
-./usr/share/man/man3/heim_ntlm_free_type2.3
-./usr/share/man/man3/heim_ntlm_free_type3.3
-./usr/share/man/man3/heim_ntlm_keyex_unwrap.3
-./usr/share/man/man3/heim_ntlm_nt_key.3
-./usr/share/man/man3/heim_ntlm_ntlmv2_key.3
-./usr/share/man/man3/heim_ntlm_verify_ntlm2.3
 ./usr/share/man/man3/herror.3
 ./usr/share/man/man3/hid_dispose_report_desc.3
 ./usr/share/man/man3/hid_end_parse.3
@@ -4267,167 +4227,6 @@
 ./usr/share/man/man3/htole64.3
 ./usr/share/man/man3/htonl.3
 ./usr/share/man/man3/htons.3
-./usr/share/man/man3/hx509.3
-./usr/share/man/man3/hx509_bitstring_print.3
-./usr/share/man/man3/hx509_ca.3
-./usr/share/man/man3/hx509_ca_sign.3
-./usr/share/man/man3/hx509_ca_sign_self.3
-./usr/share/man/man3/hx509_ca_tbs_add_crl_dp_uri.3
-./usr/share/man/man3/hx509_ca_tbs_add_eku.3
-./usr/share/man/man3/hx509_ca_tbs_add_san_hostname.3
-./usr/share/man/man3/hx509_ca_tbs_add_san_jid.3
-./usr/share/man/man3/hx509_ca_tbs_add_san_ms_upn.3
-./usr/share/man/man3/hx509_ca_tbs_add_san_otherName.3
-./usr/share/man/man3/hx509_ca_tbs_add_san_pkinit.3
-./usr/share/man/man3/hx509_ca_tbs_add_san_rfc822name.3
-./usr/share/man/man3/hx509_ca_tbs_free.3
-./usr/share/man/man3/hx509_ca_tbs_init.3
-./usr/share/man/man3/hx509_ca_tbs_set_ca.3
-./usr/share/man/man3/hx509_ca_tbs_set_domaincontroller.3
-./usr/share/man/man3/hx509_ca_tbs_set_notAfter.3
-./usr/share/man/man3/hx509_ca_tbs_set_notAfter_lifetime.3
-./usr/share/man/man3/hx509_ca_tbs_set_notBefore.3
-./usr/share/man/man3/hx509_ca_tbs_set_proxy.3
-./usr/share/man/man3/hx509_ca_tbs_set_serialnumber.3
-./usr/share/man/man3/hx509_ca_tbs_set_spki.3
-./usr/share/man/man3/hx509_ca_tbs_set_subject.3
-./usr/share/man/man3/hx509_ca_tbs_set_template.3
-./usr/share/man/man3/hx509_ca_tbs_set_unique.3
-./usr/share/man/man3/hx509_ca_tbs_subject_expand.3
-./usr/share/man/man3/hx509_ca_tbs_template_units.3
-./usr/share/man/man3/hx509_cert.3
-./usr/share/man/man3/hx509_cert_binary.3
-./usr/share/man/man3/hx509_cert_check_eku.3
-./usr/share/man/man3/hx509_cert_cmp.3
-./usr/share/man/man3/hx509_cert_find_subjectAltName_otherName.3
-./usr/share/man/man3/hx509_cert_free.3
-./usr/share/man/man3/hx509_cert_get_SPKI.3
-./usr/share/man/man3/hx509_cert_get_SPKI_AlgorithmIdentifier.3
-./usr/share/man/man3/hx509_cert_get_attribute.3
-./usr/share/man/man3/hx509_cert_get_base_subject.3
-./usr/share/man/man3/hx509_cert_get_friendly_name.3
-./usr/share/man/man3/hx509_cert_get_issuer.3
-./usr/share/man/man3/hx509_cert_get_issuer_unique_id.3
-./usr/share/man/man3/hx509_cert_get_notAfter.3
-./usr/share/man/man3/hx509_cert_get_notBefore.3
-./usr/share/man/man3/hx509_cert_get_serialnumber.3
-./usr/share/man/man3/hx509_cert_get_subject.3
-./usr/share/man/man3/hx509_cert_get_subject_unique_id.3
-./usr/share/man/man3/hx509_cert_init.3
-./usr/share/man/man3/hx509_cert_init_data.3
-./usr/share/man/man3/hx509_cert_keyusage_print.3
-./usr/share/man/man3/hx509_cert_ref.3
-./usr/share/man/man3/hx509_cert_set_friendly_name.3
-./usr/share/man/man3/hx509_certs_add.3
-./usr/share/man/man3/hx509_certs_append.3
-./usr/share/man/man3/hx509_certs_end_seq.3
-./usr/share/man/man3/hx509_certs_filter.3
-./usr/share/man/man3/hx509_certs_find.3
-./usr/share/man/man3/hx509_certs_free.3
-./usr/share/man/man3/hx509_certs_info.3
-./usr/share/man/man3/hx509_certs_init.3
-./usr/share/man/man3/hx509_certs_iter_f.3
-./usr/share/man/man3/hx509_certs_merge.3
-./usr/share/man/man3/hx509_certs_next_cert.3
-./usr/share/man/man3/hx509_certs_start_seq.3
-./usr/share/man/man3/hx509_certs_store.3
-./usr/share/man/man3/hx509_ci_print_names.3
-./usr/share/man/man3/hx509_clear_error_string.3
-./usr/share/man/man3/hx509_cms.3
-./usr/share/man/man3/hx509_cms_create_signed_1.3
-./usr/share/man/man3/hx509_cms_envelope_1.3
-./usr/share/man/man3/hx509_cms_unenvelope.3
-./usr/share/man/man3/hx509_cms_unwrap_ContentInfo.3
-./usr/share/man/man3/hx509_cms_verify_signed.3
-./usr/share/man/man3/hx509_cms_wrap_ContentInfo.3
-./usr/share/man/man3/hx509_context_free.3
-./usr/share/man/man3/hx509_context_init.3
-./usr/share/man/man3/hx509_context_set_missing_revoke.3
-./usr/share/man/man3/hx509_crl_add_revoked_certs.3
-./usr/share/man/man3/hx509_crl_alloc.3
-./usr/share/man/man3/hx509_crl_free.3
-./usr/share/man/man3/hx509_crl_lifetime.3
-./usr/share/man/man3/hx509_crl_sign.3
-./usr/share/man/man3/hx509_crypto.3
-./usr/share/man/man3/hx509_env.3
-./usr/share/man/man3/hx509_env_add.3
-./usr/share/man/man3/hx509_env_add_binding.3
-./usr/share/man/man3/hx509_env_find.3
-./usr/share/man/man3/hx509_env_find_binding.3
-./usr/share/man/man3/hx509_env_free.3
-./usr/share/man/man3/hx509_env_lfind.3
-./usr/share/man/man3/hx509_err.3
-./usr/share/man/man3/hx509_error.3
-./usr/share/man/man3/hx509_free_error_string.3
-./usr/share/man/man3/hx509_free_octet_string_list.3
-./usr/share/man/man3/hx509_general_name_unparse.3
-./usr/share/man/man3/hx509_get_error_string.3
-./usr/share/man/man3/hx509_get_one_cert.3
-./usr/share/man/man3/hx509_keyset.3
-./usr/share/man/man3/hx509_lock.3
-./usr/share/man/man3/hx509_misc.3
-./usr/share/man/man3/hx509_name.3
-./usr/share/man/man3/hx509_name_binary.3
-./usr/share/man/man3/hx509_name_cmp.3
-./usr/share/man/man3/hx509_name_copy.3
-./usr/share/man/man3/hx509_name_expand.3
-./usr/share/man/man3/hx509_name_free.3
-./usr/share/man/man3/hx509_name_is_null_p.3
-./usr/share/man/man3/hx509_name_to_Name.3
-./usr/share/man/man3/hx509_name_to_string.3
-./usr/share/man/man3/hx509_ocsp_request.3
-./usr/share/man/man3/hx509_ocsp_verify.3
-./usr/share/man/man3/hx509_oid_print.3
-./usr/share/man/man3/hx509_oid_sprint.3
-./usr/share/man/man3/hx509_parse_name.3
-./usr/share/man/man3/hx509_peer.3
-./usr/share/man/man3/hx509_peer_info_add_cms_alg.3
-./usr/share/man/man3/hx509_peer_info_alloc.3
-./usr/share/man/man3/hx509_peer_info_free.3
-./usr/share/man/man3/hx509_peer_info_set_cert.3
-./usr/share/man/man3/hx509_peer_info_set_cms_algs.3
-./usr/share/man/man3/hx509_print.3
-./usr/share/man/man3/hx509_print_cert.3
-./usr/share/man/man3/hx509_print_stdout.3
-./usr/share/man/man3/hx509_query.3
-./usr/share/man/man3/hx509_query_alloc.3
-./usr/share/man/man3/hx509_query_free.3
-./usr/share/man/man3/hx509_query_match_cmp_func.3
-./usr/share/man/man3/hx509_query_match_eku.3
-./usr/share/man/man3/hx509_query_match_friendly_name.3
-./usr/share/man/man3/hx509_query_match_issuer_serial.3
-./usr/share/man/man3/hx509_query_match_option.3
-./usr/share/man/man3/hx509_query_statistic_file.3
-./usr/share/man/man3/hx509_query_unparse_stats.3
-./usr/share/man/man3/hx509_revoke.3
-./usr/share/man/man3/hx509_revoke_add_crl.3
-./usr/share/man/man3/hx509_revoke_add_ocsp.3
-./usr/share/man/man3/hx509_revoke_free.3
-./usr/share/man/man3/hx509_revoke_init.3
-./usr/share/man/man3/hx509_revoke_ocsp_print.3
-./usr/share/man/man3/hx509_revoke_verify.3
-./usr/share/man/man3/hx509_set_error_string.3
-./usr/share/man/man3/hx509_set_error_stringv.3
-./usr/share/man/man3/hx509_unparse_der_name.3
-./usr/share/man/man3/hx509_validate_cert.3
-./usr/share/man/man3/hx509_validate_ctx_add_flags.3
-./usr/share/man/man3/hx509_validate_ctx_free.3
-./usr/share/man/man3/hx509_validate_ctx_init.3
-./usr/share/man/man3/hx509_validate_ctx_set_print.3
-./usr/share/man/man3/hx509_verify.3
-./usr/share/man/man3/hx509_verify_attach_anchors.3
-./usr/share/man/man3/hx509_verify_attach_revoke.3
-./usr/share/man/man3/hx509_verify_ctx_f_allow_default_trustanchors.3
-./usr/share/man/man3/hx509_verify_destroy_ctx.3
-./usr/share/man/man3/hx509_verify_hostname.3
-./usr/share/man/man3/hx509_verify_init_ctx.3
-./usr/share/man/man3/hx509_verify_path.3
-./usr/share/man/man3/hx509_verify_set_max_depth.3
-./usr/share/man/man3/hx509_verify_set_proxy_certificate.3
-./usr/share/man/man3/hx509_verify_set_strict_rfc3280_verification.3
-./usr/share/man/man3/hx509_verify_set_time.3
-./usr/share/man/man3/hx509_verify_signature.3
-./usr/share/man/man3/hx509_xfree.3
 ./usr/share/man/man3/hypot.3
 ./usr/share/man/man3/hypotf.3
 ./usr/share/man/man3/hypotl.3
@@ -5492,11 +5291,6 @@
 ./usr/share/man/man3/noraw.3
 ./usr/share/man/man3/notimeout.3
 ./usr/share/man/man3/nrand48.3
-./usr/share/man/man3/ntlm_buf.3
-./usr/share/man/man3/ntlm_core.3
-./usr/share/man/man3/ntlm_type1.3
-./usr/share/man/man3/ntlm_type2.3
-./usr/share/man/man3/ntlm_type3.3
 ./usr/share/man/man3/ntoa.3
 ./usr/share/man/man3/ntohl.3
 ./usr/share/man/man3/ntohs.3
diff --git a/distrib/sets/lists/man/mi b/distrib/sets/lists/man/mi
index aebbcb88175..adf83da8804 100644
--- a/distrib/sets/lists/man/mi
+++ b/distrib/sets/lists/man/mi
@@ -2818,9 +2818,7 @@
 ./usr/share/man/man8/iscsid.8
 ./usr/share/man/man8/kadmin.8
 ./usr/share/man/man8/kadmind.8
-./usr/share/man/man8/kcm.8
 ./usr/share/man/man8/kdc.8
-./usr/share/man/man8/kdigest.8
 ./usr/share/man/man8/kerberos.8
 ./usr/share/man/man8/kfd.8
 ./usr/share/man/man8/kgmon.8