|
Line
Link Here
|
| 0 |
-- a/src/include/tcsps.h |
0 |
++ b/src/include/tcsps.h |
|
Lines 23-35
int get_file();
Link Here
|
| 23 |
int put_file(int); |
23 |
int put_file(int); |
| 24 |
void close_file(int); |
24 |
void close_file(int); |
| 25 |
void ps_destroy(); |
25 |
void ps_destroy(); |
| 26 |
#ifdef SOLARIS |
26 |
TSS_RESULT read_data(int, void *, UINT32); |
| 27 |
TSS_RESULT read_data(int, void *, UINT32); |
27 |
TSS_RESULT write_data(int, void *, UINT32); |
| 28 |
TSS_RESULT write_data(int, void *, UINT32); |
|
|
| 29 |
#else |
| 30 |
inline TSS_RESULT read_data(int, void *, UINT32); |
| 31 |
inline TSS_RESULT write_data(int, void *, UINT32); |
| 32 |
#endif |
| 33 |
int write_key_init(int, UINT32, UINT32, UINT32); |
28 |
int write_key_init(int, UINT32, UINT32, UINT32); |
| 34 |
TSS_RESULT cache_key(UINT32, UINT16, TSS_UUID *, TSS_UUID *, UINT16, UINT32, UINT32); |
29 |
TSS_RESULT cache_key(UINT32, UINT16, TSS_UUID *, TSS_UUID *, UINT16, UINT32, UINT32); |
| 35 |
TSS_RESULT UnloadBlob_KEY_PS(UINT16 *, BYTE *, TSS_KEY *); |
30 |
TSS_RESULT UnloadBlob_KEY_PS(UINT16 *, BYTE *, TSS_KEY *); |
| 36 |
-- a/src/include/tspps.h |
31 |
++ b/src/include/tspps.h |
|
Lines 18-25
Link Here
|
| 18 |
|
18 |
|
| 19 |
TSS_RESULT get_file(int *); |
19 |
TSS_RESULT get_file(int *); |
| 20 |
int put_file(int); |
20 |
int put_file(int); |
| 21 |
inline TSS_RESULT read_data(int, void *, UINT32); |
21 |
TSS_RESULT read_data(int, void *, UINT32); |
| 22 |
inline TSS_RESULT write_data(int, void *, UINT32); |
22 |
TSS_RESULT write_data(int, void *, UINT32); |
| 23 |
UINT32 psfile_get_num_keys(int); |
23 |
UINT32 psfile_get_num_keys(int); |
| 24 |
TSS_RESULT psfile_get_parent_uuid_by_uuid(int, TSS_UUID *, TSS_UUID *); |
24 |
TSS_RESULT psfile_get_parent_uuid_by_uuid(int, TSS_UUID *, TSS_UUID *); |
| 25 |
TSS_RESULT psfile_remove_key_by_uuid(int, TSS_UUID *); |
25 |
TSS_RESULT psfile_remove_key_by_uuid(int, TSS_UUID *); |
| 26 |
-- a/src/tcs/ps/ps_utils.c |
26 |
++ b/src/tcs/ps/ps_utils.c |
|
Lines 42-52
Link Here
|
| 42 |
struct key_disk_cache *key_disk_cache_head = NULL; |
42 |
struct key_disk_cache *key_disk_cache_head = NULL; |
| 43 |
|
43 |
|
| 44 |
|
44 |
|
| 45 |
#ifdef SOLARIS |
|
|
| 46 |
TSS_RESULT |
45 |
TSS_RESULT |
| 47 |
#else |
|
|
| 48 |
inline TSS_RESULT |
| 49 |
#endif |
| 50 |
read_data(int fd, void *data, UINT32 size) |
46 |
read_data(int fd, void *data, UINT32 size) |
| 51 |
{ |
47 |
{ |
| 52 |
int rc; |
48 |
int rc; |
|
Lines 64-74
read_data(int fd, void *data, UINT32 size)
Link Here
|
| 64 |
} |
60 |
} |
| 65 |
|
61 |
|
| 66 |
|
62 |
|
| 67 |
#ifdef SOLARIS |
|
|
| 68 |
TSS_RESULT |
63 |
TSS_RESULT |
| 69 |
#else |
|
|
| 70 |
inline TSS_RESULT |
| 71 |
#endif |
| 72 |
write_data(int fd, void *data, UINT32 size) |
64 |
write_data(int fd, void *data, UINT32 size) |
| 73 |
{ |
65 |
{ |
| 74 |
int rc; |
66 |
int rc; |
| 75 |
-- a/src/tspi/ps/ps_utils.c |
67 |
++ b/src/tspi/ps/ps_utils.c |
|
Lines 22-28
Link Here
|
| 22 |
#include "tspps.h" |
22 |
#include "tspps.h" |
| 23 |
#include "tsplog.h" |
23 |
#include "tsplog.h" |
| 24 |
|
24 |
|
| 25 |
inline TSS_RESULT |
25 |
TSS_RESULT |
| 26 |
read_data(int fd, void *data, UINT32 size) |
26 |
read_data(int fd, void *data, UINT32 size) |
| 27 |
{ |
27 |
{ |
| 28 |
int rc; |
28 |
int rc; |
|
Lines 39-45
read_data(int fd, void *data, UINT32 size)
Link Here
|
| 39 |
return TSS_SUCCESS; |
39 |
return TSS_SUCCESS; |
| 40 |
} |
40 |
} |
| 41 |
|
41 |
|
| 42 |
inline TSS_RESULT |
42 |
TSS_RESULT |
| 43 |
write_data(int fd, void *data, UINT32 size) |
43 |
write_data(int fd, void *data, UINT32 size) |
| 44 |
{ |
44 |
{ |
| 45 |
int rc; |
45 |
int rc; |
