Proxmox-Port/swtpm
1
0
Fork 0
mirror of https://github.com/stefanberger/swtpm.git synced 2026-08-08 18:46:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

swtpm_setup: use variable for determining the NVRAM index to write into

Browse Source 
To prepare for writing data into different locations for ECC keys,
assign a variable the location of the NVRAM to write RSA related data
into.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
This commit is contained in:
Stefan Berger 2018-01-04 08:36:05 -05:00
parent a3b68edd6d
commit af94ba189e
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/swtpm_setup/swtpm_setup.sh.in
View File

@ -1448,7 +1448,7 @@ init_tpm2()
# where external app writes certs into
local certsdir="$tpm2_state_path"
local ek tmp output
local ek tmp output nvindex
local PLATFORM_CERT_FILE="$certsdir/platform.cert"
local EK_CERT_FILE="$certsdir/ek.cert"
@ -1489,9 +1489,11 @@ init_tpm2()
logit "Successfully created EK with handle" \
"$(printf "0x%08x" ${TPM2_EK_HANDLE})."
nvindex=${TPM2_NV_INDEX_RSA_EKTemplate}
if [ $((flags & $SETUP_ALLOW_SIGNING_F )) -ne 0 ]; then
tpm2_nv_define \
$((TPM2_NV_INDEX_RSA_EKTemplate)) \
${nvindex} \
$((TPMA_NV_PLATFORMCREATE | \
TPMA_NV_AUTHREAD | \
TPMA_NV_NO_DA | \
@ -1504,7 +1506,7 @@ init_tpm2()
return 1
fi
tpm2_nv_write \
$((TPM2_NV_INDEX_RSA_EKTemplate)) \
${nvindex} \
"${EK_TEMP_FILE}"
if [ $? -ne 0 ]; then
logerr "Could not write EK template into" \
@ -1513,7 +1515,7 @@ init_tpm2()
fi
if [ $((flags & SETUP_LOCK_NVRAM_F)) -ne 0 ]; then
tpm2_nv_writelock \
$((TPM2_NV_INDEX_RSA_EKTemplate))
${nvindex}
if [ $? -ne 0 ]; then
logerr "Could not lock EK template NVRAM" \
"location."
@ -1533,8 +1535,11 @@ init_tpm2()
if [ $((flags & SETUP_EK_CERT_F)) -ne 0 ] && \
[ -r "${EK_CERT_FILE}" ]; then
nvindex=${TPM2_NV_INDEX_RSA_EKCert}
tpm2_nv_define \
$((TPM2_NV_INDEX_RSA_EKCert)) \
${nvindex} \
$((TPMA_NV_PLATFORMCREATE | \
TPMA_NV_AUTHREAD | \
TPMA_NV_NO_DA | \
@ -1547,7 +1552,7 @@ init_tpm2()
return 1
fi
tpm2_nv_write \
$((TPM2_NV_INDEX_RSA_EKCert)) \
${nvindex} \
"${EK_CERT_FILE}"
if [ $? -ne 0 ]; then
logerr "Could not write EK certificate into" \
@ -1556,7 +1561,7 @@ init_tpm2()
fi
if [ $((flags & SETUP_LOCK_NVRAM_F)) -ne 0 ]; then
tpm2_nv_writelock \
$((TPM2_NV_INDEX_RSA_EKCert))
${nvindex}
if [ $? -ne 0 ]; then
logerr "Could not lock EK certificate NVRAM" \
"location."