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

Side by Side Diff: tpm/tpm_ticks.c

Issue 660204: Upgrade to tpm-emulator version 0.7. (Closed)
Patch Set: Created 10 years, 9 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_testing.c ('k') | tpm/tpm_transport.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_ticks.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 #include "tpm_marshalling.h" 21 #include "tpm_marshalling.h"
23 22
24 /* 23 /*
25 * Timing Ticks ([TPM_Part3], Section 23) 24 * Timing Ticks ([TPM_Part3], Section 23)
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 tpmData.stany.data.currentTicks.tag = TPM_TAG_CURRENT_TICKS; 92 tpmData.stany.data.currentTicks.tag = TPM_TAG_CURRENT_TICKS;
94 tpmData.stany.data.currentTicks.currentTicks += tpm_get_ticks(); 93 tpmData.stany.data.currentTicks.currentTicks += tpm_get_ticks();
95 tpm_get_random_bytes(tpmData.stany.data.currentTicks.tickNonce.nonce, 94 tpm_get_random_bytes(tpmData.stany.data.currentTicks.tickNonce.nonce,
96 sizeof(TPM_NONCE)); 95 sizeof(TPM_NONCE));
97 tpmData.stany.data.currentTicks.tickRate = 1; 96 tpmData.stany.data.currentTicks.tickRate = 1;
98 } else { 97 } else {
99 tpmData.stany.data.currentTicks.currentTicks += tpm_get_ticks(); 98 tpmData.stany.data.currentTicks.currentTicks += tpm_get_ticks();
100 } 99 }
101 } 100 }
102 101
OLDNEW
« no previous file with comments | « tpm/tpm_testing.c ('k') | tpm/tpm_transport.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698