sync

20 files changed, 76 insertions, 54 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 308489d5b27..6f80bc55905 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -62,7 +62,7 @@
 ./sbin/mount_ntfs
 ./sbin/wsconsctl
 ./usr/lib/libc.so.84.0
-./usr/lib/libcrypto.so.36.0
+./usr/lib/libcrypto.so.36.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.2
 ./usr/lib/libevent.so.4.1
@@ -92,11 +92,11 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.31.0
-./usr/lib/libssl.so.37.0
+./usr/lib/libssl.so.37.1
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
-./usr/lib/libtls.so.9.0
+./usr/lib/libtls.so.9.1
 ./usr/lib/libusbhid.so.7.0
 ./usr/lib/libutil.so.12.1
 ./usr/lib/libz.so.5.0
@@ -575,6 +575,7 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/crypto/cast.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/crypto/castsb.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/crypto/chacha_private.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/crypto/chachapoly.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/crypto/cmac.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/crypto/cryptodev.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/crypto/cryptosoft.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index e06f0a4cb75..c03d3bf7a3b 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -68,7 +68,7 @@
 ./sbin/wsconsctl
 ./usr/bin/pctr
 ./usr/lib/libc.so.84.0
-./usr/lib/libcrypto.so.36.0
+./usr/lib/libcrypto.so.36.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.2
 ./usr/lib/libevent.so.4.1
@@ -98,11 +98,11 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.31.0
-./usr/lib/libssl.so.37.0
+./usr/lib/libssl.so.37.1
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
-./usr/lib/libtls.so.9.0
+./usr/lib/libtls.so.9.1
 ./usr/lib/libusbhid.so.7.0
 ./usr/lib/libutil.so.12.1
 ./usr/lib/libz.so.5.0
@@ -604,6 +604,7 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/crypto/cast.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/crypto/castsb.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/crypto/chacha_private.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/crypto/chachapoly.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/crypto/cmac.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/crypto/cryptodev.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/crypto/cryptosoft.ph
diff --git a/distrib/sets/lists/base/md.armish b/distrib/sets/lists/base/md.armish
index 55cad491928..5ed20cd0d85 100644
--- a/distrib/sets/lists/base/md.armish
+++ b/distrib/sets/lists/base/md.armish
@@ -35,7 +35,7 @@
 ./sbin/kbd
 ./sbin/wsconsctl
 ./usr/lib/libc.so.84.0
-./usr/lib/libcrypto.so.36.0
+./usr/lib/libcrypto.so.36.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.2
 ./usr/lib/libevent.so.4.1
@@ -65,11 +65,11 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.31.0
-./usr/lib/libssl.so.37.0
+./usr/lib/libssl.so.37.1
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
-./usr/lib/libtls.so.9.0
+./usr/lib/libtls.so.9.1
 ./usr/lib/libusbhid.so.7.0
 ./usr/lib/libutil.so.12.1
 ./usr/lib/libz.so.5.0
@@ -589,6 +589,7 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/crypto/cast.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/crypto/castsb.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/crypto/chacha_private.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/crypto/chachapoly.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/crypto/cmac.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/crypto/cryptodev.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/crypto/cryptosoft.ph
diff --git a/distrib/sets/lists/base/md.armv7 b/distrib/sets/lists/base/md.armv7
index 979cb35a908..6b83138af48 100644
--- a/distrib/sets/lists/base/md.armv7
+++ b/distrib/sets/lists/base/md.armv7
@@ -30,7 +30,7 @@
 ./sbin/kbd
 ./sbin/wsconsctl
 ./usr/lib/libc.so.84.0
-./usr/lib/libcrypto.so.36.0
+./usr/lib/libcrypto.so.36.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.2
 ./usr/lib/libevent.so.4.1
@@ -60,11 +60,11 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.31.0
-./usr/lib/libssl.so.37.0
+./usr/lib/libssl.so.37.1
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
-./usr/lib/libtls.so.9.0
+./usr/lib/libtls.so.9.1
 ./usr/lib/libusbhid.so.7.0
 ./usr/lib/libutil.so.12.1
 ./usr/lib/libz.so.5.0
@@ -587,6 +587,7 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/crypto/cast.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/crypto/castsb.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/crypto/chacha_private.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/crypto/chachapoly.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/crypto/cmac.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/crypto/cryptodev.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/crypto/cryptosoft.ph
diff --git a/distrib/sets/lists/base/md.aviion b/distrib/sets/lists/base/md.aviion
index f225f5e944e..158e76b9ab5 100644
--- a/distrib/sets/lists/base/md.aviion
+++ b/distrib/sets/lists/base/md.aviion
@@ -1,5 +1,5 @@
 ./usr/lib/libc.so.84.0
-./usr/lib/libcrypto.so.36.0
+./usr/lib/libcrypto.so.36.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.2
 ./usr/lib/libevent.so.4.1
@@ -29,11 +29,11 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.31.0
-./usr/lib/libssl.so.37.0
+./usr/lib/libssl.so.37.1
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
-./usr/lib/libtls.so.9.0
+./usr/lib/libtls.so.9.1
 ./usr/lib/libusbhid.so.7.0
 ./usr/lib/libutil.so.12.1
 ./usr/lib/libz.so.5.0
@@ -513,6 +513,7 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/crypto/cast.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/crypto/castsb.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/crypto/chacha_private.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/crypto/chachapoly.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/crypto/cmac.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/crypto/cryptodev.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/crypto/cryptosoft.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index c4ace90386a..ef2b1d1bd20 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -64,7 +64,7 @@
 ./sbin/kbd
 ./sbin/wsconsctl
 ./usr/lib/libc.so.84.0
-./usr/lib/libcrypto.so.36.0
+./usr/lib/libcrypto.so.36.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.2
 ./usr/lib/libevent.so.4.1
@@ -94,11 +94,11 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.31.0
-./usr/lib/libssl.so.37.0
+./usr/lib/libssl.so.37.1
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
-./usr/lib/libtls.so.9.0
+./usr/lib/libtls.so.9.1
 ./usr/lib/libusbhid.so.7.0
 ./usr/lib/libutil.so.12.1
 ./usr/lib/libz.so.5.0
@@ -523,6 +523,7 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/crypto/cast.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/crypto/castsb.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/crypto/chacha_private.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/crypto/chachapoly.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/crypto/cmac.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/crypto/cryptodev.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/crypto/cryptosoft.ph
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index f4ef5a380c7..b507d3c8824 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -64,7 +64,7 @@
 ./sbin/kbd
 ./sbin/wsconsctl
 ./usr/lib/libc.so.84.0
-./usr/lib/libcrypto.so.36.0
+./usr/lib/libcrypto.so.36.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.2
 ./usr/lib/libevent.so.4.1
@@ -94,11 +94,11 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.31.0
-./usr/lib/libssl.so.37.0
+./usr/lib/libssl.so.37.1
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
-./usr/lib/libtls.so.9.0
+./usr/lib/libtls.so.9.1
 ./usr/lib/libusbhid.so.7.0
 ./usr/lib/libutil.so.12.1
 ./usr/lib/libz.so.5.0
@@ -523,6 +523,7 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/crypto/cast.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/crypto/castsb.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/crypto/chacha_private.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/crypto/chachapoly.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/crypto/cmac.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/crypto/cryptodev.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/crypto/cryptosoft.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index d97259dd8ad..90973b5e374 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -70,7 +70,7 @@
 ./sbin/wsconsctl
 ./usr/bin/pctr
 ./usr/lib/libc.so.84.0
-./usr/lib/libcrypto.so.36.0
+./usr/lib/libcrypto.so.36.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.2
 ./usr/lib/libevent.so.4.1
@@ -100,11 +100,11 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.31.0
-./usr/lib/libssl.so.37.0
+./usr/lib/libssl.so.37.1
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
-./usr/lib/libtls.so.9.0
+./usr/lib/libtls.so.9.1
 ./usr/lib/libusbhid.so.7.0
 ./usr/lib/libutil.so.12.1
 ./usr/lib/libz.so.5.0
@@ -530,6 +530,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/crypto/cast.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/crypto/castsb.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/crypto/chacha_private.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/crypto/chachapoly.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/crypto/cmac.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/crypto/cryptodev.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/crypto/cryptosoft.ph
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index 424da2c9352..9f66dbb6c34 100644
--- a/distrib/sets/lists/base/md.landisk
+++ b/distrib/sets/lists/base/md.landisk
@@ -30,7 +30,7 @@
 ./sbin/kbd
 ./sbin/wsconsctl
 ./usr/lib/libc.so.84.0
-./usr/lib/libcrypto.so.36.0
+./usr/lib/libcrypto.so.36.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.2
 ./usr/lib/libevent.so.4.1
@@ -60,11 +60,11 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.31.0
-./usr/lib/libssl.so.37.0
+./usr/lib/libssl.so.37.1
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
-./usr/lib/libtls.so.9.0
+./usr/lib/libtls.so.9.1
 ./usr/lib/libusbhid.so.7.0
 ./usr/lib/libutil.so.12.1
 ./usr/lib/libz.so.5.0
@@ -489,6 +489,7 @@
 ./usr/libdata/perl5/site_perl/sh-openbsd/crypto/cast.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/crypto/castsb.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/crypto/chacha_private.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/crypto/chachapoly.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/crypto/cmac.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/crypto/cryptodev.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/crypto/cryptosoft.ph
diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson
index c5a0f6cd074..a46d3ec3e44 100644
--- a/distrib/sets/lists/base/md.loongson
+++ b/distrib/sets/lists/base/md.loongson
@@ -35,7 +35,7 @@
 ./sbin/kbd
 ./sbin/wsconsctl
 ./usr/lib/libc.so.84.0
-./usr/lib/libcrypto.so.36.0
+./usr/lib/libcrypto.so.36.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.2
 ./usr/lib/libevent.so.4.1
@@ -65,11 +65,11 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.31.0
-./usr/lib/libssl.so.37.0
+./usr/lib/libssl.so.37.1
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
-./usr/lib/libtls.so.9.0
+./usr/lib/libtls.so.9.1
 ./usr/lib/libusbhid.so.7.0
 ./usr/lib/libutil.so.12.1
 ./usr/lib/libz.so.5.0
@@ -494,6 +494,7 @@
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/crypto/cast.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/crypto/castsb.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/crypto/chacha_private.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/crypto/chachapoly.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/crypto/cmac.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/crypto/cryptodev.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/crypto/cryptosoft.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index 8ea1c407568..9a14629a62e 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -2,7 +2,7 @@
 ./sbin/kbd
 ./sbin/wsconsctl
 ./usr/lib/libc.so.84.0
-./usr/lib/libcrypto.so.36.0
+./usr/lib/libcrypto.so.36.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.2
 ./usr/lib/libevent.so.4.1
@@ -32,11 +32,11 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.31.0
-./usr/lib/libssl.so.37.0
+./usr/lib/libssl.so.37.1
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
-./usr/lib/libtls.so.9.0
+./usr/lib/libtls.so.9.1
 ./usr/lib/libusbhid.so.7.0
 ./usr/lib/libutil.so.12.1
 ./usr/lib/libz.so.5.0
@@ -461,6 +461,7 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/crypto/cast.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/crypto/castsb.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/crypto/chacha_private.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/crypto/chachapoly.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/crypto/cmac.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/crypto/cryptodev.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/crypto/cryptosoft.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index 25a455894ee..6a03ccbfa68 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -65,7 +65,7 @@
 ./sbin/pdisk
 ./sbin/wsconsctl
 ./usr/lib/libc.so.84.0
-./usr/lib/libcrypto.so.36.0
+./usr/lib/libcrypto.so.36.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.2
 ./usr/lib/libevent.so.4.1
@@ -95,11 +95,11 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.31.0
-./usr/lib/libssl.so.37.0
+./usr/lib/libssl.so.37.1
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
-./usr/lib/libtls.so.9.0
+./usr/lib/libtls.so.9.1
 ./usr/lib/libusbhid.so.7.0
 ./usr/lib/libutil.so.12.1
 ./usr/lib/libz.so.5.0
@@ -525,6 +525,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/crypto/cast.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/crypto/castsb.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/crypto/chacha_private.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/crypto/chachapoly.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/crypto/cmac.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/crypto/cryptodev.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/crypto/cryptosoft.ph
diff --git a/distrib/sets/lists/base/md.octeon b/distrib/sets/lists/base/md.octeon
index 64681dd843e..44248a24ffa 100644
--- a/distrib/sets/lists/base/md.octeon
+++ b/distrib/sets/lists/base/md.octeon
@@ -1,6 +1,6 @@
 ./etc/examples/wsconsctl.conf
 ./usr/lib/libc.so.84.0
-./usr/lib/libcrypto.so.36.0
+./usr/lib/libcrypto.so.36.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.2
 ./usr/lib/libevent.so.4.1
@@ -30,11 +30,11 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.31.0
-./usr/lib/libssl.so.37.0
+./usr/lib/libssl.so.37.1
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
-./usr/lib/libtls.so.9.0
+./usr/lib/libtls.so.9.1
 ./usr/lib/libusbhid.so.7.0
 ./usr/lib/libutil.so.12.1
 ./usr/lib/libz.so.5.0
@@ -459,6 +459,7 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/crypto/cast.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/crypto/castsb.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/crypto/chacha_private.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/crypto/chachapoly.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/crypto/cmac.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/crypto/cryptodev.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/crypto/cryptosoft.ph
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 87dfb20db88..6aede51fda6 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -64,7 +64,7 @@
 ./sbin/kbd
 ./sbin/wsconsctl
 ./usr/lib/libc.so.84.0
-./usr/lib/libcrypto.so.36.0
+./usr/lib/libcrypto.so.36.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.2
 ./usr/lib/libevent.so.4.1
@@ -94,11 +94,11 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.31.0
-./usr/lib/libssl.so.37.0
+./usr/lib/libssl.so.37.1
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
-./usr/lib/libtls.so.9.0
+./usr/lib/libtls.so.9.1
 ./usr/lib/libusbhid.so.7.0
 ./usr/lib/libutil.so.12.1
 ./usr/lib/libz.so.5.0
@@ -523,6 +523,7 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/crypto/cast.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/crypto/castsb.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/crypto/chacha_private.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/crypto/chachapoly.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/crypto/cmac.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/crypto/cryptodev.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/crypto/cryptosoft.ph
diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc
index 9f27651fdc8..3988c321f22 100644
--- a/distrib/sets/lists/base/md.socppc
+++ b/distrib/sets/lists/base/md.socppc
@@ -58,7 +58,7 @@
 ./sbin/kbd
 ./sbin/wsconsctl
 ./usr/lib/libc.so.84.0
-./usr/lib/libcrypto.so.36.0
+./usr/lib/libcrypto.so.36.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.2
 ./usr/lib/libevent.so.4.1
@@ -88,11 +88,11 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.31.0
-./usr/lib/libssl.so.37.0
+./usr/lib/libssl.so.37.1
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
-./usr/lib/libtls.so.9.0
+./usr/lib/libtls.so.9.1
 ./usr/lib/libusbhid.so.7.0
 ./usr/lib/libutil.so.12.1
 ./usr/lib/libz.so.5.0
@@ -518,6 +518,7 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/crypto/cast.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/crypto/castsb.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/crypto/chacha_private.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/crypto/chachapoly.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/crypto/cmac.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/crypto/cryptodev.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/crypto/cryptosoft.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index e27f709e894..73d055d9d50 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -8,7 +8,7 @@
 ./sbin/kbd
 ./sbin/wsconsctl
 ./usr/lib/libc.so.84.0
-./usr/lib/libcrypto.so.36.0
+./usr/lib/libcrypto.so.36.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.2
 ./usr/lib/libevent.so.4.1
@@ -38,11 +38,11 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.31.0
-./usr/lib/libssl.so.37.0
+./usr/lib/libssl.so.37.1
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
-./usr/lib/libtls.so.9.0
+./usr/lib/libtls.so.9.1
 ./usr/lib/libusbhid.so.7.0
 ./usr/lib/libutil.so.12.1
 ./usr/lib/libz.so.5.0
@@ -69,6 +69,7 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/crypto/cast.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/crypto/castsb.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/crypto/chacha_private.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/crypto/chachapoly.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/crypto/cmac.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/crypto/cryptodev.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/crypto/cryptosoft.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 91cc38b519c..7cec7184eb5 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -66,7 +66,7 @@
 ./sbin/kbd
 ./sbin/wsconsctl
 ./usr/lib/libc.so.84.0
-./usr/lib/libcrypto.so.36.0
+./usr/lib/libcrypto.so.36.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.2
 ./usr/lib/libevent.so.4.1
@@ -96,11 +96,11 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.31.0
-./usr/lib/libssl.so.37.0
+./usr/lib/libssl.so.37.1
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
-./usr/lib/libtls.so.9.0
+./usr/lib/libtls.so.9.1
 ./usr/lib/libusbhid.so.7.0
 ./usr/lib/libutil.so.12.1
 ./usr/lib/libz.so.5.0
@@ -127,6 +127,7 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/crypto/cast.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/crypto/castsb.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/crypto/chacha_private.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/crypto/chachapoly.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/crypto/cmac.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/crypto/cryptodev.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/crypto/cryptosoft.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 9c242c0553f..76e56cf1304 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -24,6 +24,7 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/crypto/cast.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/crypto/castsb.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/crypto/chacha_private.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/crypto/chachapoly.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/crypto/cmac.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/crypto/cryptodev.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/crypto/cryptosoft.ph
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index 66bedc9fa10..361128f42d5 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -33,7 +33,7 @@
 ./sbin/kbd
 ./sbin/wsconsctl
 ./usr/lib/libc.so.84.0
-./usr/lib/libcrypto.so.36.0
+./usr/lib/libcrypto.so.36.1
 ./usr/lib/libcurses.so.14.0
 ./usr/lib/libedit.so.5.2
 ./usr/lib/libevent.so.4.1
@@ -63,11 +63,11 @@
 ./usr/lib/libskey.so.6.0
 ./usr/lib/libsndio.so.6.0
 ./usr/lib/libsqlite3.so.31.0
-./usr/lib/libssl.so.37.0
+./usr/lib/libssl.so.37.1
 ./usr/lib/libstdc++.so.57.0
 ./usr/lib/libtermcap.so.14.0
 ./usr/lib/libtermlib.so.14.0
-./usr/lib/libtls.so.9.0
+./usr/lib/libtls.so.9.1
 ./usr/lib/libusbhid.so.7.0
 ./usr/lib/libutil.so.12.1
 ./usr/lib/libz.so.5.0
@@ -543,6 +543,7 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/crypto/cast.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/crypto/castsb.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/crypto/chacha_private.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/crypto/chachapoly.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/crypto/cmac.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/crypto/cryptodev.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/crypto/cryptosoft.ph
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index ee936af6da7..48b4045dac4 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -42,6 +42,7 @@
 ./usr/include/crypto/cast.h
 ./usr/include/crypto/castsb.h
 ./usr/include/crypto/chacha_private.h
+./usr/include/crypto/chachapoly.h
 ./usr/include/crypto/cmac.h
 ./usr/include/crypto/cryptodev.h
 ./usr/include/crypto/cryptosoft.h
@@ -6506,6 +6507,7 @@
 ./usr/share/man/man9/ml_filter.9
 ./usr/share/man/man9/ml_init.9
 ./usr/share/man/man9/ml_len.9
+./usr/share/man/man9/ml_purge.9
 ./usr/share/man/man9/ml_requeue.9
 ./usr/share/man/man9/mono_time.9
 ./usr/share/man/man9/mountroothook_disestablish.9
@@ -6520,6 +6522,7 @@
 ./usr/share/man/man9/mq_filter.9
 ./usr/share/man/man9/mq_init.9
 ./usr/share/man/man9/mq_len.9
+./usr/share/man/man9/mq_purge.9
 ./usr/share/man/man9/mq_requeue.9
 ./usr/share/man/man9/mq_set_maxlen.9
 ./usr/share/man/man9/msleep.9