Upgrade to tpm-emulator version 0.7.

tpm/tpm_delegation.c

-/* Software-Based Trusted Platform Module (TPM) Emulator for Linux
- * Copyright (C) 2006 Mario Strasser <mast@gmx.net>,
- *                    Domenic Schröder <schroeder@gmx.ch>,
- *                    Swiss Federal Institute of Technology (ETH) Zurich
+/* Software-based Trusted Platform Module (TPM) Emulator
+ * Copyright (C) 2004-2010 Mario Strasser <mast@gmx.net>
  *
  * This module is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published
  * by the Free Software Foundation; either version 2 of the License,
  * or (at your option) any later version.
  *
  * This module is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * $Id$
+ * $Id: tpm_delegation.c 367 2010-02-13 15:52:18Z mast $
  */
 
 #include "tpm_emulator.h"
 #include "tpm_commands.h"
 #include "tpm_marshalling.h"
 #include "tpm_data.h"
 #include "tpm_handles.h"
 #include "crypto/hmac.h"
 #include "crypto/rc4.h"
 
@@ skipping 521 matching lines @@
           tpm_free(*familyTable);
           tpm_free(*delegateTable);
           return TPM_FAIL;
         }
       }
     }
   }
   return TPM_SUCCESS;
 }
 
-static TPM_TAG get_structure_tag(BYTE *ptr, UINT32 length)
-{
-  TPM_TAG tag;
-  if (tpm_unmarshal_TPM_TAG(&ptr, &length, &tag) != 0) return 0xffff;
-  return tag;
-}
-
 TPM_RESULT TPM_Delegate_UpdateVerification(UINT32 inputSize, BYTE *inputData,
                                            TPM_AUTH *auth1, UINT32 *outputSize,
                                            BYTE **outputData)
 {
   TPM_RESULT res;
   TPM_SESSION_DATA *session;
   info("TPM_Delegate_UpdateVerification()");
   /* verify authorization */
   session = tpm_get_auth(auth1->authHandle);
   if (session == NULL) return TPM_AUTHFAIL;
@@ skipping 180 matching lines @@
     }
     tpm_free(sens_buf);
     if (sensitive.tag != TPM_TAG_DELEGATE_SENSITIVE) return TPM_BAD_PARAMETER;
   } else {
     debug("unsupported input structure: %02x%02x", delegation[0], delegation[1]);
     return TPM_BAD_PARAMETER;
   }
   return TPM_SUCCESS;
 }