No harm in trying to continue if tpm_resetdalock fails

QubesOS · Aug 26, 2015 · 86ac69c · 86ac69c
1 parent 2747235
commit 86ac69c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/anti-evil-maid/90anti-evil-maid/anti-evil-maid-unseal b/anti-evil-maid/90anti-evil-maid/anti-evil-maid-unseal
@@ -110,7 +110,7 @@ else
         fi
 
         log "Wrong SRK password, resetting dictionary attack lock..."
-        tpm_resetdalock -z  # here, -z is an empty owner (not SRK) password
+        tpm_resetdalock -z || true  # -z is an empty owner (not SRK) password
     done
 fi
 

diff --git a/tpm-extra/sbin/tpm_z_srk b/tpm-extra/sbin/tpm_z_srk
@@ -12,5 +12,5 @@ if tpm_sealdata -z </dev/null >/dev/null; then
     echo -z
 else
     log "yes, SRK is password protected; resetting dictionary attack lock..."
-    tpm_resetdalock -z  # here, -z is an empty owner (not SRK) password
+    tpm_resetdalock -z || true  # -z is an empty owner (not SRK) password
 fi