Upgrade from trousers 0.3.3 to 0.3.6 and from testsuite 0.2 to 0.3.

src/tspi/tspi_ps.c

 
 /*
  * Licensed Materials - Property of IBM
  *
  * trousers - An open source TCG Software Stack
  *
  * (C) Copyright International Business Machines Corp. 2004-2006
  *
  */
 
 
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 
 #include "trousers/tss.h"
 #include "trousers/trousers.h"
 #include "trousers_types.h"
 #include "trousers_types.h"
 #include "spi_utils.h"
 #include "capabilities.h"
 #include "tsplog.h"
 #include "tcs_tsp.h"
 #include "tspps.h"
 #include "hosttable.h"
 #include "tcsd_wrap.h"
 #include "tcsd.h"
 #include "obj.h"
 
+TSS_UUID owner_evict_uuid = {0, 0, 0, 0, 0, {0, 0, 0, 0, 1, 0}};
 
 TSS_RESULT
 Tspi_Context_LoadKeyByUUID(TSS_HCONTEXT tspContext,             /* in */
                            TSS_FLAG persistentStorageType,      /* in */
                            TSS_UUID uuidData,                   /* in */
                            TSS_HKEY * phKey)                    /* out */
 {
         TSS_RESULT result;
         TSS_UUID parentUUID;
         UINT32 keyBlobSize, parentPSType;
@@ skipping 38 matching lines @@
                         if (secret_PerformAuth_OIAP(keyHandle, TPM_ORD_LoadKey, hPolicy, FALSE,
                                                     &info.paramDigest, &info.authData))
                                 return result;
 
                         if ((result = RPC_LoadKeyByUUID(tspContext, uuidData, &info,
                                                         &tcsKeyHandle)))
                                 return result;
                 } else if (result)
                         return result;
 
-                if ((result = RPC_GetRegisteredKeyBlob(tspContext, uuidData, &keyBlobSize,
-                                                       &keyBlob)))
-                        return result;
+                /*check if provided UUID has an owner evict key UUID prefix */
+                if (!memcmp(&uuidData, &owner_evict_uuid, sizeof(TSS_UUID)-1)) {
+                        if ((result = obj_rsakey_add(tspContext, TSS_RSAKEY_FLAG_OWNEREVICT,
+                                                      phKey)))
+                                return result;
+                } else {
+                        if ((result = RPC_GetRegisteredKeyBlob(tspContext, uuidData, &keyBlobSize,
+                                                               &keyBlob)))
+                                return result;
 
-                if ((result = obj_rsakey_add_by_key(tspContext, &uuidData, keyBlob,
-                                                    TSS_OBJ_FLAG_SYSTEM_PS, phKey))) {
+                        if ((result = obj_rsakey_add_by_key(tspContext, &uuidData, keyBlob,
+                                                            TSS_OBJ_FLAG_SYSTEM_PS, phKey))) {
+                                free (keyBlob);
+                                return result;
+                        }
+        
+                        result = obj_rsakey_set_tcs_handle(*phKey, tcsKeyHandle);
+
                         free (keyBlob);
-                        return result;
                 }
-
-                result = obj_rsakey_set_tcs_handle(*phKey, tcsKeyHandle);
-
-                free (keyBlob);
 #else
                 if ((result = load_from_system_ps(tspContext, &uuidData, phKey)))
                         return result;
 #endif
         } else if (persistentStorageType == TSS_PS_TYPE_USER) {
                 if ((result = ps_get_parent_uuid_by_uuid(&uuidData, &parentUUID)))
                         return result;
 
                 /* If the parent is not in memory, recursively call ourselves on it */
                 if (obj_rsakey_get_by_uuid(&parentUUID, &parentTspHandle) != TSS_SUCCESS) {
@@ skipping 434 matching lines @@
         }
 
         if ((result = __tspi_add_mem_entry(tspContext, *ppKeyHierarchy))) {
                 free(*ppKeyHierarchy);
                 *ppKeyHierarchy = NULL;
                 *pulKeyHierarchySize = 0;
         }
 
         return result;
 }