update tpm2-tools_3.2.1 -> tpm2-tools_4.1.1.bb, tpm2-abrmd_2.0.3 -> tpm2-abrmd_2.3.0, tpm2-tss_2.2.3.bb -> tpm2-tss_2.3.2.bb

2 files changed, 12 insertions, 0 deletions

diff --git a/meta-encrypted-storage/recipes-tpm/cryptfs-tpm2/cryptfs-tpm2/0002-luks-setup.sh-Updated-TPM-Tools.patch b/meta-encrypted-storage/recipes-tpm/cryptfs-tpm2/cryptfs-tpm2/0002-luks-setup.sh-Updated-TPM-Tools.patch
new file mode 100755
index 0000000..29a73f0
--- /dev/null
+++ b/meta-encrypted-storage/recipes-tpm/cryptfs-tpm2/cryptfs-tpm2/0002-luks-setup.sh-Updated-TPM-Tools.patch
@@ -0,0 +1,11 @@
+--- a/scripts/luks-setup.sh     2020-02-17 15:23:50.214278216 +0100
++++ b/scripts/luks-setup.sh     2020-02-17 15:22:41.054281439 +0100
+@@ -402,7 +402,7 @@
+     detect_tpm
+     if [ $? -eq 0 ]; then
+         if [ $OPT_EVICT_ALL -eq 1 ]; then
+-            cmd="tpm2_takeownership --clear"
++            cmd="tpm2_clear"
+             [ -n "$OPT_OLD_LOCKOUT_AUTH" ] && cmd="${cmd} --oldLockPasswd $OPT_OLD_LOCKOUT_AUTH"
+             [ -n "$OPT_LOCKOUT_AUTH" ] && cmd="${cmd} --LockPasswd $OPT_LOCKOUT_AUTH"
+             eval "$cmd"
diff --git a/meta-encrypted-storage/recipes-tpm/cryptfs-tpm2/cryptfs-tpm2_git.bb b/meta-encrypted-storage/recipes-tpm/cryptfs-tpm2/cryptfs-tpm2_git.bb
index e36e2f2..d8025c3 100644
--- a/meta-encrypted-storage/recipes-tpm/cryptfs-tpm2/cryptfs-tpm2_git.bb
+++ b/meta-encrypted-storage/recipes-tpm/cryptfs-tpm2/cryptfs-tpm2_git.bb
@@ -23,6 +23,7 @@ SRC_URI = "\
     git://github.com/jiazhang0/cryptfs-tpm2.git \
     file://0001-luks-setup.sh-Add-support-for-qemu-with-the-swtpm.patch \
     file://0001-encrypt_secret.py-switch-to-python3.patch \
+    file://0002-luks-setup.sh-Updated-TPM-Tools.patch \
 "
 SRCREV = "87c35c63090a33d4de437f518b8da9f2d1f1d828"