entd: Fix problem where a future date setting causes TPM token to be cleared often

bin/fix_pkcs11_token.sh

 #!/bin/sh
 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 if [ -z "$1" ]; then
   USERNAME="chronos"
 else
   USERNAME="$1"
 fi
@@ skipping 13 matching lines @@
     logger -t $(basename "$0") "$@"
   fi
 }
 
 is_token_broken() {
   if [ ! -e "/var/lib/.tpm_owned" ]; then
     log "TPM is not owned, token for $USERNAME can't be valid."
     return 0
   fi
 
-  if [ "/var/lib/.tpm_owned" -nt "$USER_TOKEN_DIR" ]; then
-    log "PKCS#11 token for $USERNAME is from a previous TPM owner."
-    return 0
-  fi
-
   if [ ! -e "$USER_TOKEN_DIR/PRIVATE_ROOT_KEY.pem" -o \
        ! -e "$USER_TOKEN_DIR/TOK_OBJ/70000000" ]; then
-    log "PKCS#11 token for $USERNAME is missing some files."
+    log "PKCS#11 token for $USERNAME is missing some files.  Possibly not yet"
+    log "initialized?  TOK_OBJ contents were $(echo $USER_TOKEN_DIR/TOK_OBJ/*)."
     return 0
   fi
 
   log "PKCS#11 token for $USERNAME looks ok."
   return 1
 }
 
 if [ ! -e "$USER_TOKEN_DIR/NVTOK.DAT" ]; then
   log "No PKCS#11 token found for $USERNAME."
 elif is_token_broken; then
@@ skipping 16 matching lines @@
 
 # Creating this directory because if it's not there, token initialization
 # will neither create it nor populate it.
 mkdir -p "$USER_TOKEN_DIR/TOK_OBJ"
 
 # Configure the tpm as a token
 pkcs_slot 0 tpm
 
 # Make sure the user can access their own data
 chown -R "$USERNAME:$PKCS11_GROUP" "$USER_TOKEN_DIR"