Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(586)

Side by Side Diff: tpm/tpm_nv_storage.c

Issue 660204: Upgrade to tpm-emulator version 0.7. (Closed)
Patch Set: Created 10 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « tpm/tpm_migration.c ('k') | tpm/tpm_owner.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* Software-Based Trusted Platform Module (TPM) Emulator for Linux 1 /* Software-based Trusted Platform Module (TPM) Emulator
2 * Copyright (C) 2004 Mario Strasser <mast@gmx.net>, 2 * Copyright (C) 2004-2010 Mario Strasser <mast@gmx.net>
3 * Swiss Federal Institute of Technology (ETH) Zurich
4 * 3 *
5 * This module is free software; you can redistribute it and/or modify 4 * This module is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published 5 * it under the terms of the GNU General Public License as published
7 * by the Free Software Foundation; either version 2 of the License, 6 * by the Free Software Foundation; either version 2 of the License,
8 * or (at your option) any later version. 7 * or (at your option) any later version.
9 * 8 *
10 * This module is distributed in the hope that it will be useful, 9 * This module is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details. 12 * GNU General Public License for more details.
14 * 13 *
15 * $Id$ 14 * $Id: tpm_nv_storage.c 364 2010-02-11 10:24:45Z mast $
16 */ 15 */
17 16
18 #include "tpm_emulator.h" 17 #include "tpm_emulator.h"
19 #include "tpm_commands.h" 18 #include "tpm_commands.h"
20 #include "tpm_data.h" 19 #include "tpm_data.h"
21 #include "tpm_handles.h" 20 #include "tpm_handles.h"
22 21
23 /* 22 /*
24 * Non-volatile Storage ([TPM_Part3], Section 20) 23 * Non-volatile Storage ([TPM_Part3], Section 20)
25 * This section handles the allocation and use of the TPM non-volatile storage. 24 * This section handles the allocation and use of the TPM non-volatile storage.
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 if (nv == NULL) return TPM_BADINDEX; 367 if (nv == NULL) return TPM_BADINDEX;
369 if (!(nv->pubInfo.permission.attributes & TPM_NV_PER_AUTHREAD)) 368 if (!(nv->pubInfo.permission.attributes & TPM_NV_PER_AUTHREAD))
370 return TPM_AUTH_CONFLICT; 369 return TPM_AUTH_CONFLICT;
371 /* verify authorization */ 370 /* verify authorization */
372 res = tpm_verify_auth(auth1, nv->authValue, nvIndex); 371 res = tpm_verify_auth(auth1, nv->authValue, nvIndex);
373 if (res != TPM_SUCCESS) return res; 372 if (res != TPM_SUCCESS) return res;
374 /* read data */ 373 /* read data */
375 return nv_read(nv, offset, inDataSize, outDataSize, data, TRUE); 374 return nv_read(nv, offset, inDataSize, outDataSize, data, TRUE);
376 } 375 }
377 376
OLDNEW
« no previous file with comments | « tpm/tpm_migration.c ('k') | tpm/tpm_owner.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698