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

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

Change-Id: Icd14783f08c6761c74a35cec10821e3e97ce74ae

BUG=chrome-os-partner:2227
TEST=gmerge to device, set file to future, see .tpm directory persist

Committed: http://chrome-svn/viewvc/chromeos?view=rev&revision=5aaabd8

[rginda, 2011-02-05 04:36:47]

LGTM
On Feb 4, 2011 6:29 PM, <kmixter@chromium.org> wrote:
> Reviewers: rginda,
>
> Description:
> entd: Fix problem where a future date setting causes TPM token to be
cleared
> often
>
> Change-Id: Icd14783f08c6761c74a35cec10821e3e97ce74ae
>
> BUG=chrome-os-partner:2227
> TEST=gmerge to device, set file to future, see .tpm directory persist
>
> Please review this at http://codereview.chromium.org/6312172/
>
> SVN Base: ssh://git@gitrw.chromium.org:9222/entd.git@master
>
> Affected files:
> M bin/fix_pkcs11_token.sh
>
>
> Index: bin/fix_pkcs11_token.sh
> diff --git a/bin/fix_pkcs11_token.sh b/bin/fix_pkcs11_token.sh
> index
>
31ccf228dbf2f9a667a944d87fcebe1412598006..ae3c5d691e9458796fbaffc9818ff9d34086b1e0

> 100755
> --- a/bin/fix_pkcs11_token.sh
> +++ b/bin/fix_pkcs11_token.sh
> @@ -31,11 +31,6 @@ is_token_broken() {
> 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."
>
>

[kmixter1, 2011-02-08 02:13:33]

ptal - very small change in diagnostics.

On Fri, Feb 4, 2011 at 8:36 PM, Robert Ginda <rginda@chromium.org> wrote:

> LGTM
> On Feb 4, 2011 6:29 PM, <kmixter@chromium.org> wrote:
> > Reviewers: rginda,
> >
> > Description:
> > entd: Fix problem where a future date setting causes TPM token to be
> cleared
> > often
> >
> > Change-Id: Icd14783f08c6761c74a35cec10821e3e97ce74ae
> >
> > BUG=chrome-os-partner:2227
> > TEST=gmerge to device, set file to future, see .tpm directory persist
> >
> > Please review this at http://codereview.chromium.org/6312172/
> >
> > SVN Base: ssh://git@gitrw.chromium.org:9222/entd.git@master
> >
> > Affected files:
> > M bin/fix_pkcs11_token.sh
> >
> >
> > Index: bin/fix_pkcs11_token.sh
> > diff --git a/bin/fix_pkcs11_token.sh b/bin/fix_pkcs11_token.sh
> > index
> >
>
31ccf228dbf2f9a667a944d87fcebe1412598006..ae3c5d691e9458796fbaffc9818ff9d34086b1e0
>
> > 100755
> > --- a/bin/fix_pkcs11_token.sh
> > +++ b/bin/fix_pkcs11_token.sh
> > @@ -31,11 +31,6 @@ is_token_broken() {
> > 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."
> >
> >
>

[rginda, 2011-02-08 17:06:43]

lgtm


On 2011/02/08 02:13:33, kmixter1 wrote:
> ptal - very small change in diagnostics.
> 
> On Fri, Feb 4, 2011 at 8:36 PM, Robert Ginda <mailto:rginda@chromium.org>
wrote:
> 
> > LGTM
> > On Feb 4, 2011 6:29 PM, <mailto:kmixter@chromium.org> wrote:
> > > Reviewers: rginda,
> > >
> > > Description:
> > > entd: Fix problem where a future date setting causes TPM token to be
> > cleared
> > > often
> > >
> > > Change-Id: Icd14783f08c6761c74a35cec10821e3e97ce74ae
> > >
> > > BUG=chrome-os-partner:2227
> > > TEST=gmerge to device, set file to future, see .tpm directory persist
> > >
> > > Please review this at http://codereview.chromium.org/6312172/
> > >
> > > SVN Base: ssh://git@gitrw.chromium.org:9222/entd.git@master
> > >
> > > Affected files:
> > > M bin/fix_pkcs11_token.sh
> > >
> > >
> > > Index: bin/fix_pkcs11_token.sh
> > > diff --git a/bin/fix_pkcs11_token.sh b/bin/fix_pkcs11_token.sh
> > > index
> > >
> >
>
31ccf228dbf2f9a667a944d87fcebe1412598006..ae3c5d691e9458796fbaffc9818ff9d34086b1e0
> >
> > > 100755
> > > --- a/bin/fix_pkcs11_token.sh
> > > +++ b/bin/fix_pkcs11_token.sh
> > > @@ -31,11 +31,6 @@ is_token_broken() {
> > > 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."
> > >
> > >
> >