Module Name: src
Committed By: wiz
Date: Fri Jun 16 20:38:19 UTC 2023
Modified Files:
src/distrib/sets/lists/comp: mi
src/distrib/sets/lists/debug: mi
src/distrib/sets/lists/tests: mi
Log Message:
mark some openssl 1.1 files as obsolete with openssl 3
To generate a diff of this commit:
cvs rdiff -u -r1.2430 -r1.2431 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.403 -r1.404 src/distrib/sets/lists/debug/mi
cvs rdiff -u -r1.1269 -r1.1270 src/distrib/sets/lists/tests/mi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.2430 src/distrib/sets/lists/comp/mi:1.2431
--- src/distrib/sets/lists/comp/mi:1.2430 Fri Jun 9 03:43:02 2023
+++ src/distrib/sets/lists/comp/mi Fri Jun 16 20:38:18 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.2430 2023/06/09 03:43:02 simonb Exp $
+# $NetBSD: mi,v 1.2431 2023/06/16 20:38:18 wiz Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
./etc/mtree/set.comp comp-sys-root
@@ -3030,6 +3030,7 @@
./usr/include/openssl/provider.h comp-c-include openssl=30
./usr/include/openssl/rand.h comp-c-include
./usr/include/openssl/rand_drbg.h comp-c-include openssl=11
+./usr/include/openssl/rand_drbg.h comp-obsolete openssl=30
./usr/include/openssl/randerr.h comp-c-include
./usr/include/openssl/rc2.h comp-c-include
./usr/include/openssl/rc4.h comp-c-include
Index: src/distrib/sets/lists/debug/mi
diff -u src/distrib/sets/lists/debug/mi:1.403 src/distrib/sets/lists/debug/mi:1.404
--- src/distrib/sets/lists/debug/mi:1.403 Tue Jun 6 08:27:44 2023
+++ src/distrib/sets/lists/debug/mi Fri Jun 16 20:38:19 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.403 2023/06/06 08:27:44 martin Exp $
+# $NetBSD: mi,v 1.404 2023/06/16 20:38:19 wiz Exp $
./etc/mtree/set.debug comp-sys-root
./usr/lib comp-sys-usr compatdir
./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile
@@ -1624,7 +1624,9 @@
./usr/libdata/debug/usr/tests/crypto/libcrypto/h_divtest.debug tests-crypto-debug debug,atf,compattestfile
./usr/libdata/debug/usr/tests/crypto/libcrypto/h_dsatest.debug tests-crypto-debug debug,atf,compattestfile
./usr/libdata/debug/usr/tests/crypto/libcrypto/h_ecdhtest.debug tests-crypto-debug debug,atf,compattestfile,openssl=11
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_ecdhtest.debug tests-obsolete obsolete,openssl=30
./usr/libdata/debug/usr/tests/crypto/libcrypto/h_ecdsatest.debug tests-crypto-debug debug,atf,compattestfile,openssl=11
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_ecdsatest.debug tests-obsolete obsolete,openssl=30
./usr/libdata/debug/usr/tests/crypto/libcrypto/h_ectest.debug tests-crypto-debug debug,atf,compattestfile
./usr/libdata/debug/usr/tests/crypto/libcrypto/h_enginetest.debug tests-crypto-debug debug,atf,compattestfile
./usr/libdata/debug/usr/tests/crypto/libcrypto/h_evp_test.debug tests-crypto-debug debug,atf,compattestfile
@@ -1633,6 +1635,7 @@
./usr/libdata/debug/usr/tests/crypto/libcrypto/h_ideatest.debug tests-crypto-debug debug,atf,compattestfile
./usr/libdata/debug/usr/tests/crypto/libcrypto/h_lhashtest.debug tests-crypto-debug debug,atf,compattestfile,openssl=10
./usr/libdata/debug/usr/tests/crypto/libcrypto/h_md2test.debug tests-crypto-debug debug,atf,compattestfile,openssl=11
+./usr/libdata/debug/usr/tests/crypto/libcrypto/h_md2test.debug tests-obsolete obsolete,openssl=30
./usr/libdata/debug/usr/tests/crypto/libcrypto/h_md4test.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/crypto/libcrypto/h_md5test.debug tests-obsolete obsolete
./usr/libdata/debug/usr/tests/crypto/libcrypto/h_mdc2test.debug tests-crypto-debug debug,atf,compattestfile
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.1269 src/distrib/sets/lists/tests/mi:1.1270
--- src/distrib/sets/lists/tests/mi:1.1269 Fri Jun 16 09:25:13 2023
+++ src/distrib/sets/lists/tests/mi Fri Jun 16 20:38:19 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1269 2023/06/16 09:25:13 rillig Exp $
+# $NetBSD: mi,v 1.1270 2023/06/16 20:38:19 wiz Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1336,7 +1336,9 @@
./usr/tests/crypto/libcrypto/d_server.pem tests-crypto-tests compattestfile,atf
./usr/tests/crypto/libcrypto/default.cnf tests-crypto-tests atf,compattestfile,openssl=30
./usr/tests/crypto/libcrypto/evpcase.txt tests-crypto-tests compattestfile,atf,openssl=11
+./usr/tests/crypto/libcrypto/evpcase.txt tests-obsolete obsolete,openssl=30
./usr/tests/crypto/libcrypto/evpciph.txt tests-crypto-tests compattestfile,atf,openssl=11
+./usr/tests/crypto/libcrypto/evpciph.txt tests-obsolete obsolete,openssl=30
./usr/tests/crypto/libcrypto/evpciph_aes_ccm_cavs.txt tests-crypto-tests atf,compattestfile,openssl=30
./usr/tests/crypto/libcrypto/evpciph_aes_common.txt tests-crypto-tests atf,compattestfile,openssl=30
./usr/tests/crypto/libcrypto/evpciph_aes_cts.txt tests-crypto-tests atf,compattestfile,openssl=30
@@ -1360,9 +1362,11 @@
./usr/tests/crypto/libcrypto/evpciph_seed.txt tests-crypto-tests atf,compattestfile,openssl=30
./usr/tests/crypto/libcrypto/evpciph_sm4.txt tests-crypto-tests atf,compattestfile,openssl=30
./usr/tests/crypto/libcrypto/evpdigest.txt tests-crypto-tests compattestfile,atf,openssl=11
+./usr/tests/crypto/libcrypto/evpdigest.txt tests-obsolete obsolete,openssl=30
./usr/tests/crypto/libcrypto/evpencod.txt tests-crypto-tests atf,compattestfile,openssl=30
./usr/tests/crypto/libcrypto/evpencod.txt tests-crypto-tests compattestfile,atf,openssl=11
./usr/tests/crypto/libcrypto/evpkdf.txt tests-crypto-tests compattestfile,atf,openssl=11
+./usr/tests/crypto/libcrypto/evpkdf.txt tests-obsolete obsolete,openssl=30
./usr/tests/crypto/libcrypto/evpkdf_hkdf.txt tests-crypto-tests atf,compattestfile,openssl=30
./usr/tests/crypto/libcrypto/evpkdf_krb5.txt tests-crypto-tests atf,compattestfile,openssl=30
./usr/tests/crypto/libcrypto/evpkdf_pbkdf1.txt tests-crypto-tests atf,compattestfile,openssl=30
@@ -1377,6 +1381,7 @@
./usr/tests/crypto/libcrypto/evpkdf_x942_des.txt tests-crypto-tests atf,compattestfile,openssl=30
./usr/tests/crypto/libcrypto/evpkdf_x963.txt tests-crypto-tests atf,compattestfile,openssl=30
./usr/tests/crypto/libcrypto/evpmac.txt tests-crypto-tests compattestfile,atf,openssl=11
+./usr/tests/crypto/libcrypto/evpmac.txt tests-obsolete obsolete,openssl=30
./usr/tests/crypto/libcrypto/evpmac_blake.txt tests-crypto-tests atf,compattestfile,openssl=30
./usr/tests/crypto/libcrypto/evpmac_cmac_des.txt tests-crypto-tests atf,compattestfile,openssl=30
./usr/tests/crypto/libcrypto/evpmac_common.txt tests-crypto-tests atf,compattestfile,openssl=30
@@ -1391,10 +1396,12 @@
./usr/tests/crypto/libcrypto/evpmd_sm3.txt tests-crypto-tests atf,compattestfile,openssl=30
./usr/tests/crypto/libcrypto/evpmd_whirlpool.txt tests-crypto-tests atf,compattestfile,openssl=30
./usr/tests/crypto/libcrypto/evppbe.txt tests-crypto-tests compattestfile,atf,openssl=11
+./usr/tests/crypto/libcrypto/evppbe.txt tests-obsolete obsolete,openssl=30
./usr/tests/crypto/libcrypto/evppbe_pbkdf2.txt tests-crypto-tests atf,compattestfile,openssl=30
./usr/tests/crypto/libcrypto/evppbe_pkcs12.txt tests-crypto-tests atf,compattestfile,openssl=30
./usr/tests/crypto/libcrypto/evppbe_scrypt.txt tests-crypto-tests atf,compattestfile,openssl=30
./usr/tests/crypto/libcrypto/evppkey.txt tests-crypto-tests compattestfile,atf,openssl=11
+./usr/tests/crypto/libcrypto/evppkey.txt tests-obsolete obsolete,openssl=30
./usr/tests/crypto/libcrypto/evppkey_brainpool.txt tests-crypto-tests atf,compattestfile,openssl=30
./usr/tests/crypto/libcrypto/evppkey_dh.txt tests-crypto-tests atf,compattestfile,openssl=30
./usr/tests/crypto/libcrypto/evppkey_dsa.txt tests-crypto-tests atf,compattestfile,openssl=30
@@ -1422,7 +1429,9 @@
./usr/tests/crypto/libcrypto/h_divtest tests-crypto-tests compattestfile,atf
./usr/tests/crypto/libcrypto/h_dsatest tests-crypto-tests compattestfile,atf
./usr/tests/crypto/libcrypto/h_ecdhtest tests-crypto-tests compattestfile,atf,openssl=11
+./usr/tests/crypto/libcrypto/h_ecdhtest tests-obsolete obsolete,openssl=30
./usr/tests/crypto/libcrypto/h_ecdsatest tests-crypto-tests compattestfile,atf,openssl=11
+./usr/tests/crypto/libcrypto/h_ecdsatest tests-obsolete obsolete,openssl=30
./usr/tests/crypto/libcrypto/h_ectest tests-crypto-tests compattestfile,atf
./usr/tests/crypto/libcrypto/h_enginetest tests-crypto-tests compattestfile,atf
./usr/tests/crypto/libcrypto/h_evp_test tests-crypto-tests compattestfile,atf
@@ -1432,6 +1441,7 @@
./usr/tests/crypto/libcrypto/h_lhashtest comp-obsolete obsolete
./usr/tests/crypto/libcrypto/h_lhashtest tests-crypto-tests compattestfile,atf,openssl=10
./usr/tests/crypto/libcrypto/h_md2test tests-crypto-tests compattestfile,atf,openssl=11
+./usr/tests/crypto/libcrypto/h_md2test tests-obsolete obsolete,openssl=30
./usr/tests/crypto/libcrypto/h_md4test tests-obsolete obsolete
./usr/tests/crypto/libcrypto/h_md5test tests-obsolete obsolete
./usr/tests/crypto/libcrypto/h_mdc2test tests-crypto-tests compattestfile,atf
