sync

19 files changed, 36 insertions, 55 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index c706ce18446..7d8725a0fb9 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -70,7 +70,7 @@
 ./usr/lib/libasn1.so.20.0
 ./usr/lib/libc.so.74.0
 ./usr/lib/libcom_err.so.20.0
-./usr/lib/libcrypto.so.23.0
+./usr/lib/libcrypto.so.23.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.0
 ./usr/lib/libevent.so.4.1
@@ -109,7 +109,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.21.0
+./usr/lib/libssl.so.22.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
@@ -1995,7 +1995,6 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/dsa.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/dso.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/dtls1.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/e_os.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/e_os2.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/ebcdic.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/ec.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index 3b919268192..c3be1b791b0 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -76,7 +76,7 @@
 ./usr/lib/libasn1.so.20.0
 ./usr/lib/libc.so.74.0
 ./usr/lib/libcom_err.so.20.0
-./usr/lib/libcrypto.so.23.0
+./usr/lib/libcrypto.so.23.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.0
 ./usr/lib/libevent.so.4.1
@@ -115,7 +115,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.21.0
+./usr/lib/libssl.so.22.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
@@ -2024,7 +2024,6 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/dsa.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/dso.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/dtls1.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/e_os.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/e_os2.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/ebcdic.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/ec.ph
diff --git a/distrib/sets/lists/base/md.armish b/distrib/sets/lists/base/md.armish
index d116c0deca7..a3df43f7c69 100644
--- a/distrib/sets/lists/base/md.armish
+++ b/distrib/sets/lists/base/md.armish
@@ -43,7 +43,7 @@
 ./usr/lib/libasn1.so.20.0
 ./usr/lib/libc.so.74.0
 ./usr/lib/libcom_err.so.20.0
-./usr/lib/libcrypto.so.23.0
+./usr/lib/libcrypto.so.23.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.0
 ./usr/lib/libevent.so.4.1
@@ -82,7 +82,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.21.0
+./usr/lib/libssl.so.22.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
@@ -2010,7 +2010,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/dsa.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/dso.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/dtls1.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/openssl/e_os.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/e_os2.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/ebcdic.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/ec.ph
diff --git a/distrib/sets/lists/base/md.armv7 b/distrib/sets/lists/base/md.armv7
index 3f539a0583f..b21bb6f09fd 100644
--- a/distrib/sets/lists/base/md.armv7
+++ b/distrib/sets/lists/base/md.armv7
@@ -12,7 +12,7 @@
 ./usr/lib/libasn1.so.20.0
 ./usr/lib/libc.so.74.0
 ./usr/lib/libcom_err.so.20.0
-./usr/lib/libcrypto.so.23.0
+./usr/lib/libcrypto.so.23.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.0
 ./usr/lib/libevent.so.4.1
@@ -51,7 +51,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.21.0
+./usr/lib/libssl.so.22.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
@@ -1982,7 +1982,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/dsa.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/dso.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/dtls1.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/openssl/e_os.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/e_os2.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/ebcdic.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/ec.ph
diff --git a/distrib/sets/lists/base/md.aviion b/distrib/sets/lists/base/md.aviion
index 1bd21e97b5b..43bed8a9442 100644
--- a/distrib/sets/lists/base/md.aviion
+++ b/distrib/sets/lists/base/md.aviion
@@ -7,7 +7,7 @@
 ./usr/lib/libasn1.so.20.0
 ./usr/lib/libc.so.74.0
 ./usr/lib/libcom_err.so.20.0
-./usr/lib/libcrypto.so.23.0
+./usr/lib/libcrypto.so.23.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.0
 ./usr/lib/libevent.so.4.1
@@ -46,7 +46,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.21.0
+./usr/lib/libssl.so.22.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
@@ -1908,7 +1908,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/dsa.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/dso.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/dtls1.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/e_os.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/e_os2.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/ebcdic.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/ec.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index cb706dcb6a9..cfbe2b23cd3 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -72,7 +72,7 @@
 ./usr/lib/libasn1.so.20.0
 ./usr/lib/libc.so.74.0
 ./usr/lib/libcom_err.so.20.0
-./usr/lib/libcrypto.so.23.0
+./usr/lib/libcrypto.so.23.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.0
 ./usr/lib/libevent.so.4.1
@@ -111,7 +111,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.21.0
+./usr/lib/libssl.so.22.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
@@ -1997,7 +1997,6 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/dsa.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/dso.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/dtls1.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/e_os.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/e_os2.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/ebcdic.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/ec.ph
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index f3c97e5bd7a..919ec6b3467 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -73,7 +73,7 @@
 ./usr/lib/libasn1.so.20.0
 ./usr/lib/libc.so.74.0
 ./usr/lib/libcom_err.so.20.0
-./usr/lib/libcrypto.so.23.0
+./usr/lib/libcrypto.so.23.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.0
 ./usr/lib/libevent.so.4.1
@@ -112,7 +112,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.21.0
+./usr/lib/libssl.so.22.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
@@ -1927,7 +1927,6 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/dsa.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/dso.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/dtls1.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/e_os.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/e_os2.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/ebcdic.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/ec.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 560b1d073b5..b11a812657f 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -78,7 +78,7 @@
 ./usr/lib/libasn1.so.20.0
 ./usr/lib/libc.so.74.0
 ./usr/lib/libcom_err.so.20.0
-./usr/lib/libcrypto.so.23.0
+./usr/lib/libcrypto.so.23.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.0
 ./usr/lib/libevent.so.4.1
@@ -117,7 +117,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.21.0
+./usr/lib/libssl.so.22.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
@@ -2030,7 +2030,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/dsa.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/dso.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/dtls1.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/openssl/e_os.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/e_os2.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/ebcdic.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/ec.ph
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index 81be33856ea..581d63b8841 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -33,7 +33,7 @@
 ./usr/lib/libasn1.so.20.0
 ./usr/lib/libc.so.74.0
 ./usr/lib/libcom_err.so.20.0
-./usr/lib/libcrypto.so.23.0
+./usr/lib/libcrypto.so.23.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.0
 ./usr/lib/libevent.so.4.1
@@ -72,7 +72,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.21.0
+./usr/lib/libssl.so.22.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
@@ -1949,7 +1949,6 @@
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/dsa.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/dso.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/dtls1.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/openssl/e_os.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/e_os2.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/ebcdic.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/ec.ph
diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson
index 0f5e8dd4dbf..c988789baf5 100644
--- a/distrib/sets/lists/base/md.loongson
+++ b/distrib/sets/lists/base/md.loongson
@@ -39,7 +39,7 @@
 ./usr/lib/libasn1.so.20.0
 ./usr/lib/libc.so.74.0
 ./usr/lib/libcom_err.so.20.0
-./usr/lib/libcrypto.so.23.0
+./usr/lib/libcrypto.so.23.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.0
 ./usr/lib/libevent.so.4.1
@@ -78,7 +78,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.21.0
+./usr/lib/libssl.so.22.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
@@ -2011,7 +2011,6 @@
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/dsa.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/dso.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/dtls1.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/e_os.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/e_os2.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/ebcdic.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/ec.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index 7d5ea9f0b7d..bcad34e9ee3 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -9,7 +9,7 @@
 ./usr/lib/libasn1.so.20.0
 ./usr/lib/libc.so.74.0
 ./usr/lib/libcom_err.so.20.0
-./usr/lib/libcrypto.so.23.0
+./usr/lib/libcrypto.so.23.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.0
 ./usr/lib/libevent.so.4.1
@@ -48,7 +48,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.21.0
+./usr/lib/libssl.so.22.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
@@ -1906,7 +1906,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/dsa.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/dso.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/dtls1.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/e_os.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/e_os2.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/ebcdic.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/ec.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index e42e8d3de36..eabba951e18 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -73,7 +73,7 @@
 ./usr/lib/libasn1.so.20.0
 ./usr/lib/libc.so.74.0
 ./usr/lib/libcom_err.so.20.0
-./usr/lib/libcrypto.so.23.0
+./usr/lib/libcrypto.so.23.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.0
 ./usr/lib/libevent.so.4.1
@@ -112,7 +112,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.21.0
+./usr/lib/libssl.so.22.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
@@ -1998,7 +1998,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/dsa.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/dso.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/dtls1.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/e_os.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/e_os2.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/ebcdic.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/ec.ph
diff --git a/distrib/sets/lists/base/md.octeon b/distrib/sets/lists/base/md.octeon
index 19daf498bae..2ca493e550f 100644
--- a/distrib/sets/lists/base/md.octeon
+++ b/distrib/sets/lists/base/md.octeon
@@ -3,7 +3,7 @@
 ./usr/lib/libasn1.so.20.0
 ./usr/lib/libc.so.74.0
 ./usr/lib/libcom_err.so.20.0
-./usr/lib/libcrypto.so.23.0
+./usr/lib/libcrypto.so.23.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.0
 ./usr/lib/libevent.so.4.1
@@ -42,7 +42,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.21.0
+./usr/lib/libssl.so.22.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
@@ -1973,7 +1973,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/dsa.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/dso.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/dtls1.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/e_os.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/e_os2.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/ebcdic.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/ec.ph
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 95d73fcc10d..ed718f2d3bf 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -68,7 +68,7 @@
 ./usr/lib/libasn1.so.20.0
 ./usr/lib/libc.so.74.0
 ./usr/lib/libcom_err.so.20.0
-./usr/lib/libcrypto.so.23.0
+./usr/lib/libcrypto.so.23.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.0
 ./usr/lib/libevent.so.4.1
@@ -107,7 +107,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.21.0
+./usr/lib/libssl.so.22.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
@@ -1986,7 +1986,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/dsa.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/dso.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/dtls1.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/e_os.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/e_os2.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/ebcdic.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/ec.ph
diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc
index 307d553394b..e5238d92d5b 100644
--- a/distrib/sets/lists/base/md.socppc
+++ b/distrib/sets/lists/base/md.socppc
@@ -66,7 +66,7 @@
 ./usr/lib/libasn1.so.20.0
 ./usr/lib/libc.so.74.0
 ./usr/lib/libcom_err.so.20.0
-./usr/lib/libcrypto.so.23.0
+./usr/lib/libcrypto.so.23.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.0
 ./usr/lib/libevent.so.4.1
@@ -105,7 +105,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.21.0
+./usr/lib/libssl.so.22.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
@@ -1938,7 +1938,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/dsa.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/dso.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/dtls1.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/e_os.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/e_os2.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/ebcdic.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/ec.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 2e5498a6321..d64f95d34fa 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -14,7 +14,7 @@
 ./usr/lib/libasn1.so.20.0
 ./usr/lib/libc.so.74.0
 ./usr/lib/libcom_err.so.20.0
-./usr/lib/libcrypto.so.23.0
+./usr/lib/libcrypto.so.23.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.0
 ./usr/lib/libevent.so.4.1
@@ -53,7 +53,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.21.0
+./usr/lib/libssl.so.22.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
@@ -1422,7 +1422,6 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/dsa.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/dso.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/dtls1.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/e_os.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/e_os2.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/ebcdic.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/ec.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 961056ecd27..c066df5b736 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -74,7 +74,7 @@
 ./usr/lib/libasn1.so.20.0
 ./usr/lib/libc.so.74.0
 ./usr/lib/libcom_err.so.20.0
-./usr/lib/libcrypto.so.23.0
+./usr/lib/libcrypto.so.23.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.0
 ./usr/lib/libevent.so.4.1
@@ -113,7 +113,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.21.0
+./usr/lib/libssl.so.22.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
@@ -1482,7 +1482,6 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/dsa.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/dso.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/dtls1.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/e_os.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/e_os2.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/ebcdic.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/ec.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index a5c51ab83ea..f0d08c5422f 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -1298,7 +1298,6 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/dsa.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/dso.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/dtls1.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/openssl/e_os.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/e_os2.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/ebcdic.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/ec.ph
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index e9b145bc792..2ca5f4f01e6 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -41,7 +41,7 @@
 ./usr/lib/libasn1.so.20.0
 ./usr/lib/libc.so.74.0
 ./usr/lib/libcom_err.so.20.0
-./usr/lib/libcrypto.so.23.0
+./usr/lib/libcrypto.so.23.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.0
 ./usr/lib/libevent.so.4.1
@@ -80,7 +80,7 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.27.0
-./usr/lib/libssl.so.21.0
+./usr/lib/libssl.so.22.0
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
@@ -1964,7 +1964,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/dsa.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/dso.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/dtls1.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/openssl/e_os.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/e_os2.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/ebcdic.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/ec.ph