commit a49f9129735985d8851e38da0f2ca4380a51e388
author Vadim Bendebury <vbendeb@chromium.org> Tue Oct 27 16:32:54 2015 -0700
committer chrome-bot <chrome-bot@chromium.org> Wed Oct 28 00:34:49 2015 +0000
tree 5fae1fce4a817c84d48b247360348fd0461956dc
parent d7f4c46b70e957a68fec88f1c1f2aab39daf4ad2

Fix code using wrong field types

It looks like some of the source code scraped from the TCG Spec was
missing updates to reflect structure changes between revisions of the
spec.

This patch tweaks those areas of code,

BUG=chrome-os-partner:43025
TEST=all test of the test suite now pass

Change-Id: Ia1b9460803470b8c1c69055ddef88ed8dbcbb682
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/309306
Commit-Ready: Vadim Bendebury <vbendeb@google.com>
Tested-by: Vadim Bendebury <vbendeb@google.com>
Reviewed-by: Darren Krahn <dkrahn@chromium.org>
Reviewed-by: Utkarsh Sanghi <usanghi@chromium.org>

CryptUtil.c

diff --git a/CryptUtil.c b/CryptUtil.c
index abb6557..912c365 100644
--- a/CryptUtil.c
+++ b/CryptUtil.c
@@ -1943,19 +1943,19 @@
    if(publicArea->objectAttributes.sensitiveDataOrigin == CLEAR)
    {
        if(     (sensitiveCreate->data.t.size * 8)
-           != publicArea->parameters.symDetail.keyBits.sym)
+           != publicArea->parameters.symDetail.sym.keyBits.sym)
            return TPM_RC_KEY_SIZE;
        // Make sure that the key size is OK.
        // This implementation only supports symmetric key sizes that are
        // multiples of 8
-       if(publicArea->parameters.symDetail.keyBits.sym % 8 != 0)
+       if(publicArea->parameters.symDetail.sym.keyBits.sym % 8 != 0)
            return TPM_RC_KEY_SIZE;
    }
    else
    {
        // TPM is going to generate the key so set the size
        sensitive->sensitive.sym.t.size
-           = publicArea->parameters.symDetail.keyBits.sym / 8;
+           = publicArea->parameters.symDetail.sym.keyBits.sym / 8;
        sensitiveCreate->data.t.size = 0;
    }
    // Fill in the sensitive area
@@ -2614,7 +2614,7 @@
                     result = TPM_RC_VALUE;
                 else
                 {
-                    symDef = &decryptKey->publicArea.parameters.symDetail;
+                    symDef = &decryptKey->publicArea.parameters.symDetail.sym;
                     iv.t.size = CryptGetSymmetricBlockSize(symDef->algorithm,
                                                              symDef->keyBits.sym);
                     pAssert(iv.t.size != 0);
@@ -3101,7 +3101,7 @@
    case TPM_ALG_KEYEDHASH:
        break;
    case TPM_ALG_SYMCIPHER:
-       if(    (publicArea->parameters.symDetail.keyBits.sym + 7)/8
+       if(    (publicArea->parameters.symDetail.sym.keyBits.sym + 7)/8
            != sensitive->sensitive.sym.t.size)
             result = TPM_RC_BINDING;
        break;