Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ACMS for DRTM measured launch #1478

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update ACMS for DRTM measured launch #1478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ade8434
[acms] Update SINIT modules to latest
Aug 17, 2023
8211fab
[syslinux] Update isolinux, pxelinux, openxt.cfg
Aug 18, 2023
e6ddf4b
[ml-functions] Use acminfo to ID sinit modules
Sep 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions recipes-devtools/syslinux/files/isolinux.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ PROMPT 1
TIMEOUT 20
LABEL xenclient
kernel mboot.c32
append tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- xen.gz flask=disabled console=com1 dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- vmlinuz quiet root=/dev/ram rw start_install=new eject_cdrom=1 answerfile=/install/answers/default.ans console=hvc0 selinux=0 --- rootfs.gz --- gm45.acm --- q35.acm --- q45q43.acm --- duali.acm --- quadi.acm --- ivb_snb.acm --- xeon56.acm --- xeone7.acm --- hsw.acm --- bdw.acm --- skl.acm --- kbl.acm --- cfl.acm --- microcode_intel.bin
append tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- xen.gz flask=disabled console=com1 dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- vmlinuz quiet root=/dev/ram rw start_install=new eject_cdrom=1 answerfile=/install/answers/default.ans console=hvc0 selinux=0 --- rootfs.gz --- snb_ivb.bin --- bdw_hsw.bin --- skl_kbl_aml.bin --- cfl_wkl_cml.bin --- cml_s.bin --- cml_s_tgp.bin --- rkls.bin --- tgl.bin --- adl.bin --- microcode_intel.bin

LABEL verbose
kernel mboot.c32
append tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- vmlinuz quiet root=/dev/ram rw start_install=new eject_cdrom=1 answerfile=/install/answers/default.ans console=hvc0 selinux=0 --- rootfs.gz --- gm45.acm --- q35.acm --- q45q43.acm --- duali.acm --- quadi.acm --- ivb_snb.acm --- xeon56.acm --- xeone7.acm --- hsw.acm --- bdw.acm --- skl.acm --- kbl.acm --- cfl.acm --- microcode_intel.bin
append tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- vmlinuz quiet root=/dev/ram rw start_install=new eject_cdrom=1 answerfile=/install/answers/default.ans console=hvc0 selinux=0 --- rootfs.gz --- snb_ivb.bin --- bdw_hsw.bin --- skl_kbl_aml.bin --- cfl_wkl_cml.bin --- cml_s.bin --- cml_s_tgp.bin --- rkls.bin --- tgl.bin --- adl.bin --- microcode_intel.bin
LABEL automatic
kernel mboot.c32
append tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- xen.gz flask=disabled console=com1 dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- vmlinuz quiet root=/dev/ram rw start_install=new eject_cdrom=1 answerfile=/install/answers/auto-cd.ans console=hvc0 selinux=0 --- rootfs.gz --- gm45.acm --- q35.acm --- q45q43.acm --- duali.acm --- quadi.acm --- ivb_snb.acm --- xeon56.acm --- xeone7.acm --- hsw.acm --- bdw.acm --- skl.acm --- kbl.acm --- cfl.acm --- microcode_intel.bin
append tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- xen.gz flask=disabled console=com1 dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- vmlinuz quiet root=/dev/ram rw start_install=new eject_cdrom=1 answerfile=/install/answers/auto-cd.ans console=hvc0 selinux=0 --- rootfs.gz --- snb_ivb.bin --- bdw_hsw.bin --- skl_kbl_aml.bin --- cfl_wkl_cml.bin --- cml_s.bin --- cml_s_tgp.bin --- rkls.bin --- tgl.bin --- adl.bin --- microcode_intel.bin
10 changes: 5 additions & 5 deletions recipes-devtools/syslinux/files/pxelinux.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ timeout 10

label xc-installer
kernel @TFTP_PATH@/mboot.c32
append @TFTP_PATH@/tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- @TFTP_PATH@/xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- @TFTP_PATH@/vmlinuz quiet selinux=0 console=hvc0 root=/dev/ram rw start_install answerfile=tftp://dhcp/@TFTP_PATH@/network.ans --- @TFTP_PATH@/rootfs.gz --- @TFTP_PATH@/gm45.acm --- @TFTP_PATH@/q35.acm --- @TFTP_PATH@/q45q43.acm --- @TFTP_PATH@/duali.acm --- @TFTP_PATH@/quadi.acm --- @TFTP_PATH@/ivb_snb.acm --- @TFTP_PATH@/xeon56.acm --- @TFTP_PATH@/xeone7.acm --- @TFTP_PATH@/hsw.acm --- @TFTP_PATH@/bdw.acm --- @TFTP_PATH@/skl.acm --- @TFTP_PATH@/kbl.acm --- @TFTP_PATH@/cfl.acm --- @TFTP_PATH@/microcode_intel.bin
append @TFTP_PATH@/tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- @TFTP_PATH@/xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- @TFTP_PATH@/vmlinuz quiet selinux=0 console=hvc0 root=/dev/ram rw start_install answerfile=tftp://dhcp/@TFTP_PATH@/network.ans --- @TFTP_PATH@/rootfs.gz --- @TFTP_PATH@/snb_ivb.bin --- @TFTP_PATH@/bdw_hsw.bin --- @TFTP_PATH@/skl_kbl_aml.bin --- @TFTP_PATH@/cfl_wkl_cml.bin --- @TFTP_PATH@/cml_s.bin --- @TFTP_PATH@/cml_s_tgp.bin -- @TFTP_PATH@/rkls.bin --- @TFTP_PATH@/tgl.bin --- @TFTP_PATH@/adl.bin --- @TFTP_PATH@/microcode_intel.bin

label xc-installer-upgrade
kernel @TFTP_PATH@/mboot.c32
append @TFTP_PATH@/tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- @TFTP_PATH@/xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- @TFTP_PATH@/vmlinuz quiet selinux=0 console=hvc0 root=/dev/ram rw start_install answerfile=tftp://dhcp/@TFTP_PATH@/network_upgrade.ans --- @TFTP_PATH@/rootfs.gz --- @TFTP_PATH@/gm45.acm --- @TFTP_PATH@/q35.acm --- @TFTP_PATH@/q45q43.acm --- @TFTP_PATH@/duali.acm --- @TFTP_PATH@/quadi.acm --- @TFTP_PATH@/ivb_snb.acm --- @TFTP_PATH@/xeon56.acm --- @TFTP_PATH@/xeone7.acm --- @TFTP_PATH@/hsw.acm --- @TFTP_PATH@/bdw.acm --- @TFTP_PATH@/skl.acm --- @TFTP_PATH@/kbl.acm --- @TFTP_PATH@/cfl.acm --- @TFTP_PATH@/microcode_intel.bin
append @TFTP_PATH@/tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- @TFTP_PATH@/xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- @TFTP_PATH@/vmlinuz quiet selinux=0 console=hvc0 root=/dev/ram rw start_install answerfile=tftp://dhcp/@TFTP_PATH@/network_upgrade.ans --- @TFTP_PATH@/rootfs.gz --- @TFTP_PATH@/snb_ivb.bin --- @TFTP_PATH@/bdw_hsw.bin --- @TFTP_PATH@/skl_kbl_aml.bin --- @TFTP_PATH@/cfl_wkl_cml.bin --- @TFTP_PATH@/cml_s.bin --- @TFTP_PATH@/cml_s_tgp.bin -- @TFTP_PATH@/rkls.bin --- @TFTP_PATH@/tgl.bin --- @TFTP_PATH@/adl.bin --- @TFTP_PATH@/microcode_intel.bin

label xc-installer-manual
kernel @TFTP_PATH@/mboot.c32
append @TFTP_PATH@/tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- @TFTP_PATH@/xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- @TFTP_PATH@/vmlinuz quiet selinux=0 console=hvc0 root=/dev/ram rw start_install answerfile=tftp://dhcp/@TFTP_PATH@/network_manual.ans --- @TFTP_PATH@/rootfs.gz --- @TFTP_PATH@/gm45.acm --- @TFTP_PATH@/q35.acm --- @TFTP_PATH@/q45q43.acm --- @TFTP_PATH@/duali.acm --- @TFTP_PATH@/quadi.acm --- @TFTP_PATH@/ivb_snb.acm --- @TFTP_PATH@/xeon56.acm --- @TFTP_PATH@/xeone7.acm --- @TFTP_PATH@/hsw.acm --- @TFTP_PATH@/bdw.acm --- @TFTP_PATH@/skl.acm --- @TFTP_PATH@/kbl.acm --- @TFTP_PATH@/cfl.acm --- @TFTP_PATH@/microcode_intel.bin
append @TFTP_PATH@/tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- @TFTP_PATH@/xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- @TFTP_PATH@/vmlinuz quiet selinux=0 console=hvc0 root=/dev/ram rw start_install answerfile=tftp://dhcp/@TFTP_PATH@/network_manual.ans --- @TFTP_PATH@/rootfs.gz --- @TFTP_PATH@/snb_ivb.bin --- @TFTP_PATH@/bdw_hsw.bin --- @TFTP_PATH@/skl_kbl_aml.bin --- @TFTP_PATH@/cfl_wkl_cml.bin --- @TFTP_PATH@/cml_s.bin --- @TFTP_PATH@/cml_s_tgp.bin -- @TFTP_PATH@/rkls.bin --- @TFTP_PATH@/tgl.bin --- @TFTP_PATH@/adl.bin --- @TFTP_PATH@/microcode_intel.bin

label xc-installer-download-win
kernel @TFTP_PATH@/mboot.c32
append @TFTP_PATH@/tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- @TFTP_PATH@/xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- @TFTP_PATH@/vmlinuz quiet selinux=0 console=hvc0 root=/dev/ram rw start_install answerfile=tftp://dhcp/@TFTP_PATH@/network_download_win.ans --- @TFTP_PATH@/rootfs.gz --- @TFTP_PATH@/gm45.acm --- @TFTP_PATH@/q35.acm --- @TFTP_PATH@/q45q43.acm --- @TFTP_PATH@/duali.acm --- @TFTP_PATH@/quadi.acm --- @TFTP_PATH@/ivb_snb.acm --- @TFTP_PATH@/xeon56.acm --- @TFTP_PATH@/xeone7.acm --- @TFTP_PATH@/hsw.acm --- @TFTP_PATH@/bdw.acm --- @TFTP_PATH@/skl.acm --- @TFTP_PATH@/kbl.acm --- @TFTP_PATH@/cfl.acm --- @TFTP_PATH@/microcode_intel.bin
append @TFTP_PATH@/tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- @TFTP_PATH@/xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- @TFTP_PATH@/vmlinuz quiet selinux=0 console=hvc0 root=/dev/ram rw start_install answerfile=tftp://dhcp/@TFTP_PATH@/network_download_win.ans --- @TFTP_PATH@/rootfs.gz --- @TFTP_PATH@/snb_ivb.bin --- @TFTP_PATH@/bdw_hsw.bin --- @TFTP_PATH@/skl_kbl_aml.bin --- @TFTP_PATH@/cfl_wkl_cml.bin --- @TFTP_PATH@/cml_s.bin --- @TFTP_PATH@/cml_s_tgp.bin -- @TFTP_PATH@/rkls.bin --- @TFTP_PATH@/tgl.bin --- @TFTP_PATH@/adl.bin --- @TFTP_PATH@/microcode_intel.bin

label xc-installer-manual-download-win
kernel @TFTP_PATH@/mboot.c32
append @TFTP_PATH@/tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- @TFTP_PATH@/xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- @TFTP_PATH@/vmlinuz quiet selinux=0 console=hvc0 root=/dev/ram rw start_install answerfile=tftp://dhcp/@TFTP_PATH@/network_manual_download_win.ans --- @TFTP_PATH@/rootfs.gz --- @TFTP_PATH@/gm45.acm --- @TFTP_PATH@/q35.acm --- @TFTP_PATH@/q45q43.acm --- @TFTP_PATH@/duali.acm --- @TFTP_PATH@/quadi.acm --- @TFTP_PATH@/ivb_snb.acm --- @TFTP_PATH@/xeon56.acm --- @TFTP_PATH@/xeone7.acm --- @TFTP_PATH@/hsw.acm --- @TFTP_PATH@/bdw.acm --- @TFTP_PATH@/skl.acm --- @TFTP_PATH@/kbl.acm --- @TFTP_PATH@/cfl.acm --- @TFTP_PATH@/microcode_intel.bin
append @TFTP_PATH@/tboot.gz min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory --- @TFTP_PATH@/xen.gz flask=disabled console=com1,vga dom0_max_vcpus=1 com1=115200,8n1,pci dom0_mem=max:8G ucode=-1 smt=0 --- @TFTP_PATH@/vmlinuz quiet selinux=0 console=hvc0 root=/dev/ram rw start_install answerfile=tftp://dhcp/@TFTP_PATH@/network_manual_download_win.ans --- @TFTP_PATH@/rootfs.gz --- @TFTP_PATH@/snb_ivb.bin --- @TFTP_PATH@/bdw_hsw.bin --- @TFTP_PATH@/skl_kbl_aml.bin --- @TFTP_PATH@/cfl_wkl_cml.bin --- @TFTP_PATH@/cml_s.bin --- @TFTP_PATH@/cml_s_tgp.bin -- @TFTP_PATH@/rkls.bin --- @TFTP_PATH@/tgl.bin --- @TFTP_PATH@/adl.bin --- @TFTP_PATH@/microcode_intel.bin
23 changes: 10 additions & 13 deletions recipes-openxt/openxt-measuredlaunch/openxt-measuredlaunch/ml-functions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,10 @@ hash_extend() {
rm $buffer
}

is_sinit_module() {
acminfo "${1}" >/dev/null 2>&1
}

# Function to calculate PCR 17
# return 0 on success
# return 1 on failure
Expand Down Expand Up @@ -262,13 +266,9 @@ pcr19() {
cmdline=""
fi

# ACMs have a binary fingerprint, hash first 8 bytes of every .bin file
# and if it matches hash of fingerprint, skip.
if $(echo ${module} | egrep -q -e '\.bin$|\.BIN$'); then
finger=$(head -c 8 ${root}/${module}|sha1sum|head -c 7)
if [ "$finger" = "c22c443" ]; then
continue
fi
# skip SINIT modules
if is_sinit_module ${module}; then
continue
fi

case ${mod_num} in
Expand Down Expand Up @@ -331,14 +331,11 @@ hash_modules() {
cmdline=""
fi

# ACMs have a binary fingerprint, hash first 8 bytes of every .bin file
# and if it matches hash of fingerprint, skip.
if $(echo ${module} | egrep -q -e '\.bin$|\.BIN$'); then
finger=$(head -c 8 ${root}/${module}|sha1sum|head -c 7)
[ "$finger" = "c22c443" ] && continue
# skip SINIT modules
if is_sinit_module ${module}; then
continue
fi


if [[ ${mod_num} -eq 0 ]]; then
cmdline=$(echo ${cmdline} | sed -e 's/FIXME\s*//')
hash_list=$(lcp2_mlehash --create --alg $hashalg \
Expand Down
2 changes: 1 addition & 1 deletion recipes-openxt/xenclient-dom0-tweaks/xenclient-dom0-tweaks/openxt.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[global]
default=openxt-normal
tboot=tboot min_ram=0x2000000 loglvl=all serial=115200,8n1,0x3f8 logging=serial,memory
sinit=GM45_GS45_PM45_SINIT_51.BIN Q35_SINIT_51.BIN Q45_Q43_SINIT_51.BIN i5_i7_DUAL_SINIT_51.BIN i7_QUAD_SINIT_51.BIN 3rd_gen_i5_i7_SINIT_67.BIN Xeon-5600-3500-SINIT-v1.1.bin Xeon-E7-8800-4800-2800-SINIT-v1.1.bin 4th_gen_i5_i7_SINIT_75.BIN 5th_gen_i5_i7_SINIT_79.BIN 6th_gen_i5_i7_SINIT_71.BIN 7th_gen_i5_i7-SINIT_74.bin 8th_gen_i5_i7-SINIT_76.bin
sinit=snb_ivb.bin bdw_hsw.bin skl_kbl_aml.bin cfl_wkl_cml.bin cml_s.bin cml_s_tgp.bin rkls.bin tgl.bin adl.bin
ucode=microcode_intel.bin

[openxt-normal]
Expand Down
Loading