sync

24 files changed, 134 insertions, 134 deletions

diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index c31a0c01143..0ed7152021b 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -90,7 +90,7 @@
 ./usr/lib/libasn1.so.18.0
 ./usr/lib/libc.so.57.0
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.18.0
+./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.0
 ./usr/lib/libdes.so.9.0
 ./usr/lib/libedit.so.4.0
@@ -123,7 +123,7 @@
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
-./usr/lib/libssl.so.15.1
+./usr/lib/libssl.so.16.0
 ./usr/lib/libstdc++.so.49.0
 ./usr/lib/libtermcap.so.12.0
 ./usr/lib/libtermlib.so.12.0
@@ -2115,16 +2115,16 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/engine.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/err.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/evp.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/fips.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/fips_rand.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/idea.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/kssl.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/md2.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/md5.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/mdc2.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/modes.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/obj_mac.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/objects.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/ocsp.ph
@@ -2135,7 +2135,6 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/pem2.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/pkcs12.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/pkcs7.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/pq_compat.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/pqueue.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/rand.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/rc2.ph
@@ -2154,10 +2153,11 @@
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/store.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/symhacks.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/tls1.ph
-./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/tmdiff.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/ts.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/txt_db.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/ui.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/ui_compat.ph
+./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/whrlpool.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/x509.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/x509_vfy.ph
 ./usr/libdata/perl5/site_perl/alpha-openbsd/openssl/x509v3.ph
diff --git a/distrib/sets/lists/base/md.amd64 b/distrib/sets/lists/base/md.amd64
index fc3bb2b82ba..41cca508e19 100644
--- a/distrib/sets/lists/base/md.amd64
+++ b/distrib/sets/lists/base/md.amd64
@@ -94,7 +94,7 @@
 ./usr/lib/libasn1.so.18.0
 ./usr/lib/libc.so.57.0
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.18.0
+./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.0
 ./usr/lib/libdes.so.9.0
 ./usr/lib/libedit.so.4.0
@@ -127,7 +127,7 @@
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
-./usr/lib/libssl.so.15.1
+./usr/lib/libssl.so.16.0
 ./usr/lib/libstdc++.so.50.0
 ./usr/lib/libtermcap.so.12.0
 ./usr/lib/libtermlib.so.12.0
@@ -2212,16 +2212,16 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/engine.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/err.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/evp.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/fips.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/fips_rand.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/idea.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/kssl.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/md2.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/md5.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/mdc2.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/modes.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/obj_mac.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/objects.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/ocsp.ph
@@ -2232,7 +2232,6 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/pem2.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/pkcs12.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/pkcs7.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/pq_compat.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/pqueue.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/rand.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/rc2.ph
@@ -2251,10 +2250,11 @@
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/store.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/symhacks.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/tls1.ph
-./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/tmdiff.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/ts.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/txt_db.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/ui.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/ui_compat.ph
+./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/whrlpool.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/x509.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/x509_vfy.ph
 ./usr/libdata/perl5/site_perl/amd64-openbsd/openssl/x509v3.ph
diff --git a/distrib/sets/lists/base/md.armish b/distrib/sets/lists/base/md.armish
index 164cc9d2761..f2c5b37d5bc 100644
--- a/distrib/sets/lists/base/md.armish
+++ b/distrib/sets/lists/base/md.armish
@@ -66,7 +66,7 @@
 ./usr/lib/libasn1.so.18.0
 ./usr/lib/libc.so.57.0
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.18.0
+./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.0
 ./usr/lib/libdes.so.9.0
 ./usr/lib/libedit.so.4.0
@@ -99,7 +99,7 @@
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
-./usr/lib/libssl.so.15.1
+./usr/lib/libssl.so.16.0
 ./usr/lib/libstdc++.so.49.0
 ./usr/lib/libtermcap.so.12.0
 ./usr/lib/libtermlib.so.12.0
@@ -2131,16 +2131,16 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/engine.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/err.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/evp.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/openssl/fips.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/openssl/fips_rand.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/idea.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/kssl.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/md2.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/md5.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/mdc2.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/openssl/modes.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/obj_mac.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/objects.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/ocsp.ph
@@ -2151,7 +2151,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/pem2.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/pkcs12.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/pkcs7.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/openssl/pq_compat.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/pqueue.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/rand.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/rc2.ph
@@ -2170,10 +2169,11 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/store.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/symhacks.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/tls1.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/openssl/tmdiff.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/openssl/ts.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/txt_db.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/ui.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/ui_compat.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/openssl/whrlpool.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/x509.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/x509_vfy.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/x509v3.ph
diff --git a/distrib/sets/lists/base/md.aviion b/distrib/sets/lists/base/md.aviion
index a40f62fba41..d8f986e4561 100644
--- a/distrib/sets/lists/base/md.aviion
+++ b/distrib/sets/lists/base/md.aviion
@@ -2074,16 +2074,16 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/engine.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/err.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/evp.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/fips.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/fips_rand.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/idea.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/kssl.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/md2.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/md5.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/mdc2.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/modes.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/obj_mac.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/objects.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/ocsp.ph
@@ -2094,7 +2094,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/pem2.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/pkcs12.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/pkcs7.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/pq_compat.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/pqueue.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/rand.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/rc2.ph
@@ -2113,10 +2112,11 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/store.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/symhacks.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/tls1.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/tmdiff.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/ts.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/txt_db.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/ui.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/ui_compat.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/whrlpool.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/x509.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/x509_vfy.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/x509v3.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index b1fa2e865a8..fc8e42cd03f 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.57.0
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.18.0
+./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.0
 ./usr/lib/libdes.so.9.0
 ./usr/lib/libedit.so.4.0
@@ -63,7 +63,7 @@
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
-./usr/lib/libssl.so.15.1
+./usr/lib/libssl.so.16.0
 ./usr/lib/libstdc++.so.43.0
 ./usr/lib/libtermcap.so.12.0
 ./usr/lib/libtermlib.so.12.0
@@ -2064,16 +2064,16 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/engine.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/err.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/evp.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/fips.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/fips_rand.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/idea.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/kssl.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/md2.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/md5.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/mdc2.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/modes.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/obj_mac.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/objects.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/ocsp.ph
@@ -2084,7 +2084,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/pem2.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/pkcs12.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/pkcs7.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/pq_compat.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/pqueue.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/rand.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/rc2.ph
@@ -2103,10 +2102,11 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/store.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/symhacks.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/tls1.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/tmdiff.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/ts.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/txt_db.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/ui.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/ui_compat.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/whrlpool.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/x509.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/x509_vfy.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/x509v3.ph
diff --git a/distrib/sets/lists/base/md.hppa b/distrib/sets/lists/base/md.hppa
index 72cc40aa1c3..f8d09eff068 100644
--- a/distrib/sets/lists/base/md.hppa
+++ b/distrib/sets/lists/base/md.hppa
@@ -89,7 +89,7 @@
 ./usr/lib/libasn1.so.18.0
 ./usr/lib/libc.so.57.0
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.18.0
+./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.0
 ./usr/lib/libdes.so.9.0
 ./usr/lib/libedit.so.4.0
@@ -122,7 +122,7 @@
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
-./usr/lib/libssl.so.15.1
+./usr/lib/libssl.so.16.0
 ./usr/lib/libstdc++.so.50.0
 ./usr/lib/libtermcap.so.12.0
 ./usr/lib/libtermlib.so.12.0
@@ -2183,16 +2183,16 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/engine.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/err.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/evp.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/fips.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/fips_rand.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/idea.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/kssl.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/md2.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/md5.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/mdc2.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/modes.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/obj_mac.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/objects.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/ocsp.ph
@@ -2203,7 +2203,6 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/pem2.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/pkcs12.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/pkcs7.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/pq_compat.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/pqueue.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/rand.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/rc2.ph
@@ -2222,10 +2221,11 @@
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/store.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/symhacks.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/tls1.ph
-./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/tmdiff.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/ts.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/txt_db.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/ui.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/ui_compat.ph
+./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/whrlpool.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/x509.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/x509_vfy.ph
 ./usr/libdata/perl5/site_perl/hppa-openbsd/openssl/x509v3.ph
diff --git a/distrib/sets/lists/base/md.hppa64 b/distrib/sets/lists/base/md.hppa64
index b6756fb2f51..364e07b19fb 100644
--- a/distrib/sets/lists/base/md.hppa64
+++ b/distrib/sets/lists/base/md.hppa64
@@ -90,7 +90,7 @@
 ./usr/lib/libasn1.so.18.0
 ./usr/lib/libc.so.57.0
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.18.0
+./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.0
 ./usr/lib/libdes.so.9.0
 ./usr/lib/libedit.so.4.0
@@ -123,7 +123,7 @@
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
-./usr/lib/libssl.so.15.1
+./usr/lib/libssl.so.16.0
 ./usr/lib/libstdc++.so.49.0
 ./usr/lib/libtermcap.so.12.0
 ./usr/lib/libtermlib.so.12.0
@@ -2113,16 +2113,16 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/engine.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/err.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/evp.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/fips.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/fips_rand.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/idea.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/kssl.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/md2.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/md5.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/mdc2.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/modes.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/obj_mac.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/objects.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/ocsp.ph
@@ -2133,7 +2133,6 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/pem2.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/pkcs12.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/pkcs7.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/pq_compat.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/pqueue.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/rand.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/rc2.ph
@@ -2152,10 +2151,11 @@
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/store.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/symhacks.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/tls1.ph
-./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/tmdiff.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/ts.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/txt_db.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/ui.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/ui_compat.ph
+./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/whrlpool.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/x509.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/x509_vfy.ph
 ./usr/libdata/perl5/site_perl/hppa64-openbsd/openssl/x509v3.ph
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index da788d854bd..204d612fd89 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -96,7 +96,7 @@
 ./usr/lib/libasn1.so.18.0
 ./usr/lib/libc.so.57.0
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.18.0
+./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.0
 ./usr/lib/libdes.so.9.0
 ./usr/lib/libedit.so.4.0
@@ -129,7 +129,7 @@
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
-./usr/lib/libssl.so.15.1
+./usr/lib/libssl.so.16.0
 ./usr/lib/libstdc++.so.50.0
 ./usr/lib/libtermcap.so.12.0
 ./usr/lib/libtermlib.so.12.0
@@ -2216,16 +2216,16 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/engine.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/err.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/evp.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/openssl/fips.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/openssl/fips_rand.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/idea.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/kssl.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/md2.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/md5.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/mdc2.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/openssl/modes.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/obj_mac.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/objects.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/ocsp.ph
@@ -2236,7 +2236,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/pem2.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/pkcs12.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/pkcs7.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/openssl/pq_compat.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/pqueue.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/rand.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/rc2.ph
@@ -2255,10 +2254,11 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/store.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/symhacks.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/tls1.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/openssl/tmdiff.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/openssl/ts.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/txt_db.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/ui.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/ui_compat.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/openssl/whrlpool.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/x509.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/x509_vfy.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/openssl/x509v3.ph
diff --git a/distrib/sets/lists/base/md.landisk b/distrib/sets/lists/base/md.landisk
index e7f8f8c18e2..c6af6efeeb2 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.57.0
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.18.0
+./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.0
 ./usr/lib/libdes.so.9.0
 ./usr/lib/libedit.so.4.0
@@ -86,7 +86,7 @@
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
-./usr/lib/libssl.so.15.1
+./usr/lib/libssl.so.16.0
 ./usr/lib/libstdc++.so.49.0
 ./usr/lib/libtermcap.so.12.0
 ./usr/lib/libtermlib.so.12.0
@@ -2069,16 +2069,16 @@
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/engine.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/err.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/evp.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/openssl/fips.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/openssl/fips_rand.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/idea.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/kssl.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/md2.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/md5.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/mdc2.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/openssl/modes.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/obj_mac.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/objects.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/ocsp.ph
@@ -2089,7 +2089,6 @@
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/pem2.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/pkcs12.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/pkcs7.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/openssl/pq_compat.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/pqueue.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/rand.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/rc2.ph
@@ -2108,10 +2107,11 @@
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/store.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/symhacks.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/tls1.ph
-./usr/libdata/perl5/site_perl/sh-openbsd/openssl/tmdiff.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/openssl/ts.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/txt_db.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/ui.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/ui_compat.ph
+./usr/libdata/perl5/site_perl/sh-openbsd/openssl/whrlpool.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/x509.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/x509_vfy.ph
 ./usr/libdata/perl5/site_perl/sh-openbsd/openssl/x509v3.ph
diff --git a/distrib/sets/lists/base/md.loongson b/distrib/sets/lists/base/md.loongson
index 2cc5014e023..eae874aeb3f 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.57.0
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.18.0
+./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.0
 ./usr/lib/libdes.so.9.0
 ./usr/lib/libedit.so.4.0
@@ -92,7 +92,7 @@
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
-./usr/lib/libssl.so.15.1
+./usr/lib/libssl.so.16.0
 ./usr/lib/libstdc++.so.50.0
 ./usr/lib/libtermcap.so.12.0
 ./usr/lib/libtermlib.so.12.0
@@ -2196,16 +2196,16 @@
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/engine.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/err.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/evp.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/fips.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/fips_rand.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/idea.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/kssl.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/md2.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/md5.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/mdc2.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/modes.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/obj_mac.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/objects.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/ocsp.ph
@@ -2216,7 +2216,6 @@
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/pem2.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/pkcs12.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/pkcs7.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/pq_compat.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/pqueue.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/rand.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/rc2.ph
@@ -2235,10 +2234,11 @@
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/store.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/symhacks.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/tls1.ph
-./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/tmdiff.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/ts.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/txt_db.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/ui.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/ui_compat.ph
+./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/whrlpool.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/x509.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/x509_vfy.ph
 ./usr/libdata/perl5/site_perl/mips64el-openbsd/openssl/x509v3.ph
diff --git a/distrib/sets/lists/base/md.luna88k b/distrib/sets/lists/base/md.luna88k
index 7a1c8b4b2f0..5f5339a0c81 100644
--- a/distrib/sets/lists/base/md.luna88k
+++ b/distrib/sets/lists/base/md.luna88k
@@ -1929,16 +1929,16 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/engine.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/err.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/evp.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/fips.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/fips_rand.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/idea.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/kssl.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/md2.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/md5.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/mdc2.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/modes.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/obj_mac.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/objects.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/ocsp.ph
@@ -1949,7 +1949,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/pem2.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/pkcs12.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/pkcs7.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/pq_compat.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/pqueue.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/rand.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/rc2.ph
@@ -1968,10 +1967,11 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/store.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/symhacks.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/tls1.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/tmdiff.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/ts.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/txt_db.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/ui.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/ui_compat.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/whrlpool.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/x509.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/x509_vfy.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/x509v3.ph
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index 40e370a010e..19d1af628af 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -31,7 +31,7 @@
 ./usr/lib/libasn1.so.18.0
 ./usr/lib/libc.so.57.0
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.18.0
+./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.0
 ./usr/lib/libdes.so.9.0
 ./usr/lib/libedit.so.4.0
@@ -64,7 +64,7 @@
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
-./usr/lib/libssl.so.15.1
+./usr/lib/libssl.so.16.0
 ./usr/lib/libstdc++.so.43.0
 ./usr/lib/libtermcap.so.12.0
 ./usr/lib/libtermlib.so.12.0
@@ -2069,16 +2069,16 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/engine.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/err.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/evp.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/fips.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/fips_rand.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/idea.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/kssl.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/md2.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/md5.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/mdc2.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/modes.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/obj_mac.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/objects.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/ocsp.ph
@@ -2089,7 +2089,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/pem2.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/pkcs12.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/pkcs7.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/pq_compat.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/pqueue.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/rand.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/rc2.ph
@@ -2108,10 +2107,11 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/store.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/symhacks.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/tls1.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/tmdiff.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/ts.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/txt_db.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/ui.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/ui_compat.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/whrlpool.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/x509.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/x509_vfy.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/x509v3.ph
diff --git a/distrib/sets/lists/base/md.macppc b/distrib/sets/lists/base/md.macppc
index fb6f64d5873..ad2ee250882 100644
--- a/distrib/sets/lists/base/md.macppc
+++ b/distrib/sets/lists/base/md.macppc
@@ -91,7 +91,7 @@
 ./usr/lib/libasn1.so.18.0
 ./usr/lib/libc.so.57.0
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.18.0
+./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.0
 ./usr/lib/libdes.so.9.0
 ./usr/lib/libedit.so.4.0
@@ -124,7 +124,7 @@
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
-./usr/lib/libssl.so.15.1
+./usr/lib/libssl.so.16.0
 ./usr/lib/libstdc++.so.50.0
 ./usr/lib/libtermcap.so.12.0
 ./usr/lib/libtermlib.so.12.0
@@ -2185,16 +2185,16 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/engine.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/err.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/evp.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/fips.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/fips_rand.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/idea.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/kssl.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/md2.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/md5.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/mdc2.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/modes.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/obj_mac.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/objects.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/ocsp.ph
@@ -2205,7 +2205,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/pem2.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/pkcs12.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/pkcs7.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/pq_compat.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/pqueue.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/rand.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/rc2.ph
@@ -2224,10 +2223,11 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/store.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/symhacks.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/tls1.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/tmdiff.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/ts.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/txt_db.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/ui.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/ui_compat.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/whrlpool.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/x509.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/x509_vfy.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/x509v3.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 2858e0d66f2..cd611000626 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.57.0
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.18.0
+./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.0
 ./usr/lib/libdes.so.9.0
 ./usr/lib/libedit.so.4.0
@@ -61,7 +61,7 @@
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
-./usr/lib/libssl.so.15.1
+./usr/lib/libssl.so.16.0
 ./usr/lib/libstdc++.so.43.0
 ./usr/lib/libtermcap.so.12.0
 ./usr/lib/libtermlib.so.12.0
@@ -2064,16 +2064,16 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/engine.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/err.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/evp.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/fips.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/fips_rand.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/idea.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/kssl.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/md2.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/md5.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/mdc2.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/modes.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/obj_mac.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/objects.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/ocsp.ph
@@ -2084,7 +2084,6 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/pem2.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/pkcs12.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/pkcs7.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/pq_compat.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/pqueue.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/rand.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/rc2.ph
@@ -2103,10 +2102,11 @@
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/store.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/symhacks.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/tls1.ph
-./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/tmdiff.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/ts.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/txt_db.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/ui.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/ui_compat.ph
+./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/whrlpool.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/x509.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/x509_vfy.ph
 ./usr/libdata/perl5/site_perl/m68k-openbsd/openssl/x509v3.ph
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index 60366e3e061..b74bf9d4429 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -2078,16 +2078,16 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/engine.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/err.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/evp.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/fips.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/fips_rand.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/idea.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/kssl.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/md2.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/md5.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/mdc2.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/modes.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/obj_mac.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/objects.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/ocsp.ph
@@ -2098,7 +2098,6 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/pem2.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/pkcs12.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/pkcs7.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/pq_compat.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/pqueue.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/rand.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/rc2.ph
@@ -2117,10 +2116,11 @@
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/store.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/symhacks.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/tls1.ph
-./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/tmdiff.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/ts.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/txt_db.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/ui.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/ui_compat.ph
+./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/whrlpool.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/x509.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/x509_vfy.ph
 ./usr/libdata/perl5/site_perl/m88k-openbsd/openssl/x509v3.ph
diff --git a/distrib/sets/lists/base/md.mvmeppc b/distrib/sets/lists/base/md.mvmeppc
index 66a279bd38b..566808183a3 100644
--- a/distrib/sets/lists/base/md.mvmeppc
+++ b/distrib/sets/lists/base/md.mvmeppc
@@ -62,7 +62,7 @@
 ./usr/lib/libasn1.so.18.0
 ./usr/lib/libc.so.57.0
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.18.0
+./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.0
 ./usr/lib/libdes.so.9.0
 ./usr/lib/libedit.so.4.0
@@ -95,7 +95,7 @@
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
-./usr/lib/libssl.so.15.1
+./usr/lib/libssl.so.16.0
 ./usr/lib/libstdc++.so.43.0
 ./usr/lib/libtermcap.so.12.0
 ./usr/lib/libtermlib.so.12.0
@@ -1932,16 +1932,16 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/engine.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/err.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/evp.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/fips.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/fips_rand.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/idea.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/kssl.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/md2.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/md5.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/mdc2.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/modes.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/obj_mac.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/objects.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/ocsp.ph
@@ -1952,7 +1952,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/pem2.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/pkcs12.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/pkcs7.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/pq_compat.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/pqueue.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/rand.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/rc2.ph
@@ -1971,10 +1970,11 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/store.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/symhacks.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/tls1.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/tmdiff.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/ts.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/txt_db.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/ui.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/ui_compat.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/whrlpool.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/x509.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/x509_vfy.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/x509v3.ph
diff --git a/distrib/sets/lists/base/md.palm b/distrib/sets/lists/base/md.palm
index a1fb230f66f..154d08ad241 100644
--- a/distrib/sets/lists/base/md.palm
+++ b/distrib/sets/lists/base/md.palm
@@ -63,7 +63,7 @@
 ./usr/lib/libasn1.so.18.0
 ./usr/lib/libc.so.57.0
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.18.0
+./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.0
 ./usr/lib/libdes.so.9.0
 ./usr/lib/libedit.so.4.0
@@ -96,7 +96,7 @@
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
-./usr/lib/libssl.so.15.1
+./usr/lib/libssl.so.16.0
 ./usr/lib/libstdc++.so.49.0
 ./usr/lib/libtermcap.so.12.0
 ./usr/lib/libtermlib.so.12.0
@@ -2085,16 +2085,16 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/engine.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/err.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/evp.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/openssl/fips.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/openssl/fips_rand.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/idea.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/kssl.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/md2.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/md5.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/mdc2.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/openssl/modes.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/obj_mac.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/objects.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/ocsp.ph
@@ -2105,7 +2105,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/pem2.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/pkcs12.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/pkcs7.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/openssl/pq_compat.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/pqueue.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/rand.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/rc2.ph
@@ -2124,10 +2123,11 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/store.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/symhacks.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/tls1.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/openssl/tmdiff.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/openssl/ts.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/txt_db.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/ui.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/ui_compat.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/openssl/whrlpool.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/x509.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/x509_vfy.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/x509v3.ph
diff --git a/distrib/sets/lists/base/md.sgi b/distrib/sets/lists/base/md.sgi
index 7169584e94a..3c6a6605540 100644
--- a/distrib/sets/lists/base/md.sgi
+++ b/distrib/sets/lists/base/md.sgi
@@ -86,7 +86,7 @@
 ./usr/lib/libasn1.so.18.0
 ./usr/lib/libc.so.57.0
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.18.0
+./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.0
 ./usr/lib/libdes.so.9.0
 ./usr/lib/libedit.so.4.0
@@ -119,7 +119,7 @@
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
-./usr/lib/libssl.so.15.1
+./usr/lib/libssl.so.16.0
 ./usr/lib/libstdc++.so.50.0
 ./usr/lib/libtermcap.so.12.0
 ./usr/lib/libtermlib.so.12.0
@@ -2172,16 +2172,16 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/engine.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/err.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/evp.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/fips.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/fips_rand.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/idea.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/kssl.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/md2.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/md5.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/mdc2.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/modes.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/obj_mac.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/objects.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/ocsp.ph
@@ -2192,7 +2192,6 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/pem2.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/pkcs12.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/pkcs7.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/pq_compat.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/pqueue.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/rand.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/rc2.ph
@@ -2211,10 +2210,11 @@
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/store.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/symhacks.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/tls1.ph
-./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/tmdiff.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/ts.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/txt_db.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/ui.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/ui_compat.ph
+./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/whrlpool.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/x509.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/x509_vfy.ph
 ./usr/libdata/perl5/site_perl/mips64-openbsd/openssl/x509v3.ph
diff --git a/distrib/sets/lists/base/md.socppc b/distrib/sets/lists/base/md.socppc
index 1f38f584077..ba38a778872 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.57.0
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.18.0
+./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.0
 ./usr/lib/libdes.so.9.0
 ./usr/lib/libedit.so.4.0
@@ -119,7 +119,7 @@
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
-./usr/lib/libssl.so.15.1
+./usr/lib/libssl.so.16.0
 ./usr/lib/libstdc++.so.50.0
 ./usr/lib/libtermcap.so.12.0
 ./usr/lib/libtermlib.so.12.0
@@ -2128,16 +2128,16 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/engine.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/err.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/evp.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/fips.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/fips_rand.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/idea.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/kssl.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/md2.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/md5.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/mdc2.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/modes.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/obj_mac.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/objects.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/ocsp.ph
@@ -2148,7 +2148,6 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/pem2.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/pkcs12.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/pkcs7.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/pq_compat.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/pqueue.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/rand.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/rc2.ph
@@ -2167,10 +2166,11 @@
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/store.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/symhacks.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/tls1.ph
-./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/tmdiff.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/ts.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/txt_db.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/ui.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/ui_compat.ph
+./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/whrlpool.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/x509.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/x509_vfy.ph
 ./usr/libdata/perl5/site_perl/powerpc-openbsd/openssl/x509v3.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index a822651b6a2..4d7c4d65ad5 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -36,7 +36,7 @@
 ./usr/lib/libasn1.so.18.0
 ./usr/lib/libc.so.57.0
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.18.0
+./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.0
 ./usr/lib/libdes.so.9.0
 ./usr/lib/libedit.so.4.0
@@ -69,7 +69,7 @@
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
-./usr/lib/libssl.so.15.1
+./usr/lib/libssl.so.16.0
 ./usr/lib/libstdc++.so.43.0
 ./usr/lib/libtermcap.so.12.0
 ./usr/lib/libtermlib.so.12.0
@@ -1413,16 +1413,16 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/engine.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/err.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/evp.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/fips.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/fips_rand.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/idea.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/kssl.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/md2.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/md5.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/mdc2.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/modes.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/obj_mac.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/objects.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/ocsp.ph
@@ -1433,7 +1433,6 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/pem2.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/pkcs12.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/pkcs7.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/pq_compat.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/pqueue.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/rand.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/rc2.ph
@@ -1452,10 +1451,11 @@
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/store.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/symhacks.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/tls1.ph
-./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/tmdiff.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/ts.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/txt_db.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/ui.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/ui_compat.ph
+./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/whrlpool.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/x509.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/x509_vfy.ph
 ./usr/libdata/perl5/site_perl/sparc-openbsd/openssl/x509v3.ph
diff --git a/distrib/sets/lists/base/md.sparc64 b/distrib/sets/lists/base/md.sparc64
index 607cdf991e1..ba45f26bf95 100644
--- a/distrib/sets/lists/base/md.sparc64
+++ b/distrib/sets/lists/base/md.sparc64
@@ -91,7 +91,7 @@
 ./usr/lib/libasn1.so.18.0
 ./usr/lib/libc.so.57.0
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.18.0
+./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.0
 ./usr/lib/libdes.so.9.0
 ./usr/lib/libedit.so.4.0
@@ -124,7 +124,7 @@
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
-./usr/lib/libssl.so.15.1
+./usr/lib/libssl.so.16.0
 ./usr/lib/libstdc++.so.50.0
 ./usr/lib/libtermcap.so.12.0
 ./usr/lib/libtermlib.so.12.0
@@ -1552,16 +1552,16 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/engine.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/err.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/evp.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/fips.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/fips_rand.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/idea.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/kssl.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/md2.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/md5.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/mdc2.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/modes.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/obj_mac.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/objects.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/ocsp.ph
@@ -1572,7 +1572,6 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/pem2.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/pkcs12.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/pkcs7.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/pq_compat.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/pqueue.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/rand.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/rc2.ph
@@ -1591,10 +1590,11 @@
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/store.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/symhacks.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/tls1.ph
-./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/tmdiff.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/ts.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/txt_db.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/ui.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/ui_compat.ph
+./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/whrlpool.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/x509.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/x509_vfy.ph
 ./usr/libdata/perl5/site_perl/sparc64-openbsd/openssl/x509v3.ph
diff --git a/distrib/sets/lists/base/md.vax b/distrib/sets/lists/base/md.vax
index 810d6242261..a94eabd08a2 100644
--- a/distrib/sets/lists/base/md.vax
+++ b/distrib/sets/lists/base/md.vax
@@ -1347,16 +1347,16 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/engine.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/err.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/evp.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/openssl/fips.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/openssl/fips_rand.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/idea.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/kssl.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/md2.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/md5.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/mdc2.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/openssl/modes.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/obj_mac.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/objects.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/ocsp.ph
@@ -1367,7 +1367,6 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/pem2.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/pkcs12.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/pkcs7.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/openssl/pq_compat.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/pqueue.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/rand.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/rc2.ph
@@ -1386,10 +1385,11 @@
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/store.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/symhacks.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/tls1.ph
-./usr/libdata/perl5/site_perl/vax-openbsd/openssl/tmdiff.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/openssl/ts.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/txt_db.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/ui.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/ui_compat.ph
+./usr/libdata/perl5/site_perl/vax-openbsd/openssl/whrlpool.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/x509.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/x509_vfy.ph
 ./usr/libdata/perl5/site_perl/vax-openbsd/openssl/x509v3.ph
diff --git a/distrib/sets/lists/base/md.zaurus b/distrib/sets/lists/base/md.zaurus
index 1a79794fb45..184b85b0e67 100644
--- a/distrib/sets/lists/base/md.zaurus
+++ b/distrib/sets/lists/base/md.zaurus
@@ -64,7 +64,7 @@
 ./usr/lib/libasn1.so.18.0
 ./usr/lib/libc.so.57.0
 ./usr/lib/libcom_err.so.18.0
-./usr/lib/libcrypto.so.18.0
+./usr/lib/libcrypto.so.19.0
 ./usr/lib/libcurses.so.12.0
 ./usr/lib/libdes.so.9.0
 ./usr/lib/libedit.so.4.0
@@ -97,7 +97,7 @@
 ./usr/lib/libsectok.so.6.0
 ./usr/lib/libskey.so.5.1
 ./usr/lib/libsndio.so.3.3
-./usr/lib/libssl.so.15.1
+./usr/lib/libssl.so.16.0
 ./usr/lib/libstdc++.so.49.0
 ./usr/lib/libtermcap.so.12.0
 ./usr/lib/libtermlib.so.12.0
@@ -2086,16 +2086,16 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/engine.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/err.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/evp.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/openssl/fips.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/openssl/fips_rand.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/hmac.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/idea.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/openssl/krb5_asn.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/kssl.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/lhash.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/md2.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/md4.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/md5.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/mdc2.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/openssl/modes.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/obj_mac.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/objects.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/ocsp.ph
@@ -2106,7 +2106,6 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/pem2.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/pkcs12.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/pkcs7.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/openssl/pq_compat.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/pqueue.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/rand.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/rc2.ph
@@ -2125,10 +2124,11 @@
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/store.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/symhacks.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/tls1.ph
-./usr/libdata/perl5/site_perl/arm-openbsd/openssl/tmdiff.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/openssl/ts.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/txt_db.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/ui.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/ui_compat.ph
+./usr/libdata/perl5/site_perl/arm-openbsd/openssl/whrlpool.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/x509.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/x509_vfy.ph
 ./usr/libdata/perl5/site_perl/arm-openbsd/openssl/x509v3.ph
diff --git a/distrib/sets/lists/comp/mi b/distrib/sets/lists/comp/mi
index 459c92f74b1..8df2bc434cc 100644
--- a/distrib/sets/lists/comp/mi
+++ b/distrib/sets/lists/comp/mi
@@ -1301,16 +1301,16 @@
 ./usr/include/openssl/engine.h
 ./usr/include/openssl/err.h
 ./usr/include/openssl/evp.h
-./usr/include/openssl/fips.h
-./usr/include/openssl/fips_rand.h
 ./usr/include/openssl/hmac.h
 ./usr/include/openssl/idea.h
+./usr/include/openssl/krb5_asn.h
 ./usr/include/openssl/kssl.h
 ./usr/include/openssl/lhash.h
 ./usr/include/openssl/md2.h
 ./usr/include/openssl/md4.h
 ./usr/include/openssl/md5.h
 ./usr/include/openssl/mdc2.h
+./usr/include/openssl/modes.h
 ./usr/include/openssl/obj_mac.h
 ./usr/include/openssl/objects.h
 ./usr/include/openssl/ocsp.h
@@ -1321,7 +1321,6 @@
 ./usr/include/openssl/pem2.h
 ./usr/include/openssl/pkcs12.h
 ./usr/include/openssl/pkcs7.h
-./usr/include/openssl/pq_compat.h
 ./usr/include/openssl/pqueue.h
 ./usr/include/openssl/rand.h
 ./usr/include/openssl/rc2.h
@@ -1340,10 +1339,11 @@
 ./usr/include/openssl/store.h
 ./usr/include/openssl/symhacks.h
 ./usr/include/openssl/tls1.h
-./usr/include/openssl/tmdiff.h
+./usr/include/openssl/ts.h
 ./usr/include/openssl/txt_db.h
 ./usr/include/openssl/ui.h
 ./usr/include/openssl/ui_compat.h
+./usr/include/openssl/whrlpool.h
 ./usr/include/openssl/x509.h
 ./usr/include/openssl/x509_vfy.h
 ./usr/include/openssl/x509v3.h