← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/tcs/tcs_key_mem_cache.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/tcs/tcs_key_mem_cache.c
1027
1027
 
1028
1028
                offset = 0;
1029
1029
                LoadBlob_TSS_KEY(&offset, keyBlob, myKey);
1030
 
                if ((result = TCSP_LoadKeyByBlob_Internal(hContext, parentHandle, offset, keyBlob,
1031
 
                                                          NULL, &tcsKeyHandle, slotOut)))
 
1030
                if (TPM_VERSION_IS(1,2))
 
1031
                        result = TCSP_LoadKey2ByBlob_Internal(hContext,
 
1032
                                                              parentHandle, offset,
 
1033
                                                              keyBlob, NULL,
 
1034
                                                              &tcsKeyHandle);
 
1035
                else
 
1036
                        result = TCSP_LoadKeyByBlob_Internal(hContext,
 
1037
                                                             parentHandle, offset,
 
1038
                                                             keyBlob, NULL,
 
1039
                                                             &tcsKeyHandle, slotOut);
 
1040
                if (result)
1032
1041
                        return result;
1033
1042
 
1034
1043
                return ctx_mark_key_loaded(hContext, tcsKeyHandle);