Module Name: src
Committed By: riastradh
Date: Sat May 27 00:08:30 UTC 2023
Modified Files:
src/crypto/external/bsd/openssl/lib/engines: Makefile
src/distrib/sets/lists/base: ad.aarch64 ad.mips ad.powerpc ad.riscv
md.amd64 md.i386 mi
Log Message:
openssl: padlock.so engine for VIA CPUs makes sense only on x86.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssl/lib/engines/Makefile
cvs rdiff -u -r1.41 -r1.42 src/distrib/sets/lists/base/ad.aarch64
cvs rdiff -u -r1.87 -r1.88 src/distrib/sets/lists/base/ad.mips
cvs rdiff -u -r1.45 -r1.46 src/distrib/sets/lists/base/ad.powerpc
cvs rdiff -u -r1.28 -r1.29 src/distrib/sets/lists/base/ad.riscv
cvs rdiff -u -r1.291 -r1.292 src/distrib/sets/lists/base/md.amd64
cvs rdiff -u -r1.157 -r1.158 src/distrib/sets/lists/base/md.i386
cvs rdiff -u -r1.1322 -r1.1323 src/distrib/sets/lists/base/mi
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/lib/engines/Makefile
diff -u src/crypto/external/bsd/openssl/lib/engines/Makefile:1.4 src/crypto/external/bsd/openssl/lib/engines/Makefile:1.5
--- src/crypto/external/bsd/openssl/lib/engines/Makefile:1.4 Fri May 26 22:26:10 2023
+++ src/crypto/external/bsd/openssl/lib/engines/Makefile Sat May 27 00:08:30 2023
@@ -1,8 +1,13 @@
-# $NetBSD: Makefile,v 1.4 2023/05/26 22:26:10 riastradh Exp $
+# $NetBSD: Makefile,v 1.5 2023/05/27 00:08:30 riastradh Exp $
.include "bsd.own.mk"
# OpenSSL engines.
-SUBDIR= capi dasync devcrypto loader_attic ossltest padlock
+SUBDIR= capi dasync devcrypto loader_attic ossltest
+
+# VIA Padlock -- only makes sense for x86 which might be a VIA CPU
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
+SUBDIR+=padlock
+.endif
.include <bsd.subdir.mk>
Index: src/distrib/sets/lists/base/ad.aarch64
diff -u src/distrib/sets/lists/base/ad.aarch64:1.41 src/distrib/sets/lists/base/ad.aarch64:1.42
--- src/distrib/sets/lists/base/ad.aarch64:1.41 Fri May 26 22:27:51 2023
+++ src/distrib/sets/lists/base/ad.aarch64 Sat May 27 00:08:30 2023
@@ -1,4 +1,4 @@
-# $NetBSD: ad.aarch64,v 1.41 2023/05/26 22:27:51 riastradh Exp $
+# $NetBSD: ad.aarch64,v 1.42 2023/05/27 00:08:30 riastradh Exp $
./lib/eabi base-compat-lib compat,llvm
./lib/eabi/npf base-compat-lib compat,llvm
./lib/eabihf base-compat-lib compat,llvm
@@ -24,7 +24,6 @@
./usr/lib/eabi/openssl/engines/devcrypto.so base-compat-lib pic,openssl=30,compat,llvm
./usr/lib/eabi/openssl/engines/loader_attic.so base-compat-lib pic,openssl=30,compat,llvm
./usr/lib/eabi/openssl/engines/ossltest.so base-compat-lib pic,openssl=30,compat,llvm
-./usr/lib/eabi/openssl/engines/padlock.so base-compat-lib pic,openssl=30,compat,llvm
./usr/lib/eabi/openssl/modules base-compat-lib compat,llvm
./usr/lib/eabi/openssl/modules/legacy.so base-compat-lib compat,llvm
./usr/lib/eabi/security base-compat-lib compat,llvm
@@ -42,7 +41,6 @@
./usr/lib/eabihf/openssl/engines/devcrypto.so base-compat-lib pic,openssl=30,compat,llvm
./usr/lib/eabihf/openssl/engines/loader_attic.so base-compat-lib pic,openssl=30,compat,llvm
./usr/lib/eabihf/openssl/engines/ossltest.so base-compat-lib pic,openssl=30,compat,llvm
-./usr/lib/eabihf/openssl/engines/padlock.so base-compat-lib pic,openssl=30,compat,llvm
./usr/lib/eabihf/openssl/modules base-compat-lib compat,llvm
./usr/lib/eabihf/openssl/modules/legacy.so base-compat-lib compat,llvm
./usr/lib/eabihf/security base-compat-lib compat,llvm
Index: src/distrib/sets/lists/base/ad.mips
diff -u src/distrib/sets/lists/base/ad.mips:1.87 src/distrib/sets/lists/base/ad.mips:1.88
--- src/distrib/sets/lists/base/ad.mips:1.87 Fri May 26 22:27:51 2023
+++ src/distrib/sets/lists/base/ad.mips Sat May 27 00:08:30 2023
@@ -1,4 +1,4 @@
-# $NetBSD: ad.mips,v 1.87 2023/05/26 22:27:51 riastradh Exp $
+# $NetBSD: ad.mips,v 1.88 2023/05/27 00:08:30 riastradh Exp $
./lib/libc_fp.so base-sys-shlib dynamicroot,softfloat,arch64
./lib/libc_fp.so.0 base-sys-shlib dynamicroot,softfloat,arch64
./lib/libc_fp.so.0.0 base-sys-shlib dynamicroot,softfloat,arch64
@@ -15,7 +15,6 @@
./usr/lib/64/openssl/engines/devcryptoapi.so base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb,openssl=30
./usr/lib/64/openssl/engines/loader_atticapi.so base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb,openssl=30
./usr/lib/64/openssl/engines/ossltest.so base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb,openssl=30
-./usr/lib/64/openssl/engines/padlock.so base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb,openssl=30
./usr/lib/64/openssl/modules base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb
./usr/lib/64/openssl/modules/legacy.so base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb
./usr/lib/libc_fp.so base-sys-shlib softfloat,arch64
@@ -35,7 +34,6 @@
./usr/lib/o32/openssl/engines/devcrypto.so base-compat-shlib compat,pic,arch64,openssl=30
./usr/lib/o32/openssl/engines/loader_attic.so base-compat-shlib compat,pic,arch64,openssl=30
./usr/lib/o32/openssl/engines/ossltest.so base-compat-shlib compat,pic,arch64,openssl=30
-./usr/lib/o32/openssl/engines/padlock.so base-compat-shlib compat,pic,arch64,openssl=30
./usr/lib/o32/openssl/modules base-crypto-usr compat,pic,arch64
./usr/lib/o32/openssl/modules/legacy.so base-crypto-usr compat,pic,arch64
./usr/lib/n32/libc_fp.so base-compat-shlib compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb
@@ -48,7 +46,6 @@
./usr/lib/n32/openssl/engines/devcrypto.so base-compat-shlib compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb,openssl=30
./usr/lib/n32/openssl/engines/loader_attic.so base-compat-shlib compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb,openssl=30
./usr/lib/n32/openssl/engines/ossltest.so base-compat-shlib compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb,openssl=30
-./usr/lib/n32/openssl/engines/padlock.so base-compat-shlib compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb,openssl=30
./usr/lib/n32/openssl/modules base-crypto-usr compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb
./usr/lib/n32/openssl/modules/legacy.so base-crypto-usr compat,pic,arch64,!machine_arch=mips64el,!machine_arch=mips64eb
./usr/libexec/ld.elf_so-64 base-compat-shlib compat,pic,arch64,!machine_arch=mipsn64el,!machine_arch=mipsn64eb
Index: src/distrib/sets/lists/base/ad.powerpc
diff -u src/distrib/sets/lists/base/ad.powerpc:1.45 src/distrib/sets/lists/base/ad.powerpc:1.46
--- src/distrib/sets/lists/base/ad.powerpc:1.45 Fri May 26 22:27:51 2023
+++ src/distrib/sets/lists/base/ad.powerpc Sat May 27 00:08:30 2023
@@ -1,4 +1,4 @@
-# $NetBSD: ad.powerpc,v 1.45 2023/05/26 22:27:51 riastradh Exp $
+# $NetBSD: ad.powerpc,v 1.46 2023/05/27 00:08:30 riastradh Exp $
./libexec/ld.elf_so-powerpc base-sysutil-bin compat,pic
./usr/bin/fdformat base-util-bin
./usr/libexec/ld.elf_so-powerpc base-sysutil-bin compat,pic
@@ -9,6 +9,5 @@
./usr/lib/powerpc/openssl/engines/devcrypto.so base-crypto-usr compat,pic,openssl=30
./usr/lib/powerpc/openssl/engines/loader_attic.so base-crypto-usr compat,pic,openssl=30
./usr/lib/powerpc/openssl/engines/ossltest.so base-crypto-usr compat,pic,openssl=30
-./usr/lib/powerpc/openssl/engines/padlock.so base-crypto-usr compat,pic,openssl=30
./usr/lib/powerpc/openssl/modules base-crypto-usr compat
./usr/lib/powerpc/openssl/modules/legacy.so base-crypto-usr compat,pic,openssl=30
Index: src/distrib/sets/lists/base/ad.riscv
diff -u src/distrib/sets/lists/base/ad.riscv:1.28 src/distrib/sets/lists/base/ad.riscv:1.29
--- src/distrib/sets/lists/base/ad.riscv:1.28 Fri May 26 22:27:51 2023
+++ src/distrib/sets/lists/base/ad.riscv Sat May 27 00:08:30 2023
@@ -1,4 +1,4 @@
-# $NetBSD: ad.riscv,v 1.28 2023/05/26 22:27:51 riastradh Exp $
+# $NetBSD: ad.riscv,v 1.29 2023/05/27 00:08:30 riastradh Exp $
./libexec/ld.elf_so-rv32 base-compat-shlib compat,pic,arch64
./usr/libexec/ld.elf_so-rv32 base-compat-shlib compat,pic,arch64
./usr/lib/rv32/openssl base-crypto-usr compat
@@ -8,7 +8,6 @@
./usr/lib/rv32/openssl/engines/devcrypto.so base-crypto-usr compat,pic,openssl=30
./usr/lib/rv32/openssl/engines/loader_attic.so base-crypto-usr compat,pic,openssl=30
./usr/lib/rv32/openssl/engines/ossltest.so base-crypto-usr compat,pic,openssl=30
-./usr/lib/rv32/openssl/engines/padlock.so base-crypto-usr compat,pic,openssl=30
./usr/lib/rv32/openssl/modules base-crypto-usr compat
./usr/lib/rv32/openssl/modules/legacy.so base-crypto-usr compat,pic,openssl=30
./usr/mdec/bootriscv64.efi base-sysutil-bin uefi,arch64
Index: src/distrib/sets/lists/base/md.amd64
diff -u src/distrib/sets/lists/base/md.amd64:1.291 src/distrib/sets/lists/base/md.amd64:1.292
--- src/distrib/sets/lists/base/md.amd64:1.291 Fri May 26 22:27:51 2023
+++ src/distrib/sets/lists/base/md.amd64 Sat May 27 00:08:30 2023
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.291 2023/05/26 22:27:51 riastradh Exp $
+# $NetBSD: md.amd64,v 1.292 2023/05/27 00:08:30 riastradh Exp $
./dev/lms0 base-obsolete obsolete
./dev/mms0 base-obsolete obsolete
./libexec/ld.elf_so-i386 base-sys-shlib compat,pic
@@ -30,6 +30,7 @@
./usr/lib/libx86_64.so base-sys-shlib pic
./usr/lib/libx86_64.so.0 base-sys-shlib pic
./usr/lib/libx86_64.so.0.0 base-sys-shlib pic
+./usr/lib/openssl/engines/padlock.so base-crypto-usr pic,openssl=30
./usr/libexec/ld.elf_so-i386 base-sys-shlib compat,pic
./usr/lkm/aps.o base-obsolete obsolete
./usr/lkm/compat_linux.o base-obsolete obsolete
Index: src/distrib/sets/lists/base/md.i386
diff -u src/distrib/sets/lists/base/md.i386:1.157 src/distrib/sets/lists/base/md.i386:1.158
--- src/distrib/sets/lists/base/md.i386:1.157 Thu Sep 8 05:16:45 2022
+++ src/distrib/sets/lists/base/md.i386 Sat May 27 00:08:30 2023
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.157 2022/09/08 05:16:45 rillig Exp $
+# $NetBSD: md.i386,v 1.158 2023/05/27 00:08:30 riastradh Exp $
./dev/lms0 base-obsolete obsolete
./dev/mms0 base-obsolete obsolete
./dev/pms0 base-obsolete obsolete
@@ -27,6 +27,7 @@
./usr/lib/libpmc.so base-obsolete obsolete
./usr/lib/libpmc.so.1 base-obsolete obsolete
./usr/lib/libpmc.so.1.0 base-obsolete obsolete
+./usr/lib/openssl/engines/padlock.so base-crypto-usr pic,openssl=30
./usr/libexec/ld.so base-sys-shlib
./usr/lkm/aps.o base-obsolete obsolete
./usr/lkm/compat_freebsd.o base-obsolete obsolete
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1322 src/distrib/sets/lists/base/mi:1.1323
--- src/distrib/sets/lists/base/mi:1.1322 Fri May 26 22:27:51 2023
+++ src/distrib/sets/lists/base/mi Sat May 27 00:08:30 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1322 2023/05/26 22:27:51 riastradh Exp $
+# $NetBSD: mi,v 1.1323 2023/05/27 00:08:30 riastradh Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -1217,7 +1217,6 @@
./usr/lib/openssl/engines/devcrypto.so base-crypto-usr pic,openssl=30
./usr/lib/openssl/engines/loader_attic.so base-crypto-usr pic,openssl=30
./usr/lib/openssl/engines/ossltest.so base-crypto-usr pic,openssl=30
-./usr/lib/openssl/engines/padlock.so base-crypto-usr pic,openssl=30
./usr/lib/openssl/modules base-crypto-usr
./usr/lib/openssl/modules/legacy.so base-crypto-usr pic,openssl=30
./usr/lib/postfix base-postfix-usr
