sync

22 files changed, 17 insertions, 42 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 3270e31e135..74a8786b1d2 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -91,7 +91,7 @@
 ./usr/lib/libasn1.so.18.0
 ./usr/lib/libc.so.66.1
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.21.0
+./usr/lib/libcrypto.so.22.0
 ./usr/lib/libcurses.so.12.1
 ./usr/lib/libedit.so.4.1
 ./usr/lib/libevent.so.3.1
@@ -2064,7 +2064,6 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/ocurses.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/ohash.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl
-./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/acss.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/aes.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/asn1.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/asn1_mac.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 2a7088abf7f..07228c79e9a 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -97,7 +97,7 @@
 ./usr/lib/libasn1.so.18.0
 ./usr/lib/libc.so.66.1
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.21.0
+./usr/lib/libcrypto.so.22.0
 ./usr/lib/libcurses.so.12.1
 ./usr/lib/libedit.so.4.1
 ./usr/lib/libevent.so.3.1
@@ -2094,7 +2094,6 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/ocurses.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/ohash.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl
-./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/acss.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/aes.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/asn1.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/asn1_mac.ph
diff --git a/distrib/sets/lists/base/md.armish b/distrib/sets/lists/base/md.armish
index 387e758f8b6..3cfb699db1b 100644
--- a/distrib/sets/lists/base/md.armish
+++ b/distrib/sets/lists/base/md.armish
@@ -63,7 +63,7 @@
 ./usr/lib/libasn1.so.18.0
 ./usr/lib/libc.so.66.1
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.21.0
+./usr/lib/libcrypto.so.22.0
 ./usr/lib/libcurses.so.12.1
 ./usr/lib/libedit.so.4.1
 ./usr/lib/libevent.so.3.1
@@ -2078,7 +2078,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/ocurses.ph
 ./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/acss.ph
 ./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
diff --git a/distrib/sets/lists/base/md.aviion b/distrib/sets/lists/base/md.aviion
index 36b5286fe15..e08c3d46814 100644
--- a/distrib/sets/lists/base/md.aviion
+++ b/distrib/sets/lists/base/md.aviion
@@ -1965,7 +1965,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/ocurses.ph
 ./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/acss.ph
 ./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
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index 3f1431f9e80..4641b14a77b 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -30,7 +30,7 @@
 ./usr/lib/libasn1.so.18.0
 ./usr/lib/libc.so.66.1
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.21.0
+./usr/lib/libcrypto.so.22.0
 ./usr/lib/libcurses.so.12.1
 ./usr/lib/libedit.so.4.1
 ./usr/lib/libevent.so.3.1
@@ -1943,7 +1943,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/ocurses.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/ohash.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl
-./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/acss.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/aes.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/asn1.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/asn1_mac.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index de8be216f3f..26bd6fdfec8 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -92,7 +92,7 @@
 ./usr/lib/libasn1.so.18.0
 ./usr/lib/libc.so.66.1
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.21.0
+./usr/lib/libcrypto.so.22.0
 ./usr/lib/libcurses.so.12.1
 ./usr/lib/libedit.so.4.1
 ./usr/lib/libevent.so.3.1
@@ -2065,7 +2065,6 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/ocurses.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/ohash.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl
-./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/acss.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/aes.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/asn1.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/asn1_mac.ph
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index 3b901f6e822..3bd5e213e97 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -93,7 +93,7 @@
 ./usr/lib/libasn1.so.18.0
 ./usr/lib/libc.so.66.1
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.21.0
+./usr/lib/libcrypto.so.22.0
 ./usr/lib/libcurses.so.12.1
 ./usr/lib/libedit.so.4.1
 ./usr/lib/libevent.so.3.1
@@ -1996,7 +1996,6 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/ocurses.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/ohash.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl
-./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/acss.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/aes.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/asn1.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/asn1_mac.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index dafada09d4f..f13306a552a 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -99,7 +99,7 @@
 ./usr/lib/libasn1.so.18.0
 ./usr/lib/libc.so.66.1
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.21.0
+./usr/lib/libcrypto.so.22.0
 ./usr/lib/libcurses.so.12.1
 ./usr/lib/libedit.so.4.1
 ./usr/lib/libevent.so.3.1
@@ -2099,7 +2099,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/ocurses.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/ohash.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl
-./usr/libdata/perl5/site_perl/i386-openbsd/openssl/acss.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/aes.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/asn1.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/asn1_mac.ph
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index 04b9e20793e..3a3a38395e6 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -53,7 +53,7 @@
 ./usr/lib/libasn1.so.18.0
 ./usr/lib/libc.so.66.1
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.21.0
+./usr/lib/libcrypto.so.22.0
 ./usr/lib/libcurses.so.12.1
 ./usr/lib/libedit.so.4.1
 ./usr/lib/libevent.so.3.1
@@ -2017,7 +2017,6 @@
 ./usr/libdata/perl5/site_perl/sh-openbsd/ocurses.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/ohash.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl
-./usr/libdata/perl5/site_perl/sh-openbsd/openssl/acss.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/aes.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/asn1.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/asn1_mac.ph
diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson
index a0e5622b86d..c92a0ecb67d 100644
--- a/distrib/sets/lists/base/md.loongson
+++ b/distrib/sets/lists/base/md.loongson
@@ -59,7 +59,7 @@
 ./usr/lib/libasn1.so.18.0
 ./usr/lib/libc.so.66.1
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.21.0
+./usr/lib/libcrypto.so.22.0
 ./usr/lib/libcurses.so.12.1
 ./usr/lib/libedit.so.4.1
 ./usr/lib/libevent.so.3.1
@@ -2078,7 +2078,6 @@
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/ocurses.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/ohash.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl
-./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/acss.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/aes.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/asn1.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/asn1_mac.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index 1a0d1ebda68..6f78d9e49f9 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -1820,7 +1820,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/ocurses.ph
 ./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/acss.ph
 ./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
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 5087f51161a..7b65b804c3f 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -94,7 +94,7 @@
 ./usr/lib/libasn1.so.18.0
 ./usr/lib/libc.so.66.1
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.21.0
+./usr/lib/libcrypto.so.22.0
 ./usr/lib/libcurses.so.12.1
 ./usr/lib/libedit.so.4.1
 ./usr/lib/libevent.so.3.1
@@ -2067,7 +2067,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/ocurses.ph
 ./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/acss.ph
 ./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
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index f85b464b33d..466b6572f89 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -28,7 +28,7 @@
 ./usr/lib/libasn1.so.18.0
 ./usr/lib/libc.so.66.1
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.21.0
+./usr/lib/libcrypto.so.22.0
 ./usr/lib/libcurses.so.12.1
 ./usr/lib/libedit.so.4.1
 ./usr/lib/libevent.so.3.1
@@ -1943,7 +1943,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/ocurses.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/ohash.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl
-./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/acss.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/aes.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/asn1.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/asn1_mac.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index 9a876616b1e..b697ec186ac 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -1970,7 +1970,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/ocurses.ph
 ./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/acss.ph
 ./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
diff --git a/distrib/sets/lists/base/md.palm b/distrib/sets/lists/base/md.palm
index edbe5fbf99a..709cd69d116 100644
--- a/distrib/sets/lists/base/md.palm
+++ b/distrib/sets/lists/base/md.palm
@@ -60,7 +60,7 @@
 ./usr/lib/libasn1.so.18.0
 ./usr/lib/libc.so.66.1
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.21.0
+./usr/lib/libcrypto.so.22.0
 ./usr/lib/libcurses.so.12.1
 ./usr/lib/libedit.so.4.1
 ./usr/lib/libevent.so.3.1
@@ -2031,7 +2031,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/ocurses.ph
 ./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/acss.ph
 ./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
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 66f02c15dd0..19cd15efc3e 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -89,7 +89,7 @@
 ./usr/lib/libasn1.so.18.0
 ./usr/lib/libc.so.66.1
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.21.0
+./usr/lib/libcrypto.so.22.0
 ./usr/lib/libcurses.so.12.1
 ./usr/lib/libedit.so.4.1
 ./usr/lib/libevent.so.3.1
@@ -2056,7 +2056,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/ocurses.ph
 ./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/acss.ph
 ./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
diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc
index 41b4f136d8d..9a7f86542a5 100644
--- a/distrib/sets/lists/base/md.socppc
+++ b/distrib/sets/lists/base/md.socppc
@@ -86,7 +86,7 @@
 ./usr/lib/libasn1.so.18.0
 ./usr/lib/libc.so.66.1
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.21.0
+./usr/lib/libcrypto.so.22.0
 ./usr/lib/libcurses.so.12.1
 ./usr/lib/libedit.so.4.1
 ./usr/lib/libevent.so.3.1
@@ -2006,7 +2006,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/ocurses.ph
 ./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/acss.ph
 ./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
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 9d2634d4ebf..1adeca538bb 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -34,7 +34,7 @@
 ./usr/lib/libasn1.so.18.0
 ./usr/lib/libc.so.66.1
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.21.0
+./usr/lib/libcrypto.so.22.0
 ./usr/lib/libcurses.so.12.1
 ./usr/lib/libedit.so.4.1
 ./usr/lib/libevent.so.3.1
@@ -1368,7 +1368,6 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/ocurses.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/ohash.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl
-./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/acss.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/aes.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/asn1.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/asn1_mac.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 80cfa7ce42c..adc7efcd710 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -94,7 +94,7 @@
 ./usr/lib/libasn1.so.18.0
 ./usr/lib/libc.so.66.1
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.21.0
+./usr/lib/libcrypto.so.22.0
 ./usr/lib/libcurses.so.12.1
 ./usr/lib/libedit.so.4.1
 ./usr/lib/libevent.so.3.1
@@ -1428,7 +1428,6 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/ocurses.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/ohash.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl
-./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/acss.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/aes.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/asn1.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/asn1_mac.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 3d6b8f455c0..b8eddae5e08 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -1216,7 +1216,6 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/ocurses.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/ohash.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl
-./usr/libdata/perl5/site_perl/vax-openbsd/openssl/acss.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/aes.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/asn1.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/asn1_mac.ph
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index b98a52c61a8..b391d6ac725 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -61,7 +61,7 @@
 ./usr/lib/libasn1.so.18.0
 ./usr/lib/libc.so.66.1
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.21.0
+./usr/lib/libcrypto.so.22.0
 ./usr/lib/libcurses.so.12.1
 ./usr/lib/libedit.so.4.1
 ./usr/lib/libevent.so.3.1
@@ -2032,7 +2032,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/ocurses.ph
 ./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/acss.ph
 ./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
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index c0e1c71be45..e52d7c7b592 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1173,7 +1173,6 @@
 ./usr/include/ocurses.h
 ./usr/include/ohash.h
 ./usr/include/openssl
-./usr/include/openssl/acss.h
 ./usr/include/openssl/aes.h
 ./usr/include/openssl/asn1.h
 ./usr/include/openssl/asn1_mac.h
@@ -3132,8 +3131,6 @@
 ./usr/share/man/man3/acoshf.3
 ./usr/share/man/man3/acoshl.3
 ./usr/share/man/man3/acosl.3
-./usr/share/man/man3/acss.3
-./usr/share/man/man3/acss_setkey.3
 ./usr/share/man/man3/add_wch.3
 ./usr/share/man/man3/add_wchnstr.3
 ./usr/share/man/man3/add_wchstr.3
@@ -6874,7 +6871,6 @@
 ./usr/share/man/man9/uiomove.9
 ./usr/share/man/man9/ulmax.9
 ./usr/share/man/man9/ulmin.9
-./usr/share/man/man9/untimeout.9
 ./usr/share/man/man9/uprintf.9
 ./usr/share/man/man9/uvm.9
 ./usr/share/man/man9/uvm_chgkprot.9