← Back to branch summary

~ubuntu-branches/ubuntu/raring/trousers/raring-proposed

« back to all changes in this revision

Viewing changes to src/tspi/obj_nv.c

  • Committer: Package Import Robot
  • Author(s): Pierre Chifflier
  • Date: 2012-06-18 22:22:21 UTC
  • mfrom: (0.1.22 sid)
  • Revision ID: package-import@ubuntu.com-20120618222221-kumdab5nrfx4kvyh
Tags: 0.3.9-1
* Imported Upstream version 0.3.9
* Refreshed Debian patches
* Removed patch 04-gcc46.patch, not required anymore

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/tspi/obj_nv.c
442
442
        UINT32 data_public_size = MAX_PUBLIC_DATA_SIZE;
443
443
        UINT32 offset;
444
444
        UINT16 pcrread_sizeOfSelect;
445
 
        UINT16 pcrwrite_sizeOfSelect;
446
445
        TSS_HCONTEXT tspContext;
447
446
        TSS_RESULT result;
448
447
 
466
465
                        + sizeof(TPM_LOCALITY_SELECTION)
467
466
                        + sizeof(TPM_COMPOSITE_HASH);
468
467
 
469
 
        pcrwrite_sizeOfSelect = Decode_UINT16(nv_data_public + offset);
 
468
        Decode_UINT16(nv_data_public + offset);
470
469
        offset = offset + sizeof(UINT16) + pcrread_sizeOfSelect + sizeof(TPM_LOCALITY_SELECTION);
471
470
        memcpy(*data, nv_data_public + offset, sizeof(TPM_COMPOSITE_HASH));
472
471
 
473
 
        if (pcrwrite_sizeOfSelect==0){ }; /* calm gcc46 */
474
 
 
475
472
        return result;
476
473
}
477
474