trousers

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7754/src/trspi

Modified Files:
	trousers.c 
Log Message:
in Trspi_LoadBlob_RSA_KEY_PARMS, only load the last data pointer if its size is greater than 0.

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** trousers.c	27 Jun 2005 18:24:20 -0000	1.5
--- trousers.c	27 Jun 2005 22:47:37 -0000	1.6
***************
*** 153,157 ****
  	Trspi_LoadBlob_UINT32(offset, parms->numPrimes, blob);
  	Trspi_LoadBlob_UINT32(offset, parms->exponentSize, blob);
! 	Trspi_LoadBlob(offset, parms->exponentSize, blob, parms->exponent);
  }
  
--- 153,159 ----
  	Trspi_LoadBlob_UINT32(offset, parms->numPrimes, blob);
  	Trspi_LoadBlob_UINT32(offset, parms->exponentSize, blob);
! 
! 	if (parms->exponentSize > 0)
! 		Trspi_LoadBlob(offset, parms->exponentSize, blob, parms->exponent);
  }

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31695/src/trspi

Modified Files:
	trousers.c 
Log Message:
Added implementations of UNICODE to UTF8 conversion routines

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** trousers.c	27 Jun 2005 22:47:37 -0000	1.6
--- trousers.c	23 Aug 2005 15:39:33 -0000	1.7
***************
*** 16,19 ****
--- 16,20 ----
  #include <sys/types.h>
  #include <sys/mman.h>
+ #include <iconv.h>
  #include <errno.h>
  
***************
*** 788,789 ****
--- 789,901 ----
  	return TSS_ERROR_CODE(r);
  }
+ 
+ BYTE *
+ Trspi_UTF8_To_UNICODE(BYTE *string, UINT32 *size)
+ {
+ 	BYTE *ret = NULL;
+ 	char *outbuf, *local_string = string;
+ 	size_t inbytesleft, outbytesleft;
+ 	int newbufsize;
+ 	iconv_t cd;
+ 	int rc, local_size;
+ 
+ 	if (string == NULL)
+ 		return NULL;
+ 
+ 	if ((cd = iconv_open("UTF-16", "UTF-8")) == (iconv_t)-1) {
+ 		LogError("iconv_open: %s", strerror(errno));
+ 		return NULL;
+ 	}
+ 
+ 	/* if size is NULL, attempt to get the length of the string manually */
+ 	if (size == NULL) {
+ 		local_size = strlen(string) + 2;
+ 		newbufsize = local_size * sizeof(UNICODE);
+ 		inbytesleft = local_size;
+ 	} else {
+ 		inbytesleft = *size;
+ 		newbufsize = (*size + 2) * sizeof(UNICODE);
+ 	}
+ 
+ 	ret = malloc(newbufsize);
+ 	if (ret == NULL) {
+ 		LogError("malloc of %d bytes failed.", newbufsize);
+ 		iconv_close(cd);
+ 		return NULL;
+ 	}
+ 
+ 	outbytesleft = newbufsize;
+ 	outbuf = (char *)ret;
+ 
+ 	if ((rc = iconv(cd, &local_string, &inbytesleft, &outbuf,
+ 					&outbytesleft)) == -1) {
+ 		LogError("iconv errno: %d, %s\n", errno, strerror(errno));
+ 		iconv_close(cd);
+ 		free(ret);
+ 		return NULL;
+ 	}
+ 
+ 	if (size)
+ 		*size = newbufsize;
+ 	iconv_close(cd);
+ 
+ 	return ret;
+ }
+ 
+ BYTE *
+ Trspi_UNICODE_To_UTF8(BYTE *string, UINT32 *size)
+ {
+ 	BYTE *ret = NULL;
+ 	char *outbuf, *local_string = string;
+ 	size_t inbytesleft, outbytesleft;
+ 	int newbufsize, local_size = 1;
+ 	iconv_t cd;
+ 	int rc;
+ 	UNICODE *null_term;
+ 
+ 	if (string == NULL)
+ 		return NULL;
+ 
+ 	if ((cd = iconv_open("UTF-8", "UTF-16")) == (iconv_t)-1) {
+ 		LogError("iconv_open: %s", strerror(errno));
+ 		return NULL;
+ 	}
+ 
+ 	/* if size is NULL, attempt to get the length of the string manually */
+ 	if (size == NULL) {
+ 		null_term = (UNICODE *)string;
+ 		while (null_term != L'\0') {
+ 			*null_term++;
+ 			local_size++;
+ 		}
+ 		newbufsize = local_size / sizeof(UNICODE);
+ 		inbytesleft = local_size;
+ 	} else {
+ 		inbytesleft = *size;
+ 		newbufsize = *size / sizeof(UNICODE);
+ 	}
+ 
+ 	ret = malloc(newbufsize);
+ 	if (ret == NULL) {
+ 		LogError("malloc of %d bytes failed.", newbufsize);
+ 		iconv_close(cd);
+ 		return NULL;
+ 	}
+ 
+ 	outbytesleft = newbufsize;
+ 	outbuf = (char *)ret;
+ 
+ 	if ((rc = iconv(cd, &local_string, &inbytesleft, &outbuf,
+ 					&outbytesleft)) == -1) {
+ 		LogError("iconv errno: %d, %s\n", errno, strerror(errno));
+ 		free(ret);
+ 		iconv_close(cd);
+ 		return NULL;
+ 	}
+ 
+ 	if (size)
+ 		*size = newbufsize;
+ 	iconv_close(cd);
+ 
+ 	return ret;
+ }

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16771/src/trspi

Modified Files:
	trousers.c 
Log Message:
added TCPA_E_BAD_PARAMETER

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** trousers.c	23 Aug 2005 15:39:33 -0000	1.7
--- trousers.c	30 Aug 2005 20:30:38 -0000	1.8
***************
*** 626,629 ****
--- 626,630 ----
  		switch (TSS_ERROR_CODE(r)) {
  			case TCPA_E_AUTHFAIL:		return "Authentication failed";
+ 			case TCPA_E_BAD_PARAMETER:	return "Bad Parameter";
  			case TCPA_E_BADINDEX:		return "Bad index";
  			case TCPA_E_AUDITFAILURE:	return "Audit failure";

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17255/src/trspi

Modified Files:
	trousers.c 
Log Message:
remove functions that use contexts

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** trousers.c	30 Aug 2005 20:30:38 -0000	1.8
--- trousers.c	7 Sep 2005 02:43:38 -0000	1.9
***************
*** 5,9 ****
   * trousers - An open source TCG Software Stack
   *
!  * (C) Copyright International Business Machines Corp. 2004
   *
   */
--- 5,9 ----
   * trousers - An open source TCG Software Stack
   *
!  * (C) Copyright International Business Machines Corp. 2004, 2005
   *
   */
***************
*** 36,56 ****
  
  TSS_RESULT
! Trspi_UnloadBlob_PUBKEY(TSS_HCONTEXT tspContext, UINT16 * offset,
! 		  BYTE * blob, TCPA_PUBKEY * pubKey)
  {
  	TSS_RESULT result;
  
! 	if ((result = Trspi_UnloadBlob_KEY_PARMS(tspContext, offset, blob, &pubKey->algorithmParms)))
  		return result;
! 	return Trspi_UnloadBlob_STORE_PUBKEY(tspContext, offset, blob, &pubKey->pubKey);
  }
  
! void
! Trspi_UnloadBlob_MigrationKeyAuth(TSS_HCONTEXT tspContext,
! 			    UINT16 * offset, TCPA_MIGRATIONKEYAUTH * migAuth, BYTE * blob)
  {
! 	Trspi_UnloadBlob_PUBKEY(tspContext, offset, blob, &migAuth->migrationKey);
  	Trspi_UnloadBlob_UINT16(offset, &migAuth->migrationScheme, blob);
  	Trspi_UnloadBlob_DIGEST(offset, blob, migAuth->digest);
  }
  
--- 36,72 ----
  
  TSS_RESULT
! Trspi_UnloadBlob_PUBKEY(UINT16 * offset, BYTE * blob, TCPA_PUBKEY * pubKey)
  {
  	TSS_RESULT result;
  
! 	if ((result = Trspi_UnloadBlob_KEY_PARMS(offset, blob, &pubKey->algorithmParms)))
  		return result;
! 	if ((result = Trspi_UnloadBlob_STORE_PUBKEY(offset, blob, &pubKey->pubKey))) {
! 		free(pubKey->pubKey.key);
! 		free(pubKey->algorithmParms.parms);
! 		pubKey->pubKey.key = NULL;
! 		pubKey->pubKey.keyLength = 0;
! 		pubKey->algorithmParms.parms = NULL;
! 		pubKey->algorithmParms.parmSize = 0;
! 		return result;
! 	}
! 
! 	return TSS_SUCCESS;
  }
  
! TSS_RESULT
! Trspi_UnloadBlob_MigrationKeyAuth(UINT16 *offset,
! 				  BYTE *blob,
! 				  TCPA_MIGRATIONKEYAUTH *migAuth)
  {
! 	TSS_RESULT result;
! 
! 	if ((result = Trspi_UnloadBlob_PUBKEY(offset, blob,
! 					      &migAuth->migrationKey)))
! 		return result;
  	Trspi_UnloadBlob_UINT16(offset, &migAuth->migrationScheme, blob);
  	Trspi_UnloadBlob_DIGEST(offset, blob, migAuth->digest);
+ 
+ 	return TSS_SUCCESS;
  }
  
***************
*** 211,216 ****
  
  TSS_RESULT
! Trspi_UnloadBlob_STORED_DATA(TSS_HCONTEXT tspContext, UINT16 * offset,
! 		       BYTE * blob, TCPA_STORED_DATA * data)
  {
  	Trspi_UnloadBlob_TCPA_VERSION(offset, blob, &data->ver);
--- 227,231 ----
  
  TSS_RESULT
! Trspi_UnloadBlob_STORED_DATA(UINT16 * offset, BYTE * blob, TCPA_STORED_DATA * data)
  {
  	Trspi_UnloadBlob_TCPA_VERSION(offset, blob, &data->ver);
***************
*** 218,222 ****
  
  	if (data->sealInfoSize > 0) {
! 		data->sealInfo = calloc_tspi(tspContext, data->sealInfoSize);
  		if (data->sealInfo == NULL) {
  			LogError("malloc of %d bytes failed.", data->sealInfoSize);
--- 233,237 ----
  
  	if (data->sealInfoSize > 0) {
! 		data->sealInfo = malloc(data->sealInfoSize);
  		if (data->sealInfo == NULL) {
  			LogError("malloc of %d bytes failed.", data->sealInfoSize);
***************
*** 231,237 ****
  
  	if (data->encDataSize > 0) {
! 		data->encData = calloc_tspi(tspContext, data->encDataSize);
  		if (data->encData == NULL) {
  			LogError("malloc of %d bytes failed.", data->encDataSize);
  			return TSPERR(TSS_E_OUTOFMEMORY);
  		}
--- 246,254 ----
  
  	if (data->encDataSize > 0) {
! 		data->encData = malloc(data->encDataSize);
  		if (data->encData == NULL) {
  			LogError("malloc of %d bytes failed.", data->encDataSize);
+ 			free(data->sealInfo);
+ 			data->sealInfo = NULL;
  			return TSPERR(TSS_E_OUTOFMEMORY);
  		}
***************
*** 376,381 ****
  
  TSS_RESULT
! Trspi_UnloadBlob_KEY_PARMS(TSS_HCONTEXT tspContext,
! 		     UINT16 * offset, BYTE * blob, TCPA_KEY_PARMS * keyParms)
  {
  	Trspi_UnloadBlob_UINT32(offset, &keyParms->algorithmID, blob);
--- 393,397 ----
  
  TSS_RESULT
! Trspi_UnloadBlob_KEY_PARMS(UINT16 * offset, BYTE * blob, TCPA_KEY_PARMS * keyParms)
  {
  	Trspi_UnloadBlob_UINT32(offset, &keyParms->algorithmID, blob);
***************
*** 385,389 ****
  
  	if (keyParms->parmSize > 0) {
! 		keyParms->parms = calloc_tspi(tspContext, keyParms->parmSize);
  		if (keyParms->parms == NULL) {
  			LogError("malloc of %d bytes failed.", keyParms->parmSize);
--- 401,405 ----
  
  	if (keyParms->parmSize > 0) {
! 		keyParms->parms = malloc(keyParms->parmSize);
  		if (keyParms->parms == NULL) {
  			LogError("malloc of %d bytes failed.", keyParms->parmSize);
***************
*** 399,403 ****
  
  TSS_RESULT
! Trspi_UnloadBlob_KEY(TSS_HCONTEXT tspContext, UINT16 * offset, BYTE * blob, TCPA_KEY * key)
  {
  	TSS_RESULT result;
--- 415,419 ----
  
  TSS_RESULT
! Trspi_UnloadBlob_KEY(UINT16 * offset, BYTE * blob, TCPA_KEY * key)
  {
  	TSS_RESULT result;
***************
*** 407,416 ****
  	Trspi_UnloadBlob_KEY_FLAGS(offset, blob, &key->keyFlags);
  	key->authDataUsage = blob[(*offset)++];
! 	if ((result = Trspi_UnloadBlob_KEY_PARMS(tspContext, offset, (BYTE *) blob, &key->algorithmParms)))
  		return result;
  	Trspi_UnloadBlob_UINT32(offset, &key->PCRInfoSize, blob);
  
  	if (key->PCRInfoSize > 0) {
! 		key->PCRInfo = calloc_tspi(tspContext, key->PCRInfoSize);
  		if (key->PCRInfo == NULL) {
  			LogError("malloc of %d bytes failed.", key->PCRInfoSize);
--- 423,432 ----
  	Trspi_UnloadBlob_KEY_FLAGS(offset, blob, &key->keyFlags);
  	key->authDataUsage = blob[(*offset)++];
! 	if ((result = Trspi_UnloadBlob_KEY_PARMS(offset, (BYTE *) blob, &key->algorithmParms)))
  		return result;
  	Trspi_UnloadBlob_UINT32(offset, &key->PCRInfoSize, blob);
  
  	if (key->PCRInfoSize > 0) {
! 		key->PCRInfo = malloc(key->PCRInfoSize);
  		if (key->PCRInfo == NULL) {
  			LogError("malloc of %d bytes failed.", key->PCRInfoSize);
***************
*** 422,431 ****
  	}
  
! 	if ((result = Trspi_UnloadBlob_STORE_PUBKEY(tspContext, offset, blob, &key->pubKey)))
  		return result;
  	Trspi_UnloadBlob_UINT32(offset, &key->encSize, blob);
  
  	if (key->encSize > 0) {
! 		key->encData = calloc_tspi(tspContext, key->encSize);
  		if (key->encData == NULL) {
  			LogError("malloc of %d bytes failed.", key->encSize);
--- 438,447 ----
  	}
  
! 	if ((result = Trspi_UnloadBlob_STORE_PUBKEY(offset, blob, &key->pubKey)))
  		return result;
  	Trspi_UnloadBlob_UINT32(offset, &key->encSize, blob);
  
  	if (key->encSize > 0) {
! 		key->encData = malloc(key->encSize);
  		if (key->encData == NULL) {
  			LogError("malloc of %d bytes failed.", key->encSize);
***************
*** 453,464 ****
  
  TSS_RESULT
! Trspi_UnloadBlob_STORE_PUBKEY(TSS_HCONTEXT tspContext,
! 			UINT16 * offset, BYTE * blob, TCPA_STORE_PUBKEY * store)
  {
- 
  	Trspi_UnloadBlob_UINT32(offset, &store->keyLength, blob);
  
  	if (store->keyLength > 0) {
! 		store->key = calloc_tspi(tspContext, store->keyLength);
  		if (store->key == NULL) {
  			LogError("malloc of %d bytes failed.", store->keyLength);
--- 469,478 ----
  
  TSS_RESULT
! Trspi_UnloadBlob_STORE_PUBKEY(UINT16 * offset, BYTE * blob, TCPA_STORE_PUBKEY * store)
  {
  	Trspi_UnloadBlob_UINT32(offset, &store->keyLength, blob);
  
  	if (store->keyLength > 0) {
! 		store->key = malloc(store->keyLength);
  		if (store->key == NULL) {
  			LogError("malloc of %d bytes failed.", store->keyLength);

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23312/src/trspi

Modified Files:
	trousers.c 
Log Message:
unicode bugfixes for SF#1249767 and SF#1286333

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** trousers.c	7 Sep 2005 02:43:38 -0000	1.9
--- trousers.c	12 Sep 2005 21:51:21 -0000	1.10
***************
*** 16,20 ****
--- 16,22 ----
  #include <sys/types.h>
  #include <sys/mman.h>
+ #include <langinfo.h>
  #include <iconv.h>
+ #include <wchar.h>
  #include <errno.h>
  
***************
*** 805,914 ****
  }
  
  BYTE *
! Trspi_UTF8_To_UNICODE(BYTE *string, UINT32 *size)
  {
! 	BYTE *ret = NULL;
! 	char *outbuf, *local_string = string;
! 	size_t inbytesleft, outbytesleft;
! 	int newbufsize;
  	iconv_t cd;
! 	int rc, local_size;
  
! 	if (string == NULL)
  		return NULL;
  
! 	if ((cd = iconv_open("UTF-16", "UTF-8")) == (iconv_t)-1) {
! 		LogError("iconv_open: %s", strerror(errno));
  		return NULL;
  	}
  
! 	/* if size is NULL, attempt to get the length of the string manually */
! 	if (size == NULL) {
! 		local_size = strlen(string) + 2;
! 		newbufsize = local_size * sizeof(UNICODE);
! 		inbytesleft = local_size;
! 	} else {
! 		inbytesleft = *size;
! 		newbufsize = (*size + 2) * sizeof(UNICODE);
! 	}
  
! 	ret = malloc(newbufsize);
! 	if (ret == NULL) {
! 		LogError("malloc of %d bytes failed.", newbufsize);
  		iconv_close(cd);
  		return NULL;
  	}
  
! 	outbytesleft = newbufsize;
! 	outbuf = (char *)ret;
! 
! 	if ((rc = iconv(cd, &local_string, &inbytesleft, &outbuf,
! 					&outbytesleft)) == -1) {
! 		LogError("iconv errno: %d, %s\n", errno, strerror(errno));
  		iconv_close(cd);
- 		free(ret);
  		return NULL;
  	}
  
  	if (size)
! 		*size = newbufsize;
  	iconv_close(cd);
  
  	return ret;
  }
  
  BYTE *
! Trspi_UNICODE_To_UTF8(BYTE *string, UINT32 *size)
  {
! 	BYTE *ret = NULL;
! 	char *outbuf, *local_string = string;
! 	size_t inbytesleft, outbytesleft;
! 	int newbufsize, local_size = 1;
  	iconv_t cd;
! 	int rc;
! 	UNICODE *null_term;
! 
! 	if (string == NULL)
! 		return NULL;
  
! 	if ((cd = iconv_open("UTF-8", "UTF-16")) == (iconv_t)-1) {
! 		LogError("iconv_open: %s", strerror(errno));
  		return NULL;
  	}
  
! 	/* if size is NULL, attempt to get the length of the string manually */
! 	if (size == NULL) {
! 		null_term = (UNICODE *)string;
! 		while (null_term != L'\0') {
! 			*null_term++;
! 			local_size++;
! 		}
! 		newbufsize = local_size / sizeof(UNICODE);
! 		inbytesleft = local_size;
! 	} else {
! 		inbytesleft = *size;
! 		newbufsize = *size / sizeof(UNICODE);
  	}
  
! 	ret = malloc(newbufsize);
! 	if (ret == NULL) {
! 		LogError("malloc of %d bytes failed.", newbufsize);
  		iconv_close(cd);
  		return NULL;
  	}
  
! 	outbytesleft = newbufsize;
! 	outbuf = (char *)ret;
! 
! 	if ((rc = iconv(cd, &local_string, &inbytesleft, &outbuf,
! 					&outbytesleft)) == -1) {
! 		LogError("iconv errno: %d, %s\n", errno, strerror(errno));
! 		free(ret);
  		iconv_close(cd);
  		return NULL;
  	}
  
  	if (size)
! 		*size = newbufsize;
  	iconv_close(cd);
  
--- 807,938 ----
  }
  
+ static int
+ hacky_strlen(char *codeset, BYTE *string)
+ {
+ 	BYTE *ptr = string;
+ 	int len = 0;
+ 
+ 	if (strcmp("UTF-16", codeset) == 0) {
+ 		while (!(ptr[0] == '\0' && ptr[1] == '\0')) {
+ 			len += 2;
+ 			ptr += 2;
+ 		}
+ 	} else if (strcmp("UTF-32", codeset) == 0) {
+ 		while (!(ptr[0] == '\0' && ptr[1] == '\0' &&
+ 					ptr[2] == '\0' && ptr[3] == '\0')) {
+ 			len += 4;
+ 			ptr += 4;
+ 		}
+ 	} else {
+ 		/* default to 8bit chars */
+ 		while (*ptr++ != '\0') {
+ 			len++;
+ 		}
+ 	}
+ 
+ 	return len;
+ }
+ 
+ #define MAX_BUF_SIZE	4096
+ 
  BYTE *
! Trspi_Native_To_UNICODE(BYTE *string, unsigned *size)
  {
! 	char *ret, *ptr, *outbuf, tmpbuf[MAX_BUF_SIZE] = { 0, };
! 	unsigned len = 0, outbytesleft, inbytesleft, tmplen;
  	iconv_t cd;
! 	size_t rc;
  
! 	if ((cd = iconv_open("UTF-16", nl_langinfo(CODESET))) == (iconv_t)-1) {
! 		LogDebug("iconv_open: %s", strerror(errno));
  		return NULL;
+ 	}
  
! 	if ((tmplen = hacky_strlen(nl_langinfo(CODESET), string)) == 0) {
! 		LogDebug1("hacky_strlen returned 0");
  		return NULL;
  	}
  
! 	do {
! 		len++;
! 		outbytesleft = len;
! 		inbytesleft = tmplen;
! 		outbuf = tmpbuf;
! 		ptr = string;
  
! 		rc = iconv(cd, &ptr, &inbytesleft, &outbuf, &outbytesleft);
! 	} while (rc == (size_t)-1 && errno == E2BIG);
! 
! 	if (len > MAX_BUF_SIZE) {
! 		LogDebug1("string too long.");
  		iconv_close(cd);
  		return NULL;
  	}
  
! 	/* add the max size for a char onto len, then malloc all bytes as
! 	 * zeroed out. This may allocate a few more bytes than necessary, but
! 	 * will ensure that the string is NULL terminated. */
! 	if ((ret = calloc(1, len + 4)) == NULL) {
! 		LogDebug("malloc of %d bytes failed.", len);
  		iconv_close(cd);
  		return NULL;
  	}
  
+ 	memcpy(ret, &tmpbuf, len);
  	if (size)
! 		*size = len + 4;
  	iconv_close(cd);
  
  	return ret;
+ 
  }
  
  BYTE *
! Trspi_UNICODE_To_Native(BYTE *string, unsigned *size)
  {
! 	char *ret, *ptr, *outbuf, tmpbuf[MAX_BUF_SIZE] = { 0, };
! 	unsigned len = 0, outbytesleft, inbytesleft, tmplen;
  	iconv_t cd;
! 	size_t rc;
  
! 	if ((cd = iconv_open(nl_langinfo(CODESET), "UTF-16")) == (iconv_t)-1) {
! 		LogDebug("iconv_open: %s", strerror(errno));
  		return NULL;
  	}
  
! 	if ((tmplen = hacky_strlen("UTF-16", string)) == 0) {
! 		LogDebug1("hacky_strlen returned 0");
! 		return 0;
  	}
  
! 	do {
! 		len++;
! 		outbytesleft = len;
! 		inbytesleft = tmplen;
! 		outbuf = tmpbuf;
! 		ptr = string;
! 
! 		rc = iconv(cd, &ptr, &inbytesleft, &outbuf, &outbytesleft);
! 	} while (rc == (size_t)-1 && errno == E2BIG);
! 
! 	/* add the max size for a char onto len, then malloc all bytes as
! 	 * zeroed out. This may allocate a few more bytes than necessary, but
! 	 * will ensure that the string is NULL terminated. */
! 	len += 4;
! 	if (len > MAX_BUF_SIZE) {
! 		LogDebug1("string too long.");
  		iconv_close(cd);
  		return NULL;
  	}
  
! 	if ((ret = calloc(1, len)) == NULL) {
! 		LogDebug("malloc of %d bytes failed.", len);
  		iconv_close(cd);
  		return NULL;
  	}
  
+ 	memcpy(ret, &tmpbuf, len);
  	if (size)
! 		*size = len;
  	iconv_close(cd);

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11109/src/trspi

Modified Files:
	trousers.c 
Log Message:
add checks for NULL in the unicode functions

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** trousers.c	12 Sep 2005 21:51:21 -0000	1.10
--- trousers.c	13 Sep 2005 04:42:56 -0000	1.11
***************
*** 844,847 ****
--- 844,853 ----
  	size_t rc;
  
+ 	if (string == NULL) {
+ 		if (size)
+ 			*size = 0;
+ 		return NULL;
+ 	}
+ 
  	if ((cd = iconv_open("UTF-16", nl_langinfo(CODESET))) == (iconv_t)-1) {
  		LogDebug("iconv_open: %s", strerror(errno));
***************
*** 896,899 ****
--- 902,911 ----
  	size_t rc;
  
+ 	if (string == NULL) {
+ 		if (size)
+ 			*size = 0;
+ 		return NULL;
+ 	}
+ 
  	if ((cd = iconv_open(nl_langinfo(CODESET), "UTF-16")) == (iconv_t)-1) {
  		LogDebug("iconv_open: %s", strerror(errno));

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20149/src/trspi

Modified Files:
	trousers.c 
Log Message:
removed blank lines and returns at the end of void functions

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** trousers.c	13 Sep 2005 04:42:56 -0000	1.11
--- trousers.c	20 Oct 2005 21:12:35 -0000	1.12
***************
*** 193,197 ****
  	blob[(*offset)++] = version.bRevMajor;
  	blob[(*offset)++] = version.bRevMinor;
- 	return;
  }
  
--- 193,196 ----
***************
*** 203,207 ****
  	out->revMajor = blob[(*offset)++];
  	out->revMinor = blob[(*offset)++];
- 	return;
  }
  
--- 202,205 ----
***************
*** 213,217 ****
  	blob[(*offset)++] = version.revMajor;
  	blob[(*offset)++] = version.revMinor;
- 	return;
  }
  
--- 211,214 ----
***************
*** 493,502 ****
  LoadBlob_PUBKEY(UINT16 * offset, BYTE * blob, TCPA_PUBKEY pubKey)
  {
- 
  	LoadBlob_KEY_PARMS(offset, blob, &pubKey.algorithmParms);
  	LoadBlob_UINT32(offset, pubKey.pubKey.keyLength, blob);
  	LoadBlob(offset, pubKey.pubKey.keyLength, blob, pubKey.pubKey.key);
- 
- 	return;
  }
  
--- 490,496 ----
***************
*** 515,519 ****
  	LoadBlob_UINT32(offset, certify->PCRInfoSize, blob);
  	LoadBlob(offset, certify->PCRInfoSize, blob, certify->PCRInfo);
- 	return;
  }
  
--- 509,512 ----

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1133/src/trspi

Modified Files:
	trousers.c 
Log Message:
only load parms member of TCPA_KEY_PARMS when its size is > 0

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** trousers.c	20 Oct 2005 21:12:35 -0000	1.12
--- trousers.c	1 Nov 2005 21:16:50 -0000	1.13
***************
*** 358,362 ****
  	Trspi_LoadBlob_UINT16(offset, keyInfo->sigScheme, blob);
  	Trspi_LoadBlob_UINT32(offset, keyInfo->parmSize, blob);
! 	Trspi_LoadBlob(offset, keyInfo->parmSize, blob, keyInfo->parms);
  }
  
--- 358,364 ----
  	Trspi_LoadBlob_UINT16(offset, keyInfo->sigScheme, blob);
  	Trspi_LoadBlob_UINT32(offset, keyInfo->parmSize, blob);
! 
! 	if (keyInfo->parmSize > 0)
! 		Trspi_LoadBlob(offset, keyInfo->parmSize, blob, keyInfo->parms);
  }

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28293/src/trspi

Modified Files:
	trousers.c 
Log Message:
added functions for manipulating TCPA_SYMMETRIC_KEY blobs. Also modified copyright stmt and corrected a comment.

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** trousers.c	1 Nov 2005 21:16:50 -0000	1.13
--- trousers.c	2 Nov 2005 19:42:47 -0000	1.14
***************
*** 620,623 ****
--- 620,655 ----
  }
  
+ void
+ Trspi_LoadBlob_SYMMETRIC_KEY(UINT16 *offset, BYTE *blob, TCPA_SYMMETRIC_KEY *key)
+ {
+ 	Trspi_LoadBlob_UINT32(offset, key->algId, blob);
+ 	Trspi_LoadBlob_UINT16(offset, key->encScheme, blob);
+ 	Trspi_LoadBlob_UINT16(offset, key->size, blob);
+ 
+ 	if (key->size > 0)
+ 		Trspi_LoadBlob(offset, key->size, blob, key->data);
+ }
+ 
+ TSS_RESULT
+ Trspi_UnloadBlob_SYMMETRIC_KEY(UINT16 *offset, BYTE *blob, TCPA_SYMMETRIC_KEY *key)
+ {
+ 	Trspi_UnloadBlob_UINT32(offset, &key->algId, blob);
+ 	Trspi_UnloadBlob_UINT16(offset, &key->encScheme, blob);
+ 	Trspi_UnloadBlob_UINT16(offset, &key->size, blob);
+ 
+ 	if (key->size > 0) {
+ 		key->data = malloc(key->size);
+ 		if (key->data == NULL) {
+ 			key->size = 0;
+ 			return TSPERR(TSS_E_OUTOFMEMORY);
+ 		}
+ 		Trspi_UnloadBlob(offset, key->size, blob, key->data);
+ 	} else {
+ 		key->data = NULL;
+ 	}
+ 
+ 	return TSS_SUCCESS;
+ }
+ 
  /* function to mimic strerror with TSS error codes */
  char *

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29535/src/trspi

Modified Files:
	trousers.c 
Log Message:
added blob functions for identity creation

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** trousers.c	2 Nov 2005 19:42:47 -0000	1.14
--- trousers.c	10 Nov 2005 21:41:52 -0000	1.15
***************
*** 37,40 ****
--- 37,47 ----
  }
  
+ void
+ Trspi_LoadBlob_PUBKEY(UINT16 *offset, BYTE *blob, TCPA_PUBKEY *pubKey)
+ {
+ 	Trspi_LoadBlob_KEY_PARMS(offset, blob, &pubKey->algorithmParms);
+ 	Trspi_LoadBlob_STORE_PUBKEY(offset, blob, &pubKey->pubKey);
+ }
+ 
  TSS_RESULT
  Trspi_UnloadBlob_PUBKEY(UINT16 * offset, BYTE * blob, TCPA_PUBKEY * pubKey)
***************
*** 652,655 ****
--- 659,871 ----
  }
  
+ TSS_RESULT
+ Trspi_UnloadBlob_IDENTITY_REQ(UINT16 *offset, BYTE *blob, TCPA_IDENTITY_REQ *req)
+ {
+ 	Trspi_UnloadBlob_UINT32(offset, &req->asymSize, blob);
+ 	Trspi_UnloadBlob_UINT32(offset, &req->symSize, blob);
+ 	/* XXX */
+ 	Trspi_UnloadBlob_KEY_PARMS(offset, blob, &req->asymAlgorithm);
+ 	Trspi_UnloadBlob_KEY_PARMS(offset, blob, &req->symAlgorithm);
+ 
+ 	if (req->asymSize > 0) {
+ 		req->asymBlob = malloc(req->asymSize);
+ 		if (req->asymBlob == NULL) {
+ 			req->asymSize = 0;
+ 			return TSPERR(TSS_E_OUTOFMEMORY);
+ 		}
+ 		Trspi_UnloadBlob(offset, req->asymSize, blob, req->asymBlob);
+ 	} else {
+ 		req->asymBlob = NULL;
+ 	}
+ 
+ 	if (req->symSize > 0) {
+ 		req->symBlob = malloc(req->symSize);
+ 		if (req->symBlob == NULL) {
+ 			req->symSize = 0;
+ 			req->asymSize = 0;
+ 			free(req->asymBlob);
+ 			req->asymBlob = NULL;
+ 			return TSPERR(TSS_E_OUTOFMEMORY);
+ 		}
+ 		Trspi_UnloadBlob(offset, req->symSize, blob, req->symBlob);
+ 	} else {
+ 		req->symBlob = NULL;
+ 	}
+ 
+ 	return TSS_SUCCESS;
+ }
+ 
+ TSS_RESULT
+ Trspi_UnloadBlob_IDENTITY_PROOF(UINT16 *offset, BYTE *blob, TCPA_IDENTITY_PROOF *proof)
+ {
+ 	TSS_RESULT result;
+ 
+ 	/* helps when an error occurs */
+ 	memset(proof, 0, sizeof(TCPA_IDENTITY_PROOF));
+ 
+ 	Trspi_UnloadBlob_VERSION(offset, blob, (TCPA_VERSION *)&proof->ver);
+ 	Trspi_UnloadBlob_UINT32(offset, &proof->labelSize, blob);
+ 	Trspi_UnloadBlob_UINT32(offset, &proof->identityBindingSize, blob);
+ 	Trspi_UnloadBlob_UINT32(offset, &proof->endorsementSize, blob);
+ 	Trspi_UnloadBlob_UINT32(offset, &proof->platformSize, blob);
+ 	Trspi_UnloadBlob_UINT32(offset, &proof->conformanceSize, blob);
+ 
+ 	if ((result = Trspi_UnloadBlob_PUBKEY(offset, blob,
+ 					      &proof->identityKey))) {
+ 		proof->labelSize = 0;
+ 		proof->identityBindingSize = 0;
+ 		proof->endorsementSize = 0;
+ 		proof->platformSize = 0;
+ 		proof->conformanceSize = 0;
+ 		return result;
+ 	}
+ 
+ 	if (proof->labelSize > 0) {
+ 		proof->labelArea = malloc(proof->labelSize);
+ 		if (proof->labelArea == NULL) {
+ 			result = TSPERR(TSS_E_OUTOFMEMORY);
+ 			goto error;
+ 		}
+ 		Trspi_UnloadBlob(offset, proof->labelSize, blob, proof->labelArea);
+ 	} else {
+ 		proof->labelArea = NULL;
+ 	}
+ 
+ 	if (proof->identityBindingSize > 0) {
+ 		proof->identityBinding = malloc(proof->identityBindingSize);
+ 		if (proof->identityBinding == NULL) {
+ 			result = TSPERR(TSS_E_OUTOFMEMORY);
+ 			goto error;
+ 		}
+ 		Trspi_UnloadBlob(offset, proof->identityBindingSize, blob,
+ 				 proof->identityBinding);
+ 	} else {
+ 		proof->identityBinding = NULL;
+ 	}
+ 
+ 	if (proof->endorsementSize > 0) {
+ 		proof->endorsementCredential = malloc(proof->endorsementSize);
+ 		if (proof->endorsementCredential == NULL) {
+ 			result = TSPERR(TSS_E_OUTOFMEMORY);
+ 			goto error;
+ 		}
+ 		Trspi_UnloadBlob(offset, proof->endorsementSize, blob,
+ 				 proof->endorsementCredential);
+ 	} else {
+ 		proof->endorsementCredential = NULL;
+ 	}
+ 
+ 	if (proof->platformSize > 0) {
+ 		proof->platformCredential = malloc(proof->platformSize);
+ 		if (proof->platformCredential == NULL) {
+ 			result = TSPERR(TSS_E_OUTOFMEMORY);
+ 			goto error;
+ 		}
+ 		Trspi_UnloadBlob(offset, proof->platformSize, blob,
+ 				 proof->platformCredential);
+ 	} else {
+ 		proof->platformCredential = NULL;
+ 	}
+ 
+ 	if (proof->conformanceSize > 0) {
+ 		proof->conformanceCredential = malloc(proof->conformanceSize);
+ 		if (proof->conformanceCredential == NULL) {
+ 			result = TSPERR(TSS_E_OUTOFMEMORY);
+ 			goto error;
+ 		}
+ 		Trspi_UnloadBlob(offset, proof->conformanceSize, blob,
+ 				 proof->conformanceCredential);
+ 	} else {
+ 		proof->conformanceCredential = NULL;
+ 	}
+ 
+ 	return TSS_SUCCESS;
+ error:
+ 	proof->labelSize = 0;
+ 	proof->identityBindingSize = 0;
+ 	proof->endorsementSize = 0;
+ 	proof->platformSize = 0;
+ 	proof->conformanceSize = 0;
+ 	free(proof->labelArea);
+ 	proof->labelArea = NULL;
+ 	free(proof->identityBinding);
+ 	proof->identityBinding = NULL;
+ 	free(proof->endorsementCredential);
+ 	proof->endorsementCredential = NULL;
+ 	free(proof->conformanceCredential);
+ 	proof->conformanceCredential = NULL;
+ 	/* free identityKey */
+ 	free(proof->identityKey.pubKey.key);
+ 	free(proof->identityKey.algorithmParms.parms);
+ 	proof->identityKey.pubKey.key = NULL;
+ 	proof->identityKey.pubKey.keyLength = 0;
+ 	proof->identityKey.algorithmParms.parms = NULL;
+ 	proof->identityKey.algorithmParms.parmSize = 0;
+ 
+ 	return result;
+ }
+ 
+ void
+ Trspi_LoadBlob_SYM_CA_ATTESTATION(UINT16 *offset, BYTE *blob,
+ 				  TCPA_SYM_CA_ATTESTATION *sym)
+ {
+ 	Trspi_LoadBlob_UINT32(offset, sym->credSize, blob);
+ 	Trspi_LoadBlob_KEY_PARMS(offset, blob, &sym->algorithm);
+ 	Trspi_LoadBlob(offset, sym->credSize, blob, sym->credential);
+ }
+ 
+ TSS_RESULT
+ Trspi_UnloadBlob_SYM_CA_ATTESTATION(UINT16 *offset, BYTE *blob,
+ 				    TCPA_SYM_CA_ATTESTATION *sym)
+ {
+ 	TSS_RESULT result;
+ 
+ 	Trspi_UnloadBlob_UINT32(offset, &sym->credSize, blob);
+ 	if ((result = Trspi_UnloadBlob_KEY_PARMS(offset, blob,
+ 						 &sym->algorithm))) {
+ 		sym->credSize = 0;
+ 		return result;
+ 	}
+ 
+ 	if (sym->credSize > 0) {
+ 		if ((sym->credential = malloc(sym->credSize)) == NULL) {
+ 			free(sym->algorithm.parms);
+ 			sym->algorithm.parmSize = 0;
+ 			sym->credSize = 0;
+ 			return TSPERR(TSS_E_OUTOFMEMORY);
+ 		}
+ 		Trspi_UnloadBlob(offset, sym->credSize, blob, sym->credential);
+ 	} else {
+ 		sym->credential = NULL;
+ 	}
+ 
+ 	return TSS_SUCCESS;
+ }
+ 
+ void
+ Trspi_LoadBlob_ASYM_CA_CONTENTS(UINT16 *offset, BYTE *blob,
+ 				TCPA_ASYM_CA_CONTENTS *asym)
+ {
+ 	Trspi_LoadBlob_SYMMETRIC_KEY(offset, blob, &asym->sessionKey);
+ 	Trspi_LoadBlob(offset, TCPA_SHA1_160_HASH_LEN, blob,
+ 		       (BYTE *)&asym->idDigest);
+ }
+ 
+ TSS_RESULT
+ Trspi_UnloadBlob_ASYM_CA_CONTENTS(UINT16 *offset, BYTE *blob,
+ 				  TCPA_ASYM_CA_CONTENTS *asym)
+ {
+ 	TSS_RESULT result;
+ 
+ 	if ((result = Trspi_UnloadBlob_SYMMETRIC_KEY(offset, blob,
+ 						     &asym->sessionKey)))
+ 		return result;
+ 
+ 	Trspi_UnloadBlob(offset, TCPA_SHA1_160_HASH_LEN, blob,
+ 			 (BYTE *)&asym->idDigest);
+ 
+ 	return TSS_SUCCESS;
+ }
+ 
  /* function to mimic strerror with TSS error codes */
  char *

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19193/src/trspi

Modified Files:
	trousers.c 
Log Message:
fixed error string to match header file description

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** trousers.c	10 Nov 2005 21:41:52 -0000	1.15
--- trousers.c	15 Nov 2005 17:29:29 -0000	1.16
***************
*** 996,1000 ****
  			case TSS_E_TPM_UNSUPPORTED_FEATURE:	return "Unsupported feature";
  			case TSS_E_INVALID_OBJECT_TYPE:		return "Object type not valid for this operation";
! 			case TSS_E_INVALID_OBJECT_INITFLAG:	return "Wrong flag creation for object creation";
  			case TSS_E_INVALID_HANDLE:		return "Invalid handle";
  			case TSS_E_NO_CONNECTION:		return "Core service connection doesn't exist";
--- 996,1000 ----
  			case TSS_E_TPM_UNSUPPORTED_FEATURE:	return "Unsupported feature";
  			case TSS_E_INVALID_OBJECT_TYPE:		return "Object type not valid for this operation";
! 			case TSS_E_INVALID_OBJECT_INITFLAG:	return "Wrong flag information for object creation";
  			case TSS_E_INVALID_HANDLE:		return "Invalid handle";
  			case TSS_E_NO_CONNECTION:		return "Core service connection doesn't exist";

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv612/src/trspi

Modified Files:
	trousers.c 
Log Message:
null terminate strings with the correct number of bytes

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** trousers.c	15 Nov 2005 17:29:29 -0000	1.16
--- trousers.c	30 Nov 2005 18:42:54 -0000	1.17
***************
*** 1077,1080 ****
--- 1077,1092 ----
  }
  
+ static inline int
+ char_width(char *codeset)
+ {
+ 	if (strcmp("UTF-16", codeset) == 0) {
+ 		return 2;
+ 	} else if (strcmp("UTF-32", codeset) == 0) {
+ 		return 4;
+ 	}
+ 
+ 	return 1;
+ }
+ 
  #define MAX_BUF_SIZE	4096
  
***************
*** 1119,1126 ****
  	}
  
! 	/* add the max size for a char onto len, then malloc all bytes as
! 	 * zeroed out. This may allocate a few more bytes than necessary, but
! 	 * will ensure that the string is NULL terminated. */
! 	if ((ret = calloc(1, len + 4)) == NULL) {
  		LogDebug("malloc of %d bytes failed.", len);
  		iconv_close(cd);
--- 1131,1137 ----
  	}
  
! 	/* add terminating bytes of the correct width */
! 	len += char_width("UTF-16");
! 	if ((ret = calloc(1, len)) == NULL) {
  		LogDebug("malloc of %d bytes failed.", len);
  		iconv_close(cd);
***************
*** 1130,1134 ****
  	memcpy(ret, &tmpbuf, len);
  	if (size)
! 		*size = len + 4;
  	iconv_close(cd);
  
--- 1141,1146 ----
  	memcpy(ret, &tmpbuf, len);
  	if (size)
! 		*size = len;
! 
  	iconv_close(cd);
  
***************
*** 1171,1178 ****
  	} while (rc == (size_t)-1 && errno == E2BIG);
  
! 	/* add the max size for a char onto len, then malloc all bytes as
! 	 * zeroed out. This may allocate a few more bytes than necessary, but
! 	 * will ensure that the string is NULL terminated. */
! 	len += 4;
  	if (len > MAX_BUF_SIZE) {
  		LogDebug1("string too long.");
--- 1183,1188 ----
  	} while (rc == (size_t)-1 && errno == E2BIG);
  
! 	/* add terminating bytes of the correct width */
! 	len += char_width(nl_langinfo(CODESET));
  	if (len > MAX_BUF_SIZE) {
  		LogDebug1("string too long.");

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22303/src/trspi

Modified Files:
	trousers.c 
Log Message:
make the NULL UNICODE string returned be 2 zero bytes

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** trousers.c	30 Nov 2005 18:42:54 -0000	1.17
--- trousers.c	2 Dec 2005 16:19:10 -0000	1.18
***************
*** 1096,1107 ****
  	char *ret, *ptr, *outbuf, tmpbuf[MAX_BUF_SIZE] = { 0, };
  	unsigned len = 0, outbytesleft, inbytesleft, tmplen;
! 	iconv_t cd;
  	size_t rc;
  
! 	if (string == NULL) {
! 		if (size)
! 			*size = 0;
! 		return NULL;
! 	}
  
  	if ((cd = iconv_open("UTF-16", nl_langinfo(CODESET))) == (iconv_t)-1) {
--- 1096,1104 ----
  	char *ret, *ptr, *outbuf, tmpbuf[MAX_BUF_SIZE] = { 0, };
  	unsigned len = 0, outbytesleft, inbytesleft, tmplen;
! 	iconv_t cd = 0;
  	size_t rc;
  
! 	if (string == NULL)
! 		goto alloc_string;
  
  	if ((cd = iconv_open("UTF-16", nl_langinfo(CODESET))) == (iconv_t)-1) {
***************
*** 1112,1116 ****
  	if ((tmplen = hacky_strlen(nl_langinfo(CODESET), string)) == 0) {
  		LogDebug1("hacky_strlen returned 0");
! 		return NULL;
  	}
  
--- 1109,1113 ----
  	if ((tmplen = hacky_strlen(nl_langinfo(CODESET), string)) == 0) {
  		LogDebug1("hacky_strlen returned 0");
! 		goto alloc_string;
  	}
  
***************
*** 1131,1134 ****
--- 1128,1132 ----
  	}
  
+ alloc_string:
  	/* add terminating bytes of the correct width */
  	len += char_width("UTF-16");
***************
*** 1143,1147 ****
  		*size = len;
  
! 	iconv_close(cd);
  
  	return ret;
--- 1141,1146 ----
  		*size = len;
  
! 	if (cd)
! 		iconv_close(cd);
  
  	return ret;

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28040/src/trspi

Modified Files:
	trousers.c 
Log Message:
set errno to 0 before checking it.  This is the only way to guarantee that iconv will set it when an error occurs.

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** trousers.c	2 Dec 2005 16:19:10 -0000	1.18
--- trousers.c	15 Dec 2005 17:18:50 -0000	1.19
***************
*** 1118,1121 ****
--- 1118,1122 ----
  		outbuf = tmpbuf;
  		ptr = string;
+ 		errno = 0;
  
  		rc = iconv(cd, &ptr, &inbytesleft, &outbuf, &outbytesleft);
***************
*** 1178,1181 ****
--- 1179,1183 ----
  		outbuf = tmpbuf;
  		ptr = string;
+ 		errno = 0;
  
  		rc = iconv(cd, &ptr, &inbytesleft, &outbuf, &outbytesleft);

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14204/src/trspi

Modified Files:
	trousers.c 
Log Message:
changed all prints of size_t to %z

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** trousers.c	15 Dec 2005 17:18:50 -0000	1.19
--- trousers.c	13 Jan 2006 21:20:37 -0000	1.20
***************
*** 1095,1101 ****
  {
  	char *ret, *ptr, *outbuf, tmpbuf[MAX_BUF_SIZE] = { 0, };
! 	unsigned len = 0, outbytesleft, inbytesleft, tmplen;
  	iconv_t cd = 0;
! 	size_t rc;
  
  	if (string == NULL)
--- 1095,1101 ----
  {
  	char *ret, *ptr, *outbuf, tmpbuf[MAX_BUF_SIZE] = { 0, };
! 	unsigned len = 0, tmplen;
  	iconv_t cd = 0;
! 	size_t rc, outbytesleft, inbytesleft;
  
  	if (string == NULL)
***************
*** 1153,1159 ****
  {
  	char *ret, *ptr, *outbuf, tmpbuf[MAX_BUF_SIZE] = { 0, };
! 	unsigned len = 0, outbytesleft, inbytesleft, tmplen;
  	iconv_t cd;
! 	size_t rc;
  
  	if (string == NULL) {
--- 1153,1159 ----
  {
  	char *ret, *ptr, *outbuf, tmpbuf[MAX_BUF_SIZE] = { 0, };
! 	unsigned len = 0, tmplen;
  	iconv_t cd;
! 	size_t rc, outbytesleft, inbytesleft;
  
  	if (string == NULL) {

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28021/src/trspi

Modified Files:
	trousers.c 
Log Message:
Fixed compiler signedness warnings

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** trousers.c	13 Jan 2006 21:20:37 -0000	1.20
--- trousers.c	8 Feb 2006 19:08:55 -0000	1.21
***************
*** 1094,1098 ****
  Trspi_Native_To_UNICODE(BYTE *string, unsigned *size)
  {
! 	char *ret, *ptr, *outbuf, tmpbuf[MAX_BUF_SIZE] = { 0, };
  	unsigned len = 0, tmplen;
  	iconv_t cd = 0;
--- 1094,1098 ----
  Trspi_Native_To_UNICODE(BYTE *string, unsigned *size)
  {
! 	char *ptr, *ret, *outbuf, tmpbuf[MAX_BUF_SIZE] = { 0, };
  	unsigned len = 0, tmplen;
  	iconv_t cd = 0;
***************
*** 1117,1121 ****
  		inbytesleft = tmplen;
  		outbuf = tmpbuf;
! 		ptr = string;
  		errno = 0;
  
--- 1117,1121 ----
  		inbytesleft = tmplen;
  		outbuf = tmpbuf;
! 		ptr = (char *)string;
  		errno = 0;
  
***************
*** 1145,1149 ****
  		iconv_close(cd);
  
! 	return ret;
  
  }
--- 1145,1149 ----
  		iconv_close(cd);
  
! 	return (BYTE *)ret;
  
  }
***************
*** 1178,1182 ****
  		inbytesleft = tmplen;
  		outbuf = tmpbuf;
! 		ptr = string;
  		errno = 0;
  
--- 1178,1182 ----
  		inbytesleft = tmplen;
  		outbuf = tmpbuf;
! 		ptr = (char *)string;
  		errno = 0;
  
***************
*** 1203,1206 ****
  	iconv_close(cd);
  
! 	return ret;
  }
--- 1203,1206 ----
  	iconv_close(cd);
  
! 	return (BYTE *)ret;
  }

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31688/src/trspi

Modified Files:
	trousers.c 
Log Message:
Log*1 -> Log*

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** trousers.c	8 Feb 2006 19:08:55 -0000	1.21
--- trousers.c	29 Mar 2006 22:48:31 -0000	1.22
***************
*** 1108,1112 ****
  
  	if ((tmplen = hacky_strlen(nl_langinfo(CODESET), string)) == 0) {
! 		LogDebug1("hacky_strlen returned 0");
  		goto alloc_string;
  	}
--- 1108,1112 ----
  
  	if ((tmplen = hacky_strlen(nl_langinfo(CODESET), string)) == 0) {
! 		LogDebug("hacky_strlen returned 0");
  		goto alloc_string;
  	}
***************
*** 1124,1128 ****
  
  	if (len > MAX_BUF_SIZE) {
! 		LogDebug1("string too long.");
  		iconv_close(cd);
  		return NULL;
--- 1124,1128 ----
  
  	if (len > MAX_BUF_SIZE) {
! 		LogDebug("string too long.");
  		iconv_close(cd);
  		return NULL;
***************
*** 1169,1173 ****
  
  	if ((tmplen = hacky_strlen("UTF-16", string)) == 0) {
! 		LogDebug1("hacky_strlen returned 0");
  		return 0;
  	}
--- 1169,1173 ----
  
  	if ((tmplen = hacky_strlen("UTF-16", string)) == 0) {
! 		LogDebug("hacky_strlen returned 0");
  		return 0;
  	}
***************
*** 1187,1191 ****
  	len += char_width(nl_langinfo(CODESET));
  	if (len > MAX_BUF_SIZE) {
! 		LogDebug1("string too long.");
  		iconv_close(cd);
  		return NULL;
--- 1187,1191 ----
  	len += char_width(nl_langinfo(CODESET));
  	if (len > MAX_BUF_SIZE) {
! 		LogDebug("string too long.");
  		iconv_close(cd);
  		return NULL;

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12093/src/trspi

Modified Files:
	trousers.c 
Log Message:
added Trspi_UnloadBlob_PCR_COMPOSITE function, which is used by Quote

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** trousers.c	29 Mar 2006 22:48:31 -0000	1.22
--- trousers.c	6 Apr 2006 21:26:03 -0000	1.23
***************
*** 302,305 ****
--- 302,324 ----
  }
  
+ TSS_RESULT
+ Trspi_UnloadBlob_PCR_COMPOSITE(UINT16 *offset, BYTE *blob, TCPA_PCR_COMPOSITE *out)
+ {
+ 	TSS_RESULT result;
+ 
+ 	if ((result = Trspi_UnloadBlob_PCR_SELECTION(offset, blob, &out->select)))
+ 		return result;
+ 
+ 	Trspi_UnloadBlob_UINT32(offset, &out->valueSize, blob);
+ 	out->pcrValue = malloc(out->valueSize);
+ 	if (out->pcrValue == NULL) {
+ 		LogError("malloc of %d bytes failed.", out->valueSize);
+ 		return TSPERR(TSS_E_OUTOFMEMORY);
+ 	}
+ 	Trspi_UnloadBlob(offset, out->valueSize, blob, (BYTE *)out->pcrValue);
+ 
+ 	return TSS_SUCCESS;
+ }
+ 
  void
  Trspi_LoadBlob_PCR_SELECTION(UINT16 * offset, BYTE * blob, TCPA_PCR_SELECTION *pcr)

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3521/src/trspi

Modified Files:
	trousers.c 
Log Message:
switch to utf-16le; formatting changes; changed one printf to be unsigned

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** trousers.c	6 Apr 2006 21:26:03 -0000	1.23
--- trousers.c	31 Aug 2006 18:49:45 -0000	1.24
***************
*** 1082,1086 ****
  	} else if (strcmp("UTF-32", codeset) == 0) {
  		while (!(ptr[0] == '\0' && ptr[1] == '\0' &&
! 					ptr[2] == '\0' && ptr[3] == '\0')) {
  			len += 4;
  			ptr += 4;
--- 1082,1086 ----
  	} else if (strcmp("UTF-32", codeset) == 0) {
  		while (!(ptr[0] == '\0' && ptr[1] == '\0' &&
! 			 ptr[2] == '\0' && ptr[3] == '\0')) {
  			len += 4;
  			ptr += 4;
***************
*** 1121,1125 ****
  		goto alloc_string;
  
! 	if ((cd = iconv_open("UTF-16", nl_langinfo(CODESET))) == (iconv_t)-1) {
  		LogDebug("iconv_open: %s", strerror(errno));
  		return NULL;
--- 1121,1125 ----
  		goto alloc_string;
  
! 	if ((cd = iconv_open("UTF-16LE", nl_langinfo(CODESET))) == (iconv_t)-1) {
  		LogDebug("iconv_open: %s", strerror(errno));
  		return NULL;
***************
*** 1152,1156 ****
  	len += char_width("UTF-16");
  	if ((ret = calloc(1, len)) == NULL) {
! 		LogDebug("malloc of %d bytes failed.", len);
  		iconv_close(cd);
  		return NULL;
--- 1152,1156 ----
  	len += char_width("UTF-16");
  	if ((ret = calloc(1, len)) == NULL) {
! 		LogDebug("malloc of %u bytes failed.", len);
  		iconv_close(cd);
  		return NULL;
***************
*** 1182,1186 ****
  	}
  
! 	if ((cd = iconv_open(nl_langinfo(CODESET), "UTF-16")) == (iconv_t)-1) {
  		LogDebug("iconv_open: %s", strerror(errno));
  		return NULL;
--- 1182,1186 ----
  	}
  
! 	if ((cd = iconv_open(nl_langinfo(CODESET), "UTF-16LE")) == (iconv_t)-1) {
  		LogDebug("iconv_open: %s", strerror(errno));
  		return NULL;

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv16096/src/trspi

Modified Files:
	trousers.c 
Log Message:
modified as part of TSS 1.2 update

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** trousers.c	31 Aug 2006 18:49:45 -0000	1.24
--- trousers.c	30 Oct 2006 21:05:03 -0000	1.25
***************
*** 5,9 ****
   * trousers - An open source TCG Software Stack
   *
!  * (C) Copyright International Business Machines Corp. 2004, 2005
   *
   */
--- 5,9 ----
   * trousers - An open source TCG Software Stack
   *
!  * (C) Copyright International Business Machines Corp. 2004-2006
   *
[...1105 lines suppressed...]
+ 	TSS_RESULT result;
+ 
+ 	result = Trspi_Hash_SYMMETRIC_KEY(c, &asym->sessionKey);
+ 	result |= Trspi_HashUpdate(c, TCPA_SHA1_160_HASH_LEN, (BYTE *)&asym->idDigest);
+ 
+ 	return result;
+ }
+ 
+ TSS_RESULT
+ Trspi_Hash_BOUND_DATA(Trspi_HashCtx *c, TCPA_BOUND_DATA *bd, UINT32 payloadLength)
+ {
+ 	TSS_RESULT result;
+ 
+ 	result = Trspi_Hash_VERSION(c, (TSS_VERSION *)&bd->ver);
+ 	result |= Trspi_Hash_BYTE(c, bd->payload);
+ 	result |= Trspi_HashUpdate(c, payloadLength, bd->payloadData);
+ 
+ 	return result;
+ }
+

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21066/src/trspi

Modified Files:
	trousers.c 
Log Message:
compile fix for signedness warning

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** trousers.c	30 Oct 2006 21:05:03 -0000	1.25
--- trousers.c	8 Nov 2006 17:38:58 -0000	1.26
***************
*** 1123,1127 ****
  Trspi_Hash_BOOL(Trspi_HashCtx *c, TSS_BOOL data)
  {
! 	return Trspi_HashUpdate(c, sizeof(TSS_BOOL), &data);
  }
  
--- 1123,1127 ----
  Trspi_Hash_BOOL(Trspi_HashCtx *c, TSS_BOOL data)
  {
! 	return Trspi_HashUpdate(c, (UINT32)sizeof(TSS_BOOL), (BYTE *)&data);
  }

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21748/src/trspi

Modified Files:
      Tag: TROUSERS_0_2
	trousers.c 
Log Message:
made offsets in blob functions UINT64

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.24
retrieving revision 1.24.2.1
diff -C2 -d -r1.24 -r1.24.2.1
*** trousers.c	31 Aug 2006 18:49:45 -0000	1.24
--- trousers.c	8 Dec 2006 16:42:16 -0000	1.24.2.1
***************
*** 32,36 ****
  
  void
! Trspi_UnloadBlob_DIGEST(UINT16 * offset, BYTE * blob, TCPA_DIGEST digest)
  {
  	Trspi_UnloadBlob(offset, TCPA_SHA1_160_HASH_LEN, blob, digest.digest);
--- 32,36 ----
  
  void
! Trspi_UnloadBlob_DIGEST(UINT64 * offset, BYTE * blob, TCPA_DIGEST digest)
  {
  	Trspi_UnloadBlob(offset, TCPA_SHA1_160_HASH_LEN, blob, digest.digest);
***************
*** 38,42 ****
  
  void
! Trspi_LoadBlob_PUBKEY(UINT16 *offset, BYTE *blob, TCPA_PUBKEY *pubKey)
  {
  	Trspi_LoadBlob_KEY_PARMS(offset, blob, &pubKey->algorithmParms);
--- 38,42 ----
  
  void
! Trspi_LoadBlob_PUBKEY(UINT64 *offset, BYTE *blob, TCPA_PUBKEY *pubKey)
  {
  	Trspi_LoadBlob_KEY_PARMS(offset, blob, &pubKey->algorithmParms);
***************
*** 45,49 ****
  
  TSS_RESULT
! Trspi_UnloadBlob_PUBKEY(UINT16 * offset, BYTE * blob, TCPA_PUBKEY * pubKey)
  {
  	TSS_RESULT result;
--- 45,49 ----
  
  TSS_RESULT
! Trspi_UnloadBlob_PUBKEY(UINT64 * offset, BYTE * blob, TCPA_PUBKEY * pubKey)
  {
  	TSS_RESULT result;
***************
*** 65,69 ****
  
  TSS_RESULT
! Trspi_UnloadBlob_MigrationKeyAuth(UINT16 *offset,
  				  BYTE *blob,
  				  TCPA_MIGRATIONKEYAUTH *migAuth)
--- 65,69 ----
  
  TSS_RESULT
! Trspi_UnloadBlob_MigrationKeyAuth(UINT64 *offset,
  				  BYTE *blob,
  				  TCPA_MIGRATIONKEYAUTH *migAuth)
***************
*** 82,86 ****
  #if 0
  void
! LoadBlob_STORE_PRIVKEY(UINT16 * offset, BYTE * blob, TCPA_STORE_PRIVKEY * store)
  {
  	LoadBlob_UINT32(offset, store->keyLength, blob);
--- 82,86 ----
  #if 0
  void
! LoadBlob_STORE_PRIVKEY(UINT64 * offset, BYTE * blob, TCPA_STORE_PRIVKEY * store)
  {
  	LoadBlob_UINT32(offset, store->keyLength, blob);
***************
*** 89,95 ****
  
  void
! LoadBlob_STORE_ASYMKEY(UINT16 * offset, BYTE * blob, TCPA_STORE_ASYMKEY * store)
  {
! 	blob[(*offset)++] = store->payload;
  	LoadBlob(offset, TCPA_SHA1_160_HASH_LEN, blob, store->usageAuth.secret);
  	LoadBlob(offset, TCPA_SHA1_160_HASH_LEN, blob, store->migrationAuth.secret);
--- 89,95 ----
  
  void
! LoadBlob_STORE_ASYMKEY(UINT64 * offset, BYTE * blob, TCPA_STORE_ASYMKEY * store)
  {
! 	LoadBlob_BYTE(offset, store->payload, blob);
  	LoadBlob(offset, TCPA_SHA1_160_HASH_LEN, blob, store->usageAuth.secret);
  	LoadBlob(offset, TCPA_SHA1_160_HASH_LEN, blob, store->migrationAuth.secret);
***************
*** 100,129 ****
  
  void
! Trspi_LoadBlob(UINT16 * offset, UINT32 size, BYTE * container, BYTE * object)
  {
  	if (size == 0)
  		return;
! 	memcpy(&container[(*offset)], object, size);
! 	(*offset) += (UINT16) size;
  }
  
  void
! Trspi_UnloadBlob(UINT16 * offset, UINT32 size, BYTE * container, BYTE * object)
  {
  	if (size == 0)
  		return;
  	memcpy(object, &container[(*offset)], size);
! 	(*offset) += (UINT16) size;
  }
  
  void
! Trspi_LoadBlob_BYTE(UINT16 * offset, BYTE data, BYTE * blob)
  {
! 	blob[*offset] = data;
  	(*offset)++;
  }
  
  void
! Trspi_UnloadBlob_BYTE(UINT16 * offset, BYTE * dataOut, BYTE * blob)
  {
  	*dataOut = blob[*offset];
--- 100,131 ----
  
  void
! Trspi_LoadBlob(UINT64 * offset, UINT32 size, BYTE * container, BYTE * object)
  {
  	if (size == 0)
  		return;
! 	if (container)
! 		memcpy(&container[(*offset)], object, size);
! 	(*offset) += (UINT64) size;
  }
  
  void
! Trspi_UnloadBlob(UINT64 * offset, UINT32 size, BYTE * container, BYTE * object)
  {
  	if (size == 0)
  		return;
  	memcpy(object, &container[(*offset)], size);
! 	(*offset) += (UINT64) size;
  }
  
  void
! Trspi_LoadBlob_BYTE(UINT64 * offset, BYTE data, BYTE * blob)
  {
! 	if (blob)
! 		blob[*offset] = data;
  	(*offset)++;
  }
  
  void
! Trspi_UnloadBlob_BYTE(UINT64 * offset, BYTE * dataOut, BYTE * blob)
  {
  	*dataOut = blob[*offset];
***************
*** 132,143 ****
  
  void
! Trspi_LoadBlob_BOOL(UINT16 * offset, TSS_BOOL data, BYTE * blob)
  {
! 	blob[*offset] = (BYTE) data;
  	(*offset)++;
  }
  
  void
! Trspi_UnloadBlob_BOOL(UINT16 * offset, TSS_BOOL * dataOut, BYTE * blob)
  {
  	*dataOut = blob[*offset];
--- 134,146 ----
  
  void
! Trspi_LoadBlob_BOOL(UINT64 * offset, TSS_BOOL data, BYTE * blob)
  {
! 	if (blob)
! 		blob[*offset] = (BYTE) data;
  	(*offset)++;
  }
  
  void
! Trspi_UnloadBlob_BOOL(UINT64 * offset, TSS_BOOL * dataOut, BYTE * blob)
  {
  	*dataOut = blob[*offset];
***************
*** 146,164 ****
  
  void
! Trspi_LoadBlob_UINT32(UINT16 * offset, UINT32 in, BYTE * blob)
  {
! 	UINT32ToArray(in, &blob[*offset]);
  	*offset += 4;
  }
  
  void
! Trspi_LoadBlob_UINT16(UINT16 * offset, UINT16 in, BYTE * blob)
  {
! 	UINT16ToArray(in, &blob[*offset]);
  	*offset += sizeof(UINT16);
  }
  
  void
! Trspi_UnloadBlob_UINT32(UINT16 * offset, UINT32 * out, BYTE * blob)
  {
  	*out = Decode_UINT32(&blob[*offset]);
--- 149,169 ----
  
  void
! Trspi_LoadBlob_UINT32(UINT64 * offset, UINT32 in, BYTE * blob)
  {
! 	if (blob)
! 		UINT32ToArray(in, &blob[*offset]);
  	*offset += 4;
  }
  
  void
! Trspi_LoadBlob_UINT16(UINT64 * offset, UINT16 in, BYTE * blob)
  {
! 	if (blob)
! 		UINT16ToArray(in, &blob[*offset]);
  	*offset += sizeof(UINT16);
  }
  
  void
! Trspi_UnloadBlob_UINT32(UINT64 * offset, UINT32 * out, BYTE * blob)
  {
  	*out = Decode_UINT32(&blob[*offset]);
***************
*** 167,171 ****
  
  void
! Trspi_UnloadBlob_UINT16(UINT16 * offset, UINT16 * out, BYTE * blob)
  {
  	*out = Decode_UINT16(&blob[*offset]);
--- 172,176 ----
  
  void
! Trspi_UnloadBlob_UINT16(UINT64 * offset, UINT16 * out, BYTE * blob)
  {
  	*out = Decode_UINT16(&blob[*offset]);
***************
*** 174,178 ****
  
  void
! Trspi_LoadBlob_RSA_KEY_PARMS(UINT16 * offset, BYTE * blob, TCPA_RSA_KEY_PARMS * parms)
  {
  	Trspi_LoadBlob_UINT32(offset, parms->keyLength, blob);
--- 179,183 ----
  
  void
! Trspi_LoadBlob_RSA_KEY_PARMS(UINT64 * offset, BYTE * blob, TCPA_RSA_KEY_PARMS * parms)
  {
  	Trspi_LoadBlob_UINT32(offset, parms->keyLength, blob);
***************
*** 185,225 ****
  
  void
! Trspi_UnloadBlob_TSS_VERSION(UINT16 * offset, BYTE * blob, TSS_VERSION * out)
  {
! 	out->bMajor = blob[(*offset)++];
! 	out->bMinor = blob[(*offset)++];
! 	out->bRevMajor = blob[(*offset)++];
! 	out->bRevMinor = blob[(*offset)++];
  }
  
  void
! Trspi_LoadBlob_TSS_VERSION(UINT16 * offset, BYTE * blob, TSS_VERSION version)
  {
! 	blob[(*offset)++] = version.bMajor;
! 	blob[(*offset)++] = version.bMinor;
! 	blob[(*offset)++] = version.bRevMajor;
! 	blob[(*offset)++] = version.bRevMinor;
  }
  
  void
! Trspi_UnloadBlob_TCPA_VERSION(UINT16 * offset, BYTE * blob, TCPA_VERSION * out)
  {
! 	out->major = blob[(*offset)++];
! 	out->minor = blob[(*offset)++];
! 	out->revMajor = blob[(*offset)++];
! 	out->revMinor = blob[(*offset)++];
  }
  
  void
! Trspi_LoadBlob_TCPA_VERSION(UINT16 * offset, BYTE * blob, TCPA_VERSION version)
  {
! 	blob[(*offset)++] = version.major;
! 	blob[(*offset)++] = version.minor;
! 	blob[(*offset)++] = version.revMajor;
! 	blob[(*offset)++] = version.revMinor;
  }
  
  TSS_RESULT
! Trspi_UnloadBlob_PCR_INFO(UINT16 * offset, BYTE * blob, TCPA_PCR_INFO * pcr)
  {
  	TSS_RESULT result;
--- 190,230 ----
  
  void
! Trspi_UnloadBlob_TSS_VERSION(UINT64 * offset, BYTE * blob, TSS_VERSION * out)
  {
! 	Trspi_UnloadBlob_BYTE(offset, &out->bMajor, blob);
! 	Trspi_UnloadBlob_BYTE(offset, &out->bMinor, blob);
! 	Trspi_UnloadBlob_BYTE(offset, &out->bRevMajor, blob);
! 	Trspi_UnloadBlob_BYTE(offset, &out->bRevMinor, blob);
  }
  
  void
! Trspi_LoadBlob_TSS_VERSION(UINT64 * offset, BYTE * blob, TSS_VERSION version)
  {
! 	Trspi_LoadBlob_BYTE(offset, version.bMajor, blob);
! 	Trspi_LoadBlob_BYTE(offset, version.bMinor, blob);
! 	Trspi_LoadBlob_BYTE(offset, version.bRevMajor, blob);
! 	Trspi_LoadBlob_BYTE(offset, version.bRevMinor, blob);
  }
  
  void
! Trspi_UnloadBlob_TCPA_VERSION(UINT64 * offset, BYTE * blob, TCPA_VERSION * out)
  {
! 	Trspi_UnloadBlob_BYTE(offset, &out->major, blob);
! 	Trspi_UnloadBlob_BYTE(offset, &out->minor, blob);
! 	Trspi_UnloadBlob_BYTE(offset, &out->revMajor, blob);
! 	Trspi_UnloadBlob_BYTE(offset, &out->revMinor, blob);
  }
  
  void
! Trspi_LoadBlob_TCPA_VERSION(UINT64 * offset, BYTE * blob, TCPA_VERSION version)
  {
! 	Trspi_LoadBlob_BYTE(offset, version.major, blob);
! 	Trspi_LoadBlob_BYTE(offset, version.minor, blob);
! 	Trspi_LoadBlob_BYTE(offset, version.revMajor, blob);
! 	Trspi_LoadBlob_BYTE(offset, version.revMinor, blob);
  }
  
  TSS_RESULT
! Trspi_UnloadBlob_PCR_INFO(UINT64 * offset, BYTE * blob, TCPA_PCR_INFO * pcr)
  {
  	TSS_RESULT result;
***************
*** 233,237 ****
  
  TSS_RESULT
! Trspi_UnloadBlob_STORED_DATA(UINT16 * offset, BYTE * blob, TCPA_STORED_DATA * data)
  {
  	Trspi_UnloadBlob_TCPA_VERSION(offset, blob, &data->ver);
--- 238,242 ----
  
  TSS_RESULT
! Trspi_UnloadBlob_STORED_DATA(UINT64 * offset, BYTE * blob, TCPA_STORED_DATA * data)
  {
  	Trspi_UnloadBlob_TCPA_VERSION(offset, blob, &data->ver);
***************
*** 269,273 ****
  
  void
! Trspi_LoadBlob_STORED_DATA(UINT16 * offset, BYTE * blob, TCPA_STORED_DATA * data)
  {
  	Trspi_LoadBlob_TCPA_VERSION(offset, blob, data->ver);
--- 274,278 ----
  
  void
! Trspi_LoadBlob_STORED_DATA(UINT64 * offset, BYTE * blob, TCPA_STORED_DATA * data)
  {
  	Trspi_LoadBlob_TCPA_VERSION(offset, blob, data->ver);
***************
*** 279,290 ****
  
  TSS_RESULT
! Trspi_UnloadBlob_PCR_SELECTION(UINT16 *offset, BYTE *blob, TCPA_PCR_SELECTION *pcr)
  {
  	UINT16 i;
  
! 	pcr->sizeOfSelect = Decode_UINT16(&blob[*offset]);
  
  	if (pcr->sizeOfSelect > 0) {
- 		*offset += sizeof(UINT16);
  		pcr->pcrSelect = calloc(1, pcr->sizeOfSelect);
  		if (pcr->pcrSelect == NULL) {
--- 284,294 ----
  
  TSS_RESULT
! Trspi_UnloadBlob_PCR_SELECTION(UINT64 *offset, BYTE *blob, TCPA_PCR_SELECTION *pcr)
  {
  	UINT16 i;
  
! 	Trspi_UnloadBlob_UINT16(offset, &pcr->sizeOfSelect, blob);
  
  	if (pcr->sizeOfSelect > 0) {
  		pcr->pcrSelect = calloc(1, pcr->sizeOfSelect);
  		if (pcr->pcrSelect == NULL) {
***************
*** 293,298 ****
  		}
  
! 		for (i = 0; i < pcr->sizeOfSelect; i++, (*offset)++)
! 			pcr->pcrSelect[i] = blob[*offset];
  	} else {
  		pcr->pcrSelect = NULL;
--- 297,302 ----
  		}
  
! 		for (i = 0; i < pcr->sizeOfSelect; i++)
! 			Trspi_UnloadBlob_BYTE(offset, &pcr->pcrSelect[i], blob);
  	} else {
  		pcr->pcrSelect = NULL;
***************
*** 303,307 ****
  
  TSS_RESULT
! Trspi_UnloadBlob_PCR_COMPOSITE(UINT16 *offset, BYTE *blob, TCPA_PCR_COMPOSITE *out)
  {
  	TSS_RESULT result;
--- 307,311 ----
  
  TSS_RESULT
! Trspi_UnloadBlob_PCR_COMPOSITE(UINT64 *offset, BYTE *blob, TCPA_PCR_COMPOSITE *out)
  {
  	TSS_RESULT result;
***************
*** 322,342 ****
  
  void
! Trspi_LoadBlob_PCR_SELECTION(UINT16 * offset, BYTE * blob, TCPA_PCR_SELECTION *pcr)
  {
  	UINT16 i;
  
! 	UINT16ToArray(pcr->sizeOfSelect, &blob[*offset]);
! 	*offset += sizeof(UINT16);
! 	for (i = 0; i < pcr->sizeOfSelect; i++, (*offset)++)
! 		blob[*offset] = pcr->pcrSelect[i];
  }
  
  void
! Trspi_LoadBlob_KEY(UINT16 * offset, BYTE * blob, TCPA_KEY * key)
  {
  	Trspi_LoadBlob_TCPA_VERSION(offset, blob, key->ver);
  	Trspi_LoadBlob_UINT16(offset, key->keyUsage, blob);
  	Trspi_LoadBlob_KEY_FLAGS(offset, blob, &key->keyFlags);
! 	blob[(*offset)++] = key->authDataUsage;
  	Trspi_LoadBlob_KEY_PARMS(offset, blob, &key->algorithmParms);
  	Trspi_LoadBlob_UINT32(offset, key->PCRInfoSize, blob);
--- 326,345 ----
  
  void
! Trspi_LoadBlob_PCR_SELECTION(UINT64 * offset, BYTE * blob, TCPA_PCR_SELECTION *pcr)
  {
  	UINT16 i;
  
! 	Trspi_LoadBlob_UINT16(offset, pcr->sizeOfSelect, blob);
! 	for (i = 0; i < pcr->sizeOfSelect; i++)
! 		Trspi_LoadBlob_BYTE(offset, pcr->pcrSelect[i], blob);
  }
  
  void
! Trspi_LoadBlob_KEY(UINT64 * offset, BYTE * blob, TCPA_KEY * key)
  {
  	Trspi_LoadBlob_TCPA_VERSION(offset, blob, key->ver);
  	Trspi_LoadBlob_UINT16(offset, key->keyUsage, blob);
  	Trspi_LoadBlob_KEY_FLAGS(offset, blob, &key->keyFlags);
! 	Trspi_LoadBlob_BYTE(offset, key->authDataUsage, blob);
  	Trspi_LoadBlob_KEY_PARMS(offset, blob, &key->algorithmParms);
  	Trspi_LoadBlob_UINT32(offset, key->PCRInfoSize, blob);
***************
*** 348,352 ****
  
  void
! Trspi_LoadBlob_KEY_FLAGS(UINT16 * offset, BYTE * blob, TCPA_KEY_FLAGS * flags)
  {
  	UINT32 tempFlag = 0;
--- 351,355 ----
  
  void
! Trspi_LoadBlob_KEY_FLAGS(UINT64 * offset, BYTE * blob, TCPA_KEY_FLAGS * flags)
  {
  	UINT32 tempFlag = 0;
***************
*** 362,366 ****
  
  void
! Trspi_UnloadBlob_KEY_FLAGS(UINT16 * offset, BYTE * blob, TCPA_KEY_FLAGS * flags)
  {
  	UINT32 tempFlag = 0;
--- 365,369 ----
  
  void
! Trspi_UnloadBlob_KEY_FLAGS(UINT64 * offset, BYTE * blob, TCPA_KEY_FLAGS * flags)
  {
  	UINT32 tempFlag = 0;
***************
*** 378,382 ****
  
  void
! Trspi_LoadBlob_KEY_PARMS(UINT16 * offset, BYTE * blob, TCPA_KEY_PARMS * keyInfo)
  {
  	Trspi_LoadBlob_UINT32(offset, keyInfo->algorithmID, blob);
--- 381,385 ----
  
  void
! Trspi_LoadBlob_KEY_PARMS(UINT64 * offset, BYTE * blob, TCPA_KEY_PARMS * keyInfo)
  {
  	Trspi_LoadBlob_UINT32(offset, keyInfo->algorithmID, blob);
***************
*** 390,394 ****
  
  void
! Trspi_LoadBlob_STORE_PUBKEY(UINT16 * offset, BYTE * blob, TCPA_STORE_PUBKEY * store)
  {
  	Trspi_LoadBlob_UINT32(offset, store->keyLength, blob);
--- 393,397 ----
  
  void
! Trspi_LoadBlob_STORE_PUBKEY(UINT64 * offset, BYTE * blob, TCPA_STORE_PUBKEY * store)
  {
  	Trspi_LoadBlob_UINT32(offset, store->keyLength, blob);
***************
*** 397,401 ****
  
  void
! Trspi_LoadBlob_UUID(UINT16 * offset, BYTE * blob, TSS_UUID uuid)
  {
  	Trspi_LoadBlob_UINT32(offset, uuid.ulTimeLow, blob);
--- 400,404 ----
  
  void
! Trspi_LoadBlob_UUID(UINT64 * offset, BYTE * blob, TSS_UUID uuid)
  {
  	Trspi_LoadBlob_UINT32(offset, uuid.ulTimeLow, blob);
***************
*** 408,412 ****
  
  void
! Trspi_UnloadBlob_UUID(UINT16 * offset, BYTE * blob, TSS_UUID * uuid)
  {
  	memset(uuid, 0, sizeof(TSS_UUID));
--- 411,415 ----
  
  void
! Trspi_UnloadBlob_UUID(UINT64 * offset, BYTE * blob, TSS_UUID * uuid)
  {
  	memset(uuid, 0, sizeof(TSS_UUID));
***************
*** 420,424 ****
  
  TSS_RESULT
! Trspi_UnloadBlob_KEY_PARMS(UINT16 * offset, BYTE * blob, TCPA_KEY_PARMS * keyParms)
  {
  	Trspi_UnloadBlob_UINT32(offset, &keyParms->algorithmID, blob);
--- 423,427 ----
  
  TSS_RESULT
! Trspi_UnloadBlob_KEY_PARMS(UINT64 * offset, BYTE * blob, TCPA_KEY_PARMS * keyParms)
  {
  	Trspi_UnloadBlob_UINT32(offset, &keyParms->algorithmID, blob);
***************
*** 442,446 ****
  
  TSS_RESULT
! Trspi_UnloadBlob_KEY(UINT16 * offset, BYTE * blob, TCPA_KEY * key)
  {
  	TSS_RESULT result;
--- 445,449 ----
  
  TSS_RESULT
! Trspi_UnloadBlob_KEY(UINT64 * offset, BYTE * blob, TCPA_KEY * key)
  {
  	TSS_RESULT result;
***************
*** 449,453 ****
  	Trspi_UnloadBlob_UINT16(offset, &key->keyUsage, blob);
  	Trspi_UnloadBlob_KEY_FLAGS(offset, blob, &key->keyFlags);
! 	key->authDataUsage = blob[(*offset)++];
  	if ((result = Trspi_UnloadBlob_KEY_PARMS(offset, (BYTE *) blob, &key->algorithmParms)))
  		return result;
--- 452,456 ----
  	Trspi_UnloadBlob_UINT16(offset, &key->keyUsage, blob);
  	Trspi_UnloadBlob_KEY_FLAGS(offset, blob, &key->keyFlags);
! 	Trspi_UnloadBlob_BYTE(offset, &key->authDataUsage, blob);
  	if ((result = Trspi_UnloadBlob_KEY_PARMS(offset, (BYTE *) blob, &key->algorithmParms)))
  		return result;
***************
*** 484,500 ****
  
  /*
! void UnloadBlob_VERSION( UINT16* offset,  BYTE* blob, TCPA_VERSION* out ){
! 
! 	out->major = blob[(*offset)++];
! 	out->minor = blob[(*offset)++];
! 	out->revMajor = blob[(*offset)++];
! 	out->revMinor = blob[(*offset)++];
! 
! 	return;
  }
  */
  
  TSS_RESULT
! Trspi_UnloadBlob_STORE_PUBKEY(UINT16 * offset, BYTE * blob, TCPA_STORE_PUBKEY * store)
  {
  	Trspi_UnloadBlob_UINT32(offset, &store->keyLength, blob);
--- 487,502 ----
  
  /*
! void
! UnloadBlob_VERSION( UINT16* offset,  BYTE* blob, TCPA_VERSION* out )
! {
! 	Trspi_UnloadBlob_BYTE(offset, &out->major, blob);
! 	Trspi_UnloadBlob_BYTE(offset, &out->minor, blob);
! 	Trspi_UnloadBlob_BYTE(offset, &out->revMajor, blob);
! 	Trspi_UnloadBlob_BYTE(offset, &out->revMinor, blob);
  }
  */
  
  TSS_RESULT
! Trspi_UnloadBlob_STORE_PUBKEY(UINT64 * offset, BYTE * blob, TCPA_STORE_PUBKEY * store)
  {
  	Trspi_UnloadBlob_UINT32(offset, &store->keyLength, blob);
***************
*** 516,520 ****
  #if 0
  void
! LoadBlob_PUBKEY(UINT16 * offset, BYTE * blob, TCPA_PUBKEY pubKey)
  {
  	LoadBlob_KEY_PARMS(offset, blob, &pubKey.algorithmParms);
--- 518,522 ----
  #if 0
  void
! LoadBlob_PUBKEY(UINT64 * offset, BYTE * blob, TCPA_PUBKEY pubKey)
  {
  	LoadBlob_KEY_PARMS(offset, blob, &pubKey.algorithmParms);
***************
*** 524,528 ****
  
  void
! LoadBlob_CERTIFY_INFO(UINT16 * offset, BYTE * blob, TCPA_CERTIFY_INFO * certify)
  {
  
--- 526,530 ----
  
  void
! LoadBlob_CERTIFY_INFO(UINT64 * offset, BYTE * blob, TCPA_CERTIFY_INFO * certify)
  {
  
***************
*** 540,549 ****
  
  void
! Trspi_UnloadBlob_TCPA_EVENT_CERT(UINT16 * offset, BYTE * blob, TCPA_EVENT_CERT * cert)
  {
  	Trspi_UnloadBlob(offset, TCPA_SHA1_160_HASH_LEN, blob, cert->certificateHash.digest);
  	Trspi_UnloadBlob(offset, TCPA_SHA1_160_HASH_LEN, blob, cert->entityDigest.digest);
! 	cert->digestChecked = blob[(*offset)++];
! 	cert->digestVerified = blob[(*offset)++];
  	Trspi_UnloadBlob_UINT32(offset, &cert->issuerSize, blob);
  	Trspi_UnloadBlob(offset, cert->issuerSize, blob, cert->issuer);
--- 542,551 ----
  
  void
! Trspi_UnloadBlob_TCPA_EVENT_CERT(UINT64 * offset, BYTE * blob, TCPA_EVENT_CERT * cert)
  {
  	Trspi_UnloadBlob(offset, TCPA_SHA1_160_HASH_LEN, blob, cert->certificateHash.digest);
  	Trspi_UnloadBlob(offset, TCPA_SHA1_160_HASH_LEN, blob, cert->entityDigest.digest);
! 	Trspi_UnloadBlob_BYTE(offset, &cert->digestChecked, blob);
! 	Trspi_UnloadBlob_BYTE(offset, &cert->digestVerified, blob);
  	Trspi_UnloadBlob_UINT32(offset, &cert->issuerSize, blob);
  	Trspi_UnloadBlob(offset, cert->issuerSize, blob, cert->issuer);
***************
*** 552,556 ****
  
  void
! Trspi_UnloadBlob_VERSION(UINT16 * offset, BYTE * blob, TCPA_VERSION * out)
  {
  	Trspi_UnloadBlob_BYTE(offset, &out->major, blob);
--- 554,558 ----
  
  void
! Trspi_UnloadBlob_VERSION(UINT64 * offset, BYTE * blob, TCPA_VERSION * out)
  {
  	Trspi_UnloadBlob_BYTE(offset, &out->major, blob);
***************
*** 561,565 ****
  
  void
! Trspi_UnloadBlob_KM_KEYINFO(UINT16 *offset, BYTE *blob, TSS_KM_KEYINFO *info)
  {
  	Trspi_UnloadBlob_TSS_VERSION( offset, blob, &info->versionInfo);
--- 563,567 ----
  
  void
! Trspi_UnloadBlob_KM_KEYINFO(UINT64 *offset, BYTE *blob, TSS_KM_KEYINFO *info)
  {
  	Trspi_UnloadBlob_TSS_VERSION( offset, blob, &info->versionInfo);
***************
*** 573,577 ****
  
  void
! Trspi_LoadBlob_PCR_EVENT(UINT16 *offset, BYTE *blob, TSS_PCR_EVENT *event)
  {
  	Trspi_LoadBlob_TCPA_VERSION(offset, blob, *(TCPA_VERSION *)(&event->versionInfo));
--- 575,579 ----
  
  void
! Trspi_LoadBlob_PCR_EVENT(UINT64 *offset, BYTE *blob, TSS_PCR_EVENT *event)
  {
  	Trspi_LoadBlob_TCPA_VERSION(offset, blob, *(TCPA_VERSION *)(&event->versionInfo));
***************
*** 590,594 ****
  
  TSS_RESULT
! Trspi_UnloadBlob_PCR_EVENT(UINT16 *offset, BYTE *blob, TSS_PCR_EVENT *event)
  {
  	Trspi_UnloadBlob_VERSION(offset, blob, (TCPA_VERSION *)&(event->versionInfo));
--- 592,596 ----
  
  TSS_RESULT
! Trspi_UnloadBlob_PCR_EVENT(UINT64 *offset, BYTE *blob, TSS_PCR_EVENT *event)
  {
  	Trspi_UnloadBlob_VERSION(offset, blob, (TCPA_VERSION *)&(event->versionInfo));
***************
*** 629,638 ****
   */
  void
! Trspi_LoadBlob_PRIVKEY_DIGEST(UINT16 * offset, BYTE * blob, TCPA_KEY *key)
  {
  	Trspi_LoadBlob_TCPA_VERSION(offset, blob, key->ver);
  	Trspi_LoadBlob_UINT16(offset, key->keyUsage, blob);
  	Trspi_LoadBlob_KEY_FLAGS(offset, blob, &key->keyFlags);
! 	blob[(*offset)++] = key->authDataUsage;
  	Trspi_LoadBlob_KEY_PARMS(offset, blob, &key->algorithmParms);
  
--- 631,640 ----
   */
  void
! Trspi_LoadBlob_PRIVKEY_DIGEST(UINT64 * offset, BYTE * blob, TCPA_KEY *key)
  {
  	Trspi_LoadBlob_TCPA_VERSION(offset, blob, key->ver);
  	Trspi_LoadBlob_UINT16(offset, key->keyUsage, blob);
  	Trspi_LoadBlob_KEY_FLAGS(offset, blob, &key->keyFlags);
! 	Trspi_LoadBlob_BYTE(offset, key->authDataUsage, blob);
  	Trspi_LoadBlob_KEY_PARMS(offset, blob, &key->algorithmParms);
  
***************
*** 647,651 ****
  
  void
! Trspi_LoadBlob_SYMMETRIC_KEY(UINT16 *offset, BYTE *blob, TCPA_SYMMETRIC_KEY *key)
  {
  	Trspi_LoadBlob_UINT32(offset, key->algId, blob);
--- 649,653 ----
  
  void
! Trspi_LoadBlob_SYMMETRIC_KEY(UINT64 *offset, BYTE *blob, TCPA_SYMMETRIC_KEY *key)
  {
  	Trspi_LoadBlob_UINT32(offset, key->algId, blob);
***************
*** 658,662 ****
  
  TSS_RESULT
! Trspi_UnloadBlob_SYMMETRIC_KEY(UINT16 *offset, BYTE *blob, TCPA_SYMMETRIC_KEY *key)
  {
  	Trspi_UnloadBlob_UINT32(offset, &key->algId, blob);
--- 660,664 ----
  
  TSS_RESULT
! Trspi_UnloadBlob_SYMMETRIC_KEY(UINT64 *offset, BYTE *blob, TCPA_SYMMETRIC_KEY *key)
  {
  	Trspi_UnloadBlob_UINT32(offset, &key->algId, blob);
***************
*** 679,683 ****
  
  TSS_RESULT
! Trspi_UnloadBlob_IDENTITY_REQ(UINT16 *offset, BYTE *blob, TCPA_IDENTITY_REQ *req)
  {
  	Trspi_UnloadBlob_UINT32(offset, &req->asymSize, blob);
--- 681,685 ----
  
  TSS_RESULT
! Trspi_UnloadBlob_IDENTITY_REQ(UINT64 *offset, BYTE *blob, TCPA_IDENTITY_REQ *req)
  {
  	Trspi_UnloadBlob_UINT32(offset, &req->asymSize, blob);
***************
*** 716,720 ****
  
  TSS_RESULT
! Trspi_UnloadBlob_IDENTITY_PROOF(UINT16 *offset, BYTE *blob, TCPA_IDENTITY_PROOF *proof)
  {
  	TSS_RESULT result;
--- 718,722 ----
  
  TSS_RESULT
! Trspi_UnloadBlob_IDENTITY_PROOF(UINT64 *offset, BYTE *blob, TCPA_IDENTITY_PROOF *proof)
  {
  	TSS_RESULT result;
***************
*** 826,830 ****
  
  void
! Trspi_LoadBlob_SYM_CA_ATTESTATION(UINT16 *offset, BYTE *blob,
  				  TCPA_SYM_CA_ATTESTATION *sym)
  {
--- 828,832 ----
  
  void
! Trspi_LoadBlob_SYM_CA_ATTESTATION(UINT64 *offset, BYTE *blob,
  				  TCPA_SYM_CA_ATTESTATION *sym)
  {
***************
*** 835,839 ****
  
  TSS_RESULT
! Trspi_UnloadBlob_SYM_CA_ATTESTATION(UINT16 *offset, BYTE *blob,
  				    TCPA_SYM_CA_ATTESTATION *sym)
  {
--- 837,841 ----
  
  TSS_RESULT
! Trspi_UnloadBlob_SYM_CA_ATTESTATION(UINT64 *offset, BYTE *blob,
  				    TCPA_SYM_CA_ATTESTATION *sym)
  {
***************
*** 863,867 ****
  
  void
! Trspi_LoadBlob_ASYM_CA_CONTENTS(UINT16 *offset, BYTE *blob,
  				TCPA_ASYM_CA_CONTENTS *asym)
  {
--- 865,869 ----
  
  void
! Trspi_LoadBlob_ASYM_CA_CONTENTS(UINT64 *offset, BYTE *blob,
  				TCPA_ASYM_CA_CONTENTS *asym)
  {
***************
*** 872,876 ****
  
  TSS_RESULT
! Trspi_UnloadBlob_ASYM_CA_CONTENTS(UINT16 *offset, BYTE *blob,
  				  TCPA_ASYM_CA_CONTENTS *asym)
  {
--- 874,878 ----
  
  TSS_RESULT
! Trspi_UnloadBlob_ASYM_CA_CONTENTS(UINT64 *offset, BYTE *blob,
  				  TCPA_ASYM_CA_CONTENTS *asym)
  {

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27084/src/trspi

Modified Files:
	trousers.c 
Log Message:
allow blob loading functions to only get the size of a blob

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** trousers.c	8 Nov 2006 17:38:58 -0000	1.26
--- trousers.c	9 Jan 2007 21:17:55 -0000	1.27
***************
*** 69,73 ****
  	if (size == 0)
  		return;
! 	memcpy(&to[(*offset)], from, size);
  	*offset += size;
  }
--- 69,74 ----
  	if (size == 0)
  		return;
! 	if (to)
! 		memcpy(&to[(*offset)], from, size);
  	*offset += size;
  }
***************
*** 85,89 ****
  Trspi_LoadBlob_BYTE(UINT64 *offset, BYTE data, BYTE *blob)
  {
! 	blob[*offset] = data;
  	(*offset)++;
  }
--- 86,91 ----
  Trspi_LoadBlob_BYTE(UINT64 *offset, BYTE data, BYTE *blob)
  {
! 	if (blob)
! 		blob[*offset] = data;
  	(*offset)++;
  }
***************
*** 99,103 ****
  Trspi_LoadBlob_BOOL(UINT64 *offset, TSS_BOOL data, BYTE *blob)
  {
! 	blob[*offset] = (BYTE) data;
  	(*offset)++;
  }
--- 101,106 ----
  Trspi_LoadBlob_BOOL(UINT64 *offset, TSS_BOOL data, BYTE *blob)
  {
! 	if (blob)
! 		blob[*offset] = (BYTE) data;
  	(*offset)++;
  }
***************
*** 113,118 ****
  Trspi_LoadBlob_UINT32(UINT64 *offset, UINT32 in, BYTE *blob)
  {
! 	UINT32ToArray(in, &blob[*offset]);
! 	*offset += 4;
  }
  
--- 116,122 ----
  Trspi_LoadBlob_UINT32(UINT64 *offset, UINT32 in, BYTE *blob)
  {
! 	if (blob)
! 		UINT32ToArray(in, &blob[*offset]);
! 	*offset += sizeof(UINT32);
  }
  
***************
*** 120,124 ****
  Trspi_LoadBlob_UINT16(UINT64 *offset, UINT16 in, BYTE *blob)
  {
! 	UINT16ToArray(in, &blob[*offset]);
  	*offset += sizeof(UINT16);
  }
--- 124,129 ----
  Trspi_LoadBlob_UINT16(UINT64 *offset, UINT16 in, BYTE *blob)
  {
! 	if (blob)
! 		UINT16ToArray(in, &blob[*offset]);
  	*offset += sizeof(UINT16);
  }
***************
*** 161,168 ****
  Trspi_LoadBlob_TSS_VERSION(UINT64 *offset, BYTE *blob, TSS_VERSION version)
  {
! 	blob[(*offset)++] = version.bMajor;
! 	blob[(*offset)++] = version.bMinor;
! 	blob[(*offset)++] = version.bRevMajor;
! 	blob[(*offset)++] = version.bRevMinor;
  }
  
--- 166,173 ----
  Trspi_LoadBlob_TSS_VERSION(UINT64 *offset, BYTE *blob, TSS_VERSION version)
  {
! 	Trspi_LoadBlob_BYTE(offset, version.bMajor, blob);
! 	Trspi_LoadBlob_BYTE(offset, version.bMinor, blob);
! 	Trspi_LoadBlob_BYTE(offset, version.bRevMajor, blob);
! 	Trspi_LoadBlob_BYTE(offset, version.bRevMinor, blob);
  }
  
***************
*** 170,177 ****
  Trspi_UnloadBlob_TCPA_VERSION(UINT64 *offset, BYTE *blob, TCPA_VERSION *out)
  {
! 	out->major = blob[(*offset)++];
! 	out->minor = blob[(*offset)++];
! 	out->revMajor = blob[(*offset)++];
! 	out->revMinor = blob[(*offset)++];
  }
  
--- 175,182 ----
  Trspi_UnloadBlob_TCPA_VERSION(UINT64 *offset, BYTE *blob, TCPA_VERSION *out)
  {
! 	Trspi_UnloadBlob_BYTE(offset, &out->major, blob);
! 	Trspi_UnloadBlob_BYTE(offset, &out->minor, blob);
! 	Trspi_UnloadBlob_BYTE(offset, &out->revMajor, blob);
! 	Trspi_UnloadBlob_BYTE(offset, &out->revMinor, blob);
  }
  
***************
*** 179,186 ****
  Trspi_LoadBlob_TCPA_VERSION(UINT64 *offset, BYTE *blob, TCPA_VERSION version)
  {
! 	blob[(*offset)++] = version.major;
! 	blob[(*offset)++] = version.minor;
! 	blob[(*offset)++] = version.revMajor;
! 	blob[(*offset)++] = version.revMinor;
  }
  
--- 184,191 ----
  Trspi_LoadBlob_TCPA_VERSION(UINT64 *offset, BYTE *blob, TCPA_VERSION version)
  {
! 	Trspi_LoadBlob_BYTE(offset, version.major, blob);
! 	Trspi_LoadBlob_BYTE(offset, version.minor, blob);
! 	Trspi_LoadBlob_BYTE(offset, version.revMajor, blob);
! 	Trspi_LoadBlob_BYTE(offset, version.revMinor, blob);
  }
  
***************
*** 190,197 ****
  	UINT16 i;
  
! 	pcr->sizeOfSelect = Decode_UINT16(&blob[*offset]);
  
  	if (pcr->sizeOfSelect > 0) {
- 		*offset += sizeof(UINT16);
  		pcr->pcrSelect = calloc(1, pcr->sizeOfSelect);
  		if (pcr->pcrSelect == NULL) {
--- 195,201 ----
  	UINT16 i;
  
! 	Trspi_UnloadBlob_UINT16(offset, &pcr->sizeOfSelect, blob);
  
  	if (pcr->sizeOfSelect > 0) {
  		pcr->pcrSelect = calloc(1, pcr->sizeOfSelect);
  		if (pcr->pcrSelect == NULL) {
***************
*** 200,205 ****
  		}
  
! 		for (i = 0; i < pcr->sizeOfSelect; i++, (*offset)++)
! 			pcr->pcrSelect[i] = blob[*offset];
  	} else {
  		pcr->pcrSelect = NULL;
--- 204,209 ----
  		}
  
! 		for (i = 0; i < pcr->sizeOfSelect; i++)
! 			Trspi_UnloadBlob_BYTE(offset, &pcr->pcrSelect[i], blob);
  	} else {
  		pcr->pcrSelect = NULL;
***************
*** 214,221 ****
  	UINT16 i;
  
! 	UINT16ToArray(pcr->sizeOfSelect, &blob[*offset]);
! 	*offset += sizeof(UINT16);
! 	for (i = 0; i < pcr->sizeOfSelect; i++, (*offset)++)
! 		blob[*offset] = pcr->pcrSelect[i];
  }
  
--- 218,224 ----
  	UINT16 i;
  
! 	Trspi_LoadBlob_UINT16(offset, pcr->sizeOfSelect, blob);
! 	for (i = 0; i < pcr->sizeOfSelect; i++)
! 		Trspi_LoadBlob_BYTE(offset, pcr->pcrSelect[i], blob);
  }
  
***************
*** 226,230 ****
  	Trspi_LoadBlob_UINT16(offset, key->keyUsage, blob);
  	Trspi_LoadBlob_KEY_FLAGS(offset, blob, &key->keyFlags);
! 	blob[(*offset)++] = key->authDataUsage;
  	Trspi_LoadBlob_KEY_PARMS(offset, blob, &key->algorithmParms);
  	Trspi_LoadBlob_UINT32(offset, key->PCRInfoSize, blob);
--- 229,233 ----
  	Trspi_LoadBlob_UINT16(offset, key->keyUsage, blob);
  	Trspi_LoadBlob_KEY_FLAGS(offset, blob, &key->keyFlags);
! 	Trspi_LoadBlob_BYTE(offset, key->authDataUsage, blob);
  	Trspi_LoadBlob_KEY_PARMS(offset, blob, &key->algorithmParms);
  	Trspi_LoadBlob_UINT32(offset, key->PCRInfoSize, blob);
***************
*** 337,341 ****
  	Trspi_UnloadBlob_UINT16(offset, &key->keyUsage, blob);
  	Trspi_UnloadBlob_KEY_FLAGS(offset, blob, &key->keyFlags);
! 	key->authDataUsage = blob[(*offset)++];
  	if ((result = Trspi_UnloadBlob_KEY_PARMS(offset, (BYTE *) blob, &key->algorithmParms)))
  		return result;
--- 340,344 ----
  	Trspi_UnloadBlob_UINT16(offset, &key->keyUsage, blob);
  	Trspi_UnloadBlob_KEY_FLAGS(offset, blob, &key->keyFlags);
! 	Trspi_UnloadBlob_BYTE(offset, &key->authDataUsage, blob);
  	if ((result = Trspi_UnloadBlob_KEY_PARMS(offset, (BYTE *) blob, &key->algorithmParms)))
  		return result;
***************
*** 371,386 ****
  }
  
- /*
- void UnloadBlob_VERSION( UINT16* offset,  BYTE* blob, TCPA_VERSION* out ){
- 
- 	out->major = blob[(*offset)++];
- 	out->minor = blob[(*offset)++];
- 	out->revMajor = blob[(*offset)++];
- 	out->revMinor = blob[(*offset)++];
- 
- 	return;
- }
- */
- 
  TSS_RESULT
  Trspi_UnloadBlob_STORE_PUBKEY(UINT64 *offset, BYTE *blob, TCPA_STORE_PUBKEY *store)
--- 374,377 ----
***************
*** 485,489 ****
  	Trspi_LoadBlob_UINT16(offset, key->keyUsage, blob);
  	Trspi_LoadBlob_KEY_FLAGS(offset, blob, &key->keyFlags);
! 	blob[(*offset)++] = key->authDataUsage;
  	Trspi_LoadBlob_KEY_PARMS(offset, blob, &key->algorithmParms);
  
--- 476,480 ----
  	Trspi_LoadBlob_UINT16(offset, key->keyUsage, blob);
  	Trspi_LoadBlob_KEY_FLAGS(offset, blob, &key->keyFlags);
! 	Trspi_LoadBlob_BYTE(offset, key->authDataUsage, blob);
  	Trspi_LoadBlob_KEY_PARMS(offset, blob, &key->algorithmParms);

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28370/src/trspi

Modified Files:
	trousers.c 
Log Message:
added TPM_COUNTER_VALUE struct un/loading

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** trousers.c	9 Jan 2007 21:17:55 -0000	1.27
--- trousers.c	1 May 2007 18:01:26 -0000	1.28
***************
*** 1421,1422 ****
--- 1421,1438 ----
  }
  
+ void
+ Trspi_UnloadBlob_COUNTER_VALUE(UINT64 *offset, BYTE *blob, TPM_COUNTER_VALUE *ctr)
+ {
+ 	Trspi_UnloadBlob_UINT16(offset, &ctr->tag, blob);
+ 	Trspi_UnloadBlob(offset, 4, blob, (BYTE *)&ctr->label);
+ 	Trspi_UnloadBlob_UINT32(offset, &ctr->counter, blob);
+ }
+ 
+ void
+ Trspi_LoadBlob_COUNTER_VALUE(UINT64 *offset, BYTE *blob, TPM_COUNTER_VALUE *ctr)
+ {
+ 	Trspi_LoadBlob_UINT16(offset, ctr->tag, blob);
+ 	Trspi_LoadBlob(offset, 4, blob, (BYTE *)&ctr->label);
+ 	Trspi_LoadBlob_UINT32(offset, ctr->counter, blob);
+ }
+

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv859/src/trspi

Modified Files:
	trousers.c 
Log Message:
added blob loading functions for UINT64 and CURRENT_TICKS

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** trousers.c	1 May 2007 18:01:26 -0000	1.28
--- trousers.c	3 May 2007 15:53:08 -0000	1.29
***************
*** 114,117 ****
--- 114,125 ----
  
  void
+ Trspi_LoadBlob_UINT64(UINT64 *offset, UINT64 in, BYTE *blob)
+ {
+ 	if (blob)
+ 		UINT64ToArray(in, &blob[*offset]);
+ 	*offset += sizeof(UINT64);
+ }
+ 
+ void
  Trspi_LoadBlob_UINT32(UINT64 *offset, UINT32 in, BYTE *blob)
  {
***************
*** 130,133 ****
--- 138,148 ----
  
  void
+ Trspi_UnloadBlob_UINT64(UINT64 *offset, UINT64 *out, BYTE *blob)
+ {
+ 	*out = Decode_UINT64(&blob[*offset]);
+ 	*offset += sizeof(UINT64);
+ }
+ 
+ void
  Trspi_UnloadBlob_UINT32(UINT64 *offset, UINT32 *out, BYTE *blob)
  {
***************
*** 1437,1438 ****
--- 1452,1461 ----
  }
  
+ void
+ Trspi_UnloadBlob_CURRENT_TICKS(UINT64 *offset, BYTE *blob, TPM_CURRENT_TICKS *ticks)
+ {
+ 	Trspi_UnloadBlob_UINT16(offset, &ticks->tag, blob);
+ 	Trspi_UnloadBlob_UINT64(offset, &ticks->currentTicks, blob);
+ 	Trspi_UnloadBlob_UINT16(offset, &ticks->tickRate, blob);
+ 	Trspi_UnloadBlob(offset, sizeof(TPM_NONCE), blob, (BYTE *)&ticks->tickNonce);
+ }

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv16638/src/trspi

Modified Files:
	trousers.c 
Log Message:
added new Hashing functions

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** trousers.c	3 May 2007 15:53:08 -0000	1.29
--- trousers.c	11 Jul 2007 18:01:50 -0000	1.30
***************
*** 1121,1124 ****
--- 1121,1133 ----
  
  TSS_RESULT
+ Trspi_Hash_UINT64(Trspi_HashCtx *c, UINT64 i)
+ {
+ 	BYTE bytes[sizeof(UINT64)];
+ 
+ 	UINT64ToArray(i, bytes);
+ 	return Trspi_HashUpdate(c, sizeof(UINT64), bytes);
+ }
+ 
+ TSS_RESULT
  Trspi_Hash_BYTE(Trspi_HashCtx *c, BYTE data)
  {
***************
*** 1436,1443 ****
--- 1445,1516 ----
  }
  
+ TSS_RESULT
+ Trspi_Hash_TRANSPORT_AUTH(Trspi_HashCtx *c, TPM_TRANSPORT_AUTH *a)
+ {
+ 	TSS_RESULT result;
+ 
+ 	result = Trspi_Hash_UINT16(c, a->tag);
+ 	result |= Trspi_HashUpdate(c, TPM_SHA1_160_HASH_LEN, a->authData.authdata);
+ 
+ 	return result;
+ }
+ 
+ TSS_RESULT
+ Trspi_Hash_TRANSPORT_LOG_IN(Trspi_HashCtx *c, TPM_TRANSPORT_LOG_IN *l)
+ {
+ 	TSS_RESULT result;
+ 
+ 	result = Trspi_Hash_UINT16(c, l->tag);
+ 	result |= Trspi_Hash_DIGEST(c, l->parameters.digest);
+ 	result |= Trspi_Hash_DIGEST(c, l->pubKeyHash.digest);
+ 
+ 	return result;
+ }
+ 
+ TSS_RESULT
+ Trspi_Hash_TRANSPORT_LOG_OUT(Trspi_HashCtx *c, TPM_TRANSPORT_LOG_OUT *l)
+ {
+ 	TSS_RESULT result;
+ 
+ 	result = Trspi_Hash_UINT16(c, l->tag);
+ 	result |= Trspi_Hash_CURRENT_TICKS(c, &l->currentTicks);
+ 	result |= Trspi_Hash_DIGEST(c, l->parameters.digest);
+ 	result |= Trspi_Hash_UINT32(c, l->locality);
+ 
+ 	return result;
+ }
+ 
+ TSS_RESULT
+ Trspi_Hash_CURRENT_TICKS(Trspi_HashCtx *c, TPM_CURRENT_TICKS *t)
+ {
+ 	TSS_RESULT result;
+ 
+ 	result = Trspi_Hash_UINT16(c, t->tag);
+ 	result |= Trspi_Hash_UINT64(c, t->currentTicks);
+ 	result |= Trspi_Hash_UINT16(c, t->tickRate);
+ 	result |= Trspi_Hash_NONCE(c, t->tickNonce.nonce);
+ 
+ 	return result;
+ }
+ 
+ TSS_RESULT
+ Trspi_Hash_SIGN_INFO(Trspi_HashCtx *c, TPM_SIGN_INFO *s)
+ {
+ 	TSS_RESULT result;
+ 
+ 	result = Trspi_Hash_UINT16(c, s->tag);
+ 	result |= Trspi_HashUpdate(c, 4, s->fixed);
+ 	result |= Trspi_Hash_NONCE(c, s->replay.nonce);
+ 	result |= Trspi_Hash_UINT32(c, s->dataLen);
+ 	result |= Trspi_HashUpdate(c, s->dataLen, s->data);
+ 
+ 	return result;
+ }
+ 
  void
  Trspi_UnloadBlob_COUNTER_VALUE(UINT64 *offset, BYTE *blob, TPM_COUNTER_VALUE *ctr)
  {
  	Trspi_UnloadBlob_UINT16(offset, &ctr->tag, blob);
+ 	/* '4' is hard-coded in the spec */
  	Trspi_UnloadBlob(offset, 4, blob, (BYTE *)&ctr->label);
  	Trspi_UnloadBlob_UINT32(offset, &ctr->counter, blob);
***************
*** 1460,1461 ****
--- 1533,1570 ----
  	Trspi_UnloadBlob(offset, sizeof(TPM_NONCE), blob, (BYTE *)&ticks->tickNonce);
  }
+ 
+ void
+ Trspi_UnloadBlob_TRANSPORT_PUBLIC(UINT64 *offset, BYTE *blob, TPM_TRANSPORT_PUBLIC *t)
+ {
+ 	Trspi_UnloadBlob_UINT16(offset, &t->tag, blob);
+ 	Trspi_UnloadBlob_UINT32(offset, &t->transAttributes, blob);
+ 	Trspi_UnloadBlob_UINT32(offset, &t->algId, blob);
+ 	Trspi_UnloadBlob_UINT16(offset, &t->encScheme, blob);
+ }
+ 
+ void
+ Trspi_LoadBlob_TRANSPORT_PUBLIC(UINT64 *offset, BYTE *blob, TPM_TRANSPORT_PUBLIC *t)
+ {
+ 	Trspi_LoadBlob_UINT16(offset, t->tag, blob);
+ 	Trspi_LoadBlob_UINT32(offset, t->transAttributes, blob);
+ 	Trspi_LoadBlob_UINT32(offset, t->algId, blob);
+ 	Trspi_LoadBlob_UINT16(offset, t->encScheme, blob);
+ }
+ 
+ void
+ Trspi_LoadBlob_TRANSPORT_AUTH(UINT64 *offset, BYTE *blob, TPM_TRANSPORT_AUTH *t)
+ {
+ 	Trspi_LoadBlob_UINT16(offset, t->tag, blob);
+ 	Trspi_LoadBlob(offset, TPM_SHA1_160_HASH_LEN, blob, t->authData.authdata);
+ }
+ 
+ void
+ Trspi_LoadBlob_SIGN_INFO(UINT64 *offset, BYTE *blob, TPM_SIGN_INFO *s)
+ {
+ 	Trspi_LoadBlob_UINT16(offset, s->tag, blob);
+ 	Trspi_LoadBlob(offset, 4, blob, s->fixed);
+ 	Trspi_LoadBlob(offset, TPM_SHA1_160_HASH_LEN, blob, s->replay.nonce);
+ 	Trspi_LoadBlob_UINT32(offset, s->dataLen, blob);
+ 	Trspi_LoadBlob(offset, s->dataLen, blob, s->data);
+ }
+

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11800/src/trspi

Modified Files:
	trousers.c 
Log Message:
added Trspi_LoadBlob_DIGEST

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** trousers.c	11 Jul 2007 18:01:50 -0000	1.30
--- trousers.c	16 Jul 2007 18:55:39 -0000	1.31
***************
*** 32,35 ****
--- 32,41 ----
  
  void
+ Trspi_LoadBlob_DIGEST(UINT64 *offset, BYTE *blob, TCPA_DIGEST digest)
+ {
+ 	Trspi_LoadBlob(offset, TCPA_SHA1_160_HASH_LEN, blob, digest.digest);
+ }
+ 
+ void
  Trspi_UnloadBlob_DIGEST(UINT64 *offset, BYTE *blob, TCPA_DIGEST digest)
  {

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31434/src/trspi

Modified Files:
	trousers.c 
Log Message:
removed spi_internal_types.h in favor of trousers_types.h

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** trousers.c	16 Jul 2007 18:55:39 -0000	1.31
--- trousers.c	17 Jul 2007 18:25:24 -0000	1.32
***************
*** 24,28 ****
  #include "trousers_types.h"
  #include "trousers/trousers.h"
! #include "spi_internal_types.h"
  #include "spi_utils.h"
  #include "capabilities.h"
--- 24,28 ----
  #include "trousers_types.h"
  #include "trousers/trousers.h"
! #include "trousers_types.h"
  #include "spi_utils.h"
  #include "capabilities.h"

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4684/src/trspi

Modified Files:
	trousers.c 
Log Message:
fixed up UnloadBlob_KM_KEYINFO functions

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** trousers.c	17 Jul 2007 18:25:24 -0000	1.32
--- trousers.c	18 Jul 2007 16:19:47 -0000	1.33
***************
*** 423,436 ****
  }
  
! void
  Trspi_UnloadBlob_KM_KEYINFO(UINT64 *offset, BYTE *blob, TSS_KM_KEYINFO *info)
  {
! 	Trspi_UnloadBlob_TSS_VERSION( offset, blob, &info->versionInfo);
! 	Trspi_UnloadBlob_UUID( offset, blob, &info->keyUUID);
! 	Trspi_UnloadBlob_UUID( offset, blob, &info->parentKeyUUID);
! 	Trspi_UnloadBlob_BYTE( offset, &info->bAuthDataUsage, blob);
! 	Trspi_UnloadBlob_BOOL( offset, &info->fIsLoaded, blob);
! 	Trspi_UnloadBlob_UINT32( offset, &info->ulVendorDataLength, blob);
! 	Trspi_UnloadBlob(offset, info->ulVendorDataLength, info->rgbVendorData, blob);
  }
  
--- 423,475 ----
  }
  
! TSS_RESULT
  Trspi_UnloadBlob_KM_KEYINFO(UINT64 *offset, BYTE *blob, TSS_KM_KEYINFO *info)
  {
! 	Trspi_UnloadBlob_TSS_VERSION(offset, blob, &info->versionInfo);
! 	Trspi_UnloadBlob_UUID(offset, blob, &info->keyUUID);
! 	Trspi_UnloadBlob_UUID(offset, blob, &info->parentKeyUUID);
! 	Trspi_UnloadBlob_BYTE(offset, &info->bAuthDataUsage, blob);
! 	Trspi_UnloadBlob_BOOL(offset, &info->fIsLoaded, blob);
! 	Trspi_UnloadBlob_UINT32(offset, &info->ulVendorDataLength, blob);
! 	if (info->ulVendorDataLength > 0){
! 		/* allocate space for vendor data */
! 		info->rgbVendorData = malloc(info->ulVendorDataLength);
! 		if (info->rgbVendorData == NULL) {
! 			LogError("malloc of %u bytes failed.", info->ulVendorDataLength);
! 			return TSPERR(TSS_E_OUTOFMEMORY);
! 		}
! 
! 		Trspi_UnloadBlob(offset, info->ulVendorDataLength, info->rgbVendorData, blob);
! 	} else
! 		info->rgbVendorData = NULL;
! 
! 	return TSS_SUCCESS;
! }
! 
! TSS_RESULT
! Trspi_UnloadBlob_KM_KEYINFO2(UINT64 *offset, BYTE *blob, TSS_KM_KEYINFO2 *info)
! {
! 	Trspi_UnloadBlob_TSS_VERSION(offset, blob, &info->versionInfo);
! 	Trspi_UnloadBlob_UUID(offset, blob, &info->keyUUID);
! 	Trspi_UnloadBlob_UUID(offset, blob, &info->parentKeyUUID);
! 	Trspi_UnloadBlob_BYTE(offset, &info->bAuthDataUsage, blob);
! 	/* Takes data regarding the new 2 fields of TSS_KM_KEYINFO2 */
! 	Trspi_UnloadBlob_UINT32(offset, &info->persistentStorageType, blob);
! 	Trspi_UnloadBlob_UINT32(offset, &info->persistentStorageTypeParent, blob);
! 	Trspi_UnloadBlob_BOOL(offset, &info->fIsLoaded, blob);
! 	Trspi_UnloadBlob_UINT32(offset, &info->ulVendorDataLength, blob);
! 	if (info->ulVendorDataLength > 0) {
! 		/* allocate space for vendor data */
! 		info->rgbVendorData = malloc(info->ulVendorDataLength);
! 		if (info->rgbVendorData == NULL) {
! 			LogError("malloc of %u bytes failed.", info->ulVendorDataLength);
! 			return TSPERR(TSS_E_OUTOFMEMORY);
! 		}
! 
! 		Trspi_UnloadBlob(offset, info->ulVendorDataLength, info->rgbVendorData, blob);
! 	} else
! 		info->rgbVendorData = NULL;
! 
! 	return TSS_SUCCESS;
  }
  
***************
*** 463,467 ****
  		event->rgbPcrValue = malloc(event->ulPcrValueLength);
  		if (event->rgbPcrValue == NULL) {
! 			LogError("malloc of %d bytes failed.", event->ulPcrValueLength);
  			return TSPERR(TSS_E_OUTOFMEMORY);
  		}
--- 502,506 ----
  		event->rgbPcrValue = malloc(event->ulPcrValueLength);
  		if (event->rgbPcrValue == NULL) {
! 			LogError("malloc of %u bytes failed.", event->ulPcrValueLength);
  			return TSPERR(TSS_E_OUTOFMEMORY);
  		}

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv32703/src/trspi

Modified Files:
	trousers.c 
Log Message:
flip the src and dest parameters to the Trspi_UnloadBlob_KM_KEYINFO and Trspi_UnloadBlob_KM_KEYINFO2 functions

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** trousers.c	18 Jul 2007 16:19:47 -0000	1.33
--- trousers.c	19 Jul 2007 15:58:03 -0000	1.34
***************
*** 440,444 ****
  		}
  
! 		Trspi_UnloadBlob(offset, info->ulVendorDataLength, info->rgbVendorData, blob);
  	} else
  		info->rgbVendorData = NULL;
--- 440,444 ----
  		}
  
! 		Trspi_UnloadBlob(offset, info->ulVendorDataLength, blob, info->rgbVendorData);
  	} else
  		info->rgbVendorData = NULL;
***************
*** 467,471 ****
  		}
  
! 		Trspi_UnloadBlob(offset, info->ulVendorDataLength, info->rgbVendorData, blob);
  	} else
  		info->rgbVendorData = NULL;
--- 467,471 ----
  		}
  
! 		Trspi_UnloadBlob(offset, info->ulVendorDataLength, blob, info->rgbVendorData);
  	} else
  		info->rgbVendorData = NULL;

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17955/src/trspi

Modified Files:
	trousers.c 
Log Message:
new TSS 1.2 return code definitions

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** trousers.c	19 Jul 2007 15:58:03 -0000	1.34
--- trousers.c	23 Jul 2007 19:02:28 -0000	1.35
***************
*** 816,867 ****
  	if (TSS_ERROR_LAYER(r) == TSS_LAYER_TPM) {
  		switch (TSS_ERROR_CODE(r)) {
! 			case TCPA_E_AUTHFAIL:		return "Authentication failed";
! 			case TCPA_E_BAD_PARAMETER:	return "Bad Parameter";
! 			case TCPA_E_BADINDEX:		return "Bad index";
! 			case TCPA_E_AUDITFAILURE:	return "Audit failure";
! 			case TCPA_E_CLEAR_DISABLED:	return "Clear has been disabled";
! 			case TCPA_E_DEACTIVATED:	return "TPM is deactivated";
! 			case TCPA_E_DISABLED:		return "TPM is disabled";
! 			case TCPA_E_DISABLED_CMD:	return "Disabled command";
! 			case TCPA_E_FAIL:		return "Operation failed";
! 			case TCPA_E_INACTIVE:		return "Bad ordinal or unknown command";
! 			case TCPA_E_INSTALL_DISABLED:	return "Owner install disabled";
! 			case TCPA_E_INVALID_KEYHANDLE:	return "Invalid keyhandle";
! 			case TCPA_E_KEYNOTFOUND:	return "Key not found";
! 			case TCPA_E_NEED_SELFTEST:	return "Bad encryption scheme or need self test";
! 			case TCPA_E_MIGRATEFAIL:	return "Migration authorization failed";
! 			case TCPA_E_NO_PCR_INFO:	return "PCR information uninterpretable";
! 			case TCPA_E_NOSPACE:		return "No space to load key";
! 			case TCPA_E_NOSRK:		return "No SRK";
! 			case TCPA_E_NOTSEALED_BLOB:	return "Encrypted blob invalid";
! 			case TCPA_E_OWNER_SET:		return "Owner already set";
! 			case TCPA_E_RESOURCES:		return "Insufficient TPM resources";
! 			case TCPA_E_SHORTRANDOM:	return "Random string too short";
! 			case TCPA_E_SIZE:		return "TPM out of space";
! 			case TCPA_E_WRONGPCRVAL:	return "Wrong PCR value";
! 			case TCPA_E_BAD_PARAM_SIZE:	return "Bad input size";
! 			case TCPA_E_SHA_THREAD:		return "No existing SHA-1 thread";
! 			case TCPA_E_SHA_ERROR:		return "SHA-1 error";
! 			case TCPA_E_FAILEDSELFTEST:	return "Self-test failed, TPM shutdown";
! 			case TCPA_E_AUTH2FAIL:		return "Second authorization session failed";
! 			case TCPA_E_BADTAG:		return "Invalid tag";
! 			case TCPA_E_IOERROR:		return "I/O error";
! 			case TCPA_E_ENCRYPT_ERROR:	return "Encryption error";
! 			case TCPA_E_DECRYPT_ERROR:	return "Decryption error";
! 			case TCPA_E_INVALID_AUTHHANDLE:	return "Invalid authorization handle";
! 			case TCPA_E_NO_ENDORSEMENT:	return "No EK";
! 			case TCPA_E_INVALID_KEYUSAGE:	return "Invalid key usage";
! 			case TCPA_E_WRONG_ENTITYTYPE:	return "Invalid entity type";
! 			case TCPA_E_INVALID_POSTINIT:	return "Invalid POST init sequence";
! 			case TCPA_E_INAPPROPRIATE_SIG:	return "Invalid signature format";
! 			case TCPA_E_BAD_KEY_PROPERTY:	return "Unsupported key parameters";
! 			case TCPA_E_BAD_MIGRATION:	return "Invalid migration properties";
! 			case TCPA_E_BAD_SCHEME:		return "Invalid signature or encryption scheme";
! 			case TCPA_E_BAD_DATASIZE:	return "Invalid data size";
! 			case TCPA_E_BAD_MODE:		return "Bad mode parameter";
! 			case TCPA_E_BAD_PRESENCE:	return "Bad physical presence value";
! 			case TCPA_E_BAD_VERSION:	return "Invalid version";
! 			case TCPA_E_RETRY:		return "TPM busy: Retry command at a later time";
! 			default:			return "Unknown error";
  		}
  	} else if (TSS_ERROR_LAYER(r) == TSS_LAYER_TDDL) {
--- 816,921 ----
  	if (TSS_ERROR_LAYER(r) == TSS_LAYER_TPM) {
  		switch (TSS_ERROR_CODE(r)) {
! 			case TPM_E_AUTHFAIL:			return "Authentication failed";
! 			case TPM_E_BAD_PARAMETER:		return "Bad Parameter";
! 			case TPM_E_BADINDEX:			return "Bad memory index";
! 			case TPM_E_AUDITFAILURE:		return "Audit failure";
! 			case TPM_E_CLEAR_DISABLED:		return "Clear has been disabled";
! 			case TPM_E_DEACTIVATED:			return "TPM is deactivated";
! 			case TPM_E_DISABLED:			return "TPM is disabled";
! 			case TPM_E_FAIL:			return "Operation failed";
! 			case TPM_E_BAD_ORDINAL:			return "Ordinal was unknown or inconsistent";
! 			case TPM_E_INSTALL_DISABLED:		return "Owner install disabled";
! 			case TPM_E_INVALID_KEYHANDLE:		return "Invalid keyhandle";
! 			case TPM_E_KEYNOTFOUND:			return "Key not found";
! 			case TPM_E_INAPPROPRIATE_ENC:		return "Bad encryption scheme";
! 			case TPM_E_MIGRATEFAIL:			return "Migration authorization failed";
! 			case TPM_E_INVALID_PCR_INFO:		return "PCR information uninterpretable";
! 			case TPM_E_NOSPACE:			return "No space to load key";
! 			case TPM_E_NOSRK:			return "No SRK";
! 			case TPM_E_NOTSEALED_BLOB:		return "Encrypted blob invalid";
! 			case TPM_E_OWNER_SET:			return "Owner already set";
! 			case TPM_E_RESOURCES:			return "Insufficient TPM resources";
! 			case TPM_E_SHORTRANDOM:			return "Random string too short";
! 			case TPM_E_SIZE:			return "TPM out of space";
! 			case TPM_E_WRONGPCRVAL:			return "Wrong PCR value";
! 			case TPM_E_BAD_PARAM_SIZE:		return "Bad input size";
! 			case TPM_E_SHA_THREAD:			return "No existing SHA-1 thread";
! 			case TPM_E_SHA_ERROR:			return "SHA-1 error";
! 			case TPM_E_FAILEDSELFTEST:		return "Self-test failed, TPM shutdown";
! 			case TPM_E_AUTH2FAIL:			return "Second authorization session failed";
! 			case TPM_E_BADTAG:			return "Invalid tag";
! 			case TPM_E_IOERROR:			return "I/O error";
! 			case TPM_E_ENCRYPT_ERROR:		return "Encryption error";
! 			case TPM_E_DECRYPT_ERROR:		return "Decryption error";
! 			case TPM_E_INVALID_AUTHHANDLE:		return "Invalid authorization handle";
! 			case TPM_E_NO_ENDORSEMENT:		return "No EK";
! 			case TPM_E_INVALID_KEYUSAGE:		return "Invalid key usage";
! 			case TPM_E_WRONG_ENTITYTYPE:		return "Invalid entity type";
! 			case TPM_E_INVALID_POSTINIT:		return "Invalid POST init sequence";
! 			case TPM_E_INAPPROPRIATE_SIG:		return "Invalid signature format";
! 			case TPM_E_BAD_KEY_PROPERTY:		return "Unsupported key parameters";
! 			case TPM_E_BAD_MIGRATION:		return "Invalid migration properties";
! 			case TPM_E_BAD_SCHEME:			return "Invalid signature or encryption scheme";
! 			case TPM_E_BAD_DATASIZE:		return "Invalid data size";
! 			case TPM_E_BAD_MODE:			return "Bad mode parameter";
! 			case TPM_E_BAD_PRESENCE:		return "Bad physical presence value";
! 			case TPM_E_BAD_VERSION:			return "Invalid version";
! 			case TPM_E_NO_WRAP_TRANSPORT:		return "TPM does not allow for wrapped transport sessions";
! 			case TPM_E_AUDITFAIL_UNSUCCESSFUL:	return "TPM audit construction failed and the underlying command was returning a failure code also";
! 			case TPM_E_AUDITFAIL_SUCCESSFUL:	return "TPM audit construction failed and the underlying command was returning success";
! 			case TPM_E_NOTRESETABLE:		return "Attempt to reset a PCR register that does not have the resettable attribute";
! 			case TPM_E_NOTLOCAL:			return "Attempt to reset a PCR register that requires locality and locality modifier not part of command transport";
! 			case TPM_E_BAD_TYPE:			return "Make identity blob not properly typed";
! 			case TPM_E_INVALID_RESOURCE:		return "When saving context identified resource type does not match actual resource";
! 			case TPM_E_NOTFIPS:			return "TPM is attempting to execute a command only available when in FIPS mode";
! 			case TPM_E_INVALID_FAMILY:		return "Command is attempting to use an invalid family ID";
! 			case TPM_E_NO_NV_PERMISSION:		return "Permission to manipulate the NV storage is not available";
! 			case TPM_E_REQUIRES_SIGN:		return "Operation requires a signed command";
! 			case TPM_E_KEY_NOTSUPPORTED:		return "Wrong operation to load an NV key";
! 			case TPM_E_AUTH_CONFLICT:		return "NV_LoadKey blob requires both owner and blob authorization";
! 			case TPM_E_AREA_LOCKED:			return "NV area is locked and not writable";
! 			case TPM_E_BAD_LOCALITY:		return "Locality is incorrect for attempted operation";
! 			case TPM_E_READ_ONLY:			return "NV area is read only and can't be written to";
! 			case TPM_E_PER_NOWRITE:			return "There is no protection on write to NV area";
! 			case TPM_E_FAMILYCOUNT:			return "Family count value does not match";
! 			case TPM_E_WRITE_LOCKED:		return "NV area has already been written to";
! 			case TPM_E_BAD_ATTRIBUTES:		return "NV area attributes conflict";
! 			case TPM_E_INVALID_STRUCTURE:		return "Structure tag and version are invalid or inconsistent";
! 			case TPM_E_KEY_OWNER_CONTROL:		return "Key is under control of TPM Owner and can only be evicted by TPM Owner";
! 			case TPM_E_BAD_COUNTER:			return "Counter handle is incorrect";
! 			case TPM_E_NOT_FULLWRITE:		return "Write is not a complete write of area";
! 			case TPM_E_CONTEXT_GAP:			return "Gap between saved context counts is too large";
! 			case TPM_E_MAXNVWRITES:			return "Maximum number of NV writes without an owner has been exceeded";
! 			case TPM_E_NOOPERATOR:			return "No operator AuthData value is set";
! 			case TPM_E_RESOURCEMISSING:		return "Resource pointed to by context is not loaded";
! 			case TPM_E_DELEGATE_LOCK:		return "Delegate administration is locked";
! 			case TPM_E_DELEGATE_FAMILY:		return "Attempt to manage a family other then delegated family";
! 			case TPM_E_DELEGATE_ADMIN:		return "Delegation table management not enabled";
! 			case TPM_E_TRANSPORT_NOTEXCLUSIVE:	return "A command was executed outside of an exclusive transport session";
! 			case TPM_E_OWNER_CONTROL:		return "Attempt to context save an owner evict-controlled key";
! 			case TPM_E_DAA_RESOURCES:		return "DAA command has no resources available to execute command";
! 			case TPM_E_DAA_INPUT_DATA0:		return "Consistency check on DAA parameter inputData0 has failed";
! 			case TPM_E_DAA_INPUT_DATA1:		return "Consistency check on DAA parameter inputData1 has failed";
! 			case TPM_E_DAA_ISSUER_SETTINGS:		return "Consistency check on DAA_issuerSettings has failed";
! 			case TPM_E_DAA_TPM_SETTINGS:		return "Consistency check on DAA_tpmSpecific has failed";
! 			case TPM_E_DAA_STAGE:			return "Atomic process indicated by submitted DAA command is not expected process";
! 			case TPM_E_DAA_ISSUER_VALIDITY:		return "Issuer's validity check has detected an inconsistency";
! 			case TPM_E_DAA_WRONG_W:			return "Consistency check on w has failed";
! 			case TPM_E_BAD_HANDLE:			return "Handle is incorrect";
! 			case TPM_E_BAD_DELEGATE:		return "Delegation is not correct";
! 			case TPM_E_BADCONTEXT:			return "Context blob is invalid";
! 			case TPM_E_TOOMANYCONTEXTS:		return "Too many contexts held by TPM";
! 			case TPM_E_MA_TICKET_SIGNATURE:		return "Migration authority signature validation failure";
! 			case TPM_E_MA_DESTINATION:		return "Migration destination not authenticated";
! 			case TPM_E_MA_SOURCE:			return "Migration source incorrect";
! 			case TPM_E_MA_AUTHORITY:		return "Incorrect migration authority";
! 			case TPM_E_PERMANENTEK:			return "Attempt to revoke EK but EK is not revocable";
! 			case TPM_E_BAD_SIGNATURE:		return "Bad signature of CMK ticket";
! 			case TPM_E_NOCONTEXTSPACE:		return "No room in context list for additional contexts";
! 			case TPM_E_RETRY:			return "TPM busy: Retry command at a later time";
! 			case TPM_E_NEEDS_SELFTEST:		return "SelfTestFull has not been run";
! 			case TPM_E_DOING_SELFTEST:		return "TPM is currently executing a full selftest";
! 			case TPM_E_DEFEND_LOCK_RUNNING:		return "TPM is defending against dictionary attacks and is in some time-out period";
! 			default:				return "Unknown error";
  		}
  	} else if (TSS_ERROR_LAYER(r) == TSS_LAYER_TDDL) {
***************
*** 884,890 ****
  			case TDDL_E_INSUFFICIENT_BUFFER:	return "Receive buffer too small";
  			case TDDL_E_COMMAND_COMPLETED:		return "Command has already completed";
  			case TDDL_E_ALREADY_CLOSED:		return "Device driver already closed";
  			case TDDL_E_IOERROR:			return "I/O error";
- 			//case TDDL_E_COMMAND_ABORTED:		return "TPM aborted processing of command";
  			default:				return "Unknown";
  		}
--- 938,944 ----
  			case TDDL_E_INSUFFICIENT_BUFFER:	return "Receive buffer too small";
  			case TDDL_E_COMMAND_COMPLETED:		return "Command has already completed";
+ 			case TDDL_E_COMMAND_ABORTED:		return "TPM aborted processing of command";
  			case TDDL_E_ALREADY_CLOSED:		return "Device driver already closed";
  			case TDDL_E_IOERROR:			return "I/O error";
  			default:				return "Unknown";
  		}
***************
*** 906,909 ****
--- 960,964 ----
  			case TCS_E_KM_LOADFAILED:		return "Key load failed: parent key requires authorization";
  			case TCS_E_KEY_CONTEXT_RELOAD:		return "Reload of key context failed";
+ 			case TCS_E_BAD_INDEX:			return "Bad memory index";
  			case TCS_E_INVALID_CONTEXTHANDLE:	return "Invalid context handle";
  			case TCS_E_INVALID_KEYHANDLE:		return "Invalid key handle";

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv12405/src/trspi

Modified Files:
	trousers.c 
Log Message:
added PCR_INFO* and delegate structure functions

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** trousers.c	23 Jul 2007 19:02:28 -0000	1.35
--- trousers.c	13 Aug 2007 20:17:11 -0000	1.36
***************
*** 5,9 ****
   * trousers - An open source TCG Software Stack
   *
!  * (C) Copyright International Business Machines Corp. 2004-2006
   *
   */
--- 5,9 ----
   * trousers - An open source TCG Software Stack
   *
!  * (C) Copyright International Business Machines Corp. 2004-2007
   *
   */
***************
*** 212,215 ****
--- 212,287 ----
  
  TSS_RESULT
+ Trspi_UnloadBlob_PCR_INFO(UINT64 *offset, BYTE *blob, TCPA_PCR_INFO *pcr)
+ {
+ 	TSS_RESULT result;
+ 
+ 	if ((result = Trspi_UnloadBlob_PCR_SELECTION(offset, blob, &pcr->pcrSelection)))
+ 		return result;
+ 	Trspi_UnloadBlob_DIGEST(offset, blob, pcr->digestAtRelease);
+ 	Trspi_UnloadBlob_DIGEST(offset, blob, pcr->digestAtCreation);
+ 
+ 	return TSS_SUCCESS;
+ }
+ 
+ void
+ Trspi_LoadBlob_PCR_INFO(UINT64 *offset, BYTE *blob, TCPA_PCR_INFO *pcr)
+ {
+ 	Trspi_LoadBlob_PCR_SELECTION(offset, blob, &pcr->pcrSelection);
+ 	Trspi_LoadBlob_DIGEST(offset, blob, pcr->digestAtRelease);
+ 	Trspi_LoadBlob_DIGEST(offset, blob, pcr->digestAtCreation);
+ }
+ 
+ TSS_RESULT
+ Trspi_UnloadBlob_PCR_INFO_LONG(UINT64 *offset, BYTE *blob, TPM_PCR_INFO_LONG *pcr)
+ {
+ 	TSS_RESULT result;
+ 
+ 	Trspi_UnloadBlob_UINT16(offset, &pcr->tag, blob);
+ 	Trspi_UnloadBlob_BYTE(offset, &pcr->localityAtCreation, blob);
+ 	Trspi_UnloadBlob_BYTE(offset, &pcr->localityAtRelease, blob);
+ 	if ((result = Trspi_UnloadBlob_PCR_SELECTION(offset, blob, &pcr->creationPCRSelection)))
+ 		return result;
+ 	if ((result = Trspi_UnloadBlob_PCR_SELECTION(offset, blob, &pcr->releasePCRSelection)))
+ 		return result;
+ 	Trspi_UnloadBlob_DIGEST(offset, blob, pcr->digestAtCreation);
+ 	Trspi_UnloadBlob_DIGEST(offset, blob, pcr->digestAtRelease);
+ 
+ 	return TSS_SUCCESS;
+ }
+ 
+ void
+ Trspi_LoadBlob_PCR_INFO_LONG(UINT64 *offset, BYTE *blob, TPM_PCR_INFO_LONG *pcr)
+ {
+ 	Trspi_LoadBlob_UINT16(offset, pcr->tag, blob);
+ 	Trspi_LoadBlob_BYTE(offset, pcr->localityAtCreation, blob);
+ 	Trspi_LoadBlob_BYTE(offset, pcr->localityAtRelease, blob);
+ 	Trspi_LoadBlob_PCR_SELECTION(offset, blob, &pcr->creationPCRSelection);
+ 	Trspi_LoadBlob_PCR_SELECTION(offset, blob, &pcr->releasePCRSelection);
+ 	Trspi_LoadBlob_DIGEST(offset, blob, pcr->digestAtCreation);
+ 	Trspi_LoadBlob_DIGEST(offset, blob, pcr->digestAtRelease);
+ }
+ 
+ TSS_RESULT
+ Trspi_UnloadBlob_PCR_INFO_SHORT(UINT64 *offset, BYTE *blob, TPM_PCR_INFO_SHORT *pcr)
+ {
+ 	TSS_RESULT result;
+ 
+ 	if ((result = Trspi_UnloadBlob_PCR_SELECTION(offset, blob, &pcr->pcrSelection)))
+ 		return result;
+ 	Trspi_UnloadBlob_BYTE(offset, &pcr->localityAtRelease, blob);
+ 	Trspi_UnloadBlob_DIGEST(offset, blob, pcr->digestAtRelease);
+ 
+ 	return TSS_SUCCESS;
+ }
+ 
+ void
+ Trspi_LoadBlob_PCR_INFO_SHORT(UINT64 *offset, BYTE *blob, TPM_PCR_INFO_SHORT *pcr)
+ {
+ 	Trspi_LoadBlob_PCR_SELECTION(offset, blob, &pcr->pcrSelection);
+ 	Trspi_LoadBlob_BYTE(offset, pcr->localityAtRelease, blob);
+ 	Trspi_LoadBlob_DIGEST(offset, blob, pcr->digestAtRelease);
+ }
+ 
+ TSS_RESULT
  Trspi_UnloadBlob_PCR_SELECTION(UINT64 *offset, BYTE *blob, TCPA_PCR_SELECTION *pcr)
  {
***************
*** 1669,1670 ****
--- 1741,2015 ----
  }
  
+ void
+ Trspi_UnloadBlob_TPM_FAMILY_LABEL(UINT64 *offset, BYTE *blob, TPM_FAMILY_LABEL *label)
+ {
+ 	Trspi_UnloadBlob_BYTE(offset, &label->label, blob);
+ }
+ 
+ void
+ Trspi_LoadBlob_TPM_FAMILY_LABEL(UINT64 *offset, BYTE *blob, TPM_FAMILY_LABEL *label)
+ {
+ 	Trspi_LoadBlob_BYTE(offset, label->label, blob);
+ }
+ 
+ void
+ Trspi_UnloadBlob_TPM_FAMILY_TABLE_ENTRY(UINT64 *offset, BYTE *blob, TPM_FAMILY_TABLE_ENTRY *entry)
+ {
+ 	Trspi_UnloadBlob_UINT16(offset, &entry->tag, blob);
+ 	Trspi_UnloadBlob_TPM_FAMILY_LABEL(offset, blob, &entry->label);
+ 	Trspi_UnloadBlob_UINT32(offset, &entry->familyID, blob); 
+ 	Trspi_UnloadBlob_UINT32(offset, &entry->verificationCount, blob); 
+ 	Trspi_UnloadBlob_UINT32(offset, &entry->flags, blob); 
+ }
+ 
+ void
+ Trspi_LoadBlob_TPM_FAMILY_TABLE_ENTRY(UINT64 *offset, BYTE *blob, TPM_FAMILY_TABLE_ENTRY *entry)
+ {
+ 	Trspi_LoadBlob_UINT16(offset, entry->tag, blob);
+ 	Trspi_LoadBlob_TPM_FAMILY_LABEL(offset, blob, &entry->label);
+ 	Trspi_LoadBlob_UINT32(offset, entry->familyID, blob); 
+ 	Trspi_LoadBlob_UINT32(offset, entry->verificationCount, blob); 
+ 	Trspi_LoadBlob_UINT32(offset, entry->flags, blob); 
+ }
+ 
+ void
+ Trspi_UnloadBlob_TPM_DELEGATE_LABEL(UINT64 *offset, BYTE *blob, TPM_DELEGATE_LABEL *label)
+ {
+ 	Trspi_UnloadBlob_BYTE(offset, &label->label, blob);
+ }
+ 
+ void
+ Trspi_LoadBlob_TPM_DELEGATE_LABEL(UINT64 *offset, BYTE *blob, TPM_DELEGATE_LABEL *label)
+ {
+ 	Trspi_LoadBlob_BYTE(offset, label->label, blob);
+ }
+ 
+ void
+ Trspi_UnloadBlob_TPM_DELEGATIONS(UINT64 *offset, BYTE *blob, TPM_DELEGATIONS *delegations)
+ {
+ 	Trspi_UnloadBlob_UINT16(offset, &delegations->tag, blob);
+ 	Trspi_UnloadBlob_UINT32(offset, &delegations->delegateType, blob);
+ 	Trspi_UnloadBlob_UINT32(offset, &delegations->per1, blob);
+ 	Trspi_UnloadBlob_UINT32(offset, &delegations->per2, blob);
+ }
+ 
+ void
+ Trspi_LoadBlob_TPM_DELEGATIONS(UINT64 *offset, BYTE *blob, TPM_DELEGATIONS *delegations)
+ {
+ 	Trspi_LoadBlob_UINT16(offset, delegations->tag, blob);
+ 	Trspi_LoadBlob_UINT32(offset, delegations->delegateType, blob);
+ 	Trspi_LoadBlob_UINT32(offset, delegations->per1, blob);
+ 	Trspi_LoadBlob_UINT32(offset, delegations->per2, blob);
+ }
+ 
+ TSS_RESULT
+ Trspi_UnloadBlob_TPM_DELEGATE_PUBLIC(UINT64 *offset, BYTE *blob, TPM_DELEGATE_PUBLIC *pub)
+ {
+ 	TSS_RESULT result;
+ 
+ 	Trspi_UnloadBlob_UINT16(offset, &pub->tag, blob);
+ 	Trspi_UnloadBlob_TPM_DELEGATE_LABEL(offset, blob, &pub->label);
+ 	if ((result = Trspi_UnloadBlob_PCR_INFO_SHORT(offset, blob, &pub->pcrInfo)))
+ 		return result;
+ 	Trspi_UnloadBlob_TPM_DELEGATIONS(offset, blob, &pub->permissions);
+ 	Trspi_UnloadBlob_UINT32(offset, &pub->familyID, blob);
+ 	Trspi_UnloadBlob_UINT32(offset, &pub->verificationCount, blob);
+ 	
+ 	return TSS_SUCCESS;
+ }
+ 
+ void
+ Trspi_LoadBlob_TPM_DELEGATE_PUBLIC(UINT64 *offset, BYTE *blob, TPM_DELEGATE_PUBLIC *pub)
+ {
+ 	Trspi_LoadBlob_UINT16(offset, pub->tag, blob);
+ 	Trspi_LoadBlob_TPM_DELEGATE_LABEL(offset, blob, &pub->label);
+ 	Trspi_LoadBlob_PCR_INFO_SHORT(offset, blob, &pub->pcrInfo);
+ 	Trspi_LoadBlob_TPM_DELEGATIONS(offset, blob, &pub->permissions);
+ 	Trspi_LoadBlob_UINT32(offset, pub->familyID, blob);
+ 	Trspi_LoadBlob_UINT32(offset, pub->verificationCount, blob);
+ }
+ 
+ TSS_RESULT
+ Trspi_UnloadBlob_TPM_DELEGATE_OWNER_BLOB(UINT64 *offset, BYTE *blob, TPM_DELEGATE_OWNER_BLOB *owner)
+ {
+ 	TSS_RESULT result;
+ 
+ 	Trspi_UnloadBlob_UINT16(offset, &owner->tag, blob);
+ 	if ((result = Trspi_UnloadBlob_TPM_DELEGATE_PUBLIC(offset, blob, &owner->pub)))
+ 		return result;
+ 	Trspi_UnloadBlob_DIGEST(offset, blob, owner->integrityDigest);
+ 	Trspi_UnloadBlob_UINT32(offset, &owner->additionalSize, blob);
+ 	if (owner->additionalSize > 0) {
+ 		owner->additionalArea = malloc(owner->additionalSize);
+ 		if (owner->additionalArea == NULL) {
+ 			LogError("malloc of %u bytes failed.", owner->additionalSize);
+ 			free(owner->pub.pcrInfo.pcrSelection.pcrSelect);
+ 			return TSPERR(TSS_E_OUTOFMEMORY);
+ 		}
+ 		Trspi_UnloadBlob(offset, owner->additionalSize, blob, owner->additionalArea);
+ 	}
+ 	Trspi_UnloadBlob_UINT32(offset, &owner->sensitiveSize, blob);
+ 	if (owner->sensitiveSize > 0) {
+ 		owner->sensitiveArea = malloc(owner->sensitiveSize);
+ 		if (owner->sensitiveArea == NULL) {
+ 			LogError("malloc of %u bytes failed.", owner->sensitiveSize);
+ 			free(owner->pub.pcrInfo.pcrSelection.pcrSelect);
+ 			free(owner->additionalArea);
+ 			return TSPERR(TSS_E_OUTOFMEMORY);
+ 		}
+ 		Trspi_UnloadBlob(offset, owner->sensitiveSize, blob, owner->sensitiveArea);
+ 	}
+ 
+ 	return TSS_SUCCESS;
+ }
+ 
+ void
+ Trspi_LoadBlob_TPM_DELEGATE_OWNER_BLOB(UINT64 *offset, BYTE *blob, TPM_DELEGATE_OWNER_BLOB *owner)
+ {
+ 	Trspi_LoadBlob_UINT16(offset, owner->tag, blob);
+ 	Trspi_LoadBlob_TPM_DELEGATE_PUBLIC(offset, blob, &owner->pub);
+ 	Trspi_LoadBlob_DIGEST(offset, blob, owner->integrityDigest);
+ 	Trspi_LoadBlob_UINT32(offset, owner->additionalSize, blob);
+ 	Trspi_LoadBlob(offset, owner->additionalSize, blob, owner->additionalArea);
+ 	Trspi_LoadBlob_UINT32(offset, owner->sensitiveSize, blob);
+ 	Trspi_LoadBlob(offset, owner->sensitiveSize, blob, owner->sensitiveArea);
+ }
+ 
+ TSS_RESULT
+ Trspi_UnloadBlob_TPM_DELEGATE_KEY_BLOB(UINT64 *offset, BYTE *blob, TPM_DELEGATE_KEY_BLOB *key)
+ {
+ 	TSS_RESULT result;
+ 
+ 	Trspi_UnloadBlob_UINT16(offset, &key->tag, blob);
+ 	if ((result = Trspi_UnloadBlob_TPM_DELEGATE_PUBLIC(offset, blob, &key->pub)))
+ 		return result;
+ 	Trspi_UnloadBlob_DIGEST(offset, blob, key->integrityDigest);
+ 	Trspi_UnloadBlob_DIGEST(offset, blob, key->pubKeyDigest);
+ 	Trspi_UnloadBlob_UINT32(offset, &key->additionalSize, blob);
+ 	if (key->additionalSize > 0) {
+ 		key->additionalArea = malloc(key->additionalSize);
+ 		if (key->additionalArea == NULL) {
+ 			LogError("malloc of %u bytes failed.", key->additionalSize);
+ 			free(key->pub.pcrInfo.pcrSelection.pcrSelect);
+ 			return TSPERR(TSS_E_OUTOFMEMORY);
+ 		}
+ 		Trspi_UnloadBlob(offset, key->additionalSize, blob, key->additionalArea);
+ 	}
+ 	Trspi_UnloadBlob_UINT32(offset, &key->sensitiveSize, blob);
+ 	if (key->sensitiveSize > 0) {
+ 		key->sensitiveArea = malloc(key->sensitiveSize);
+ 		if (key->sensitiveArea == NULL) {
+ 			LogError("malloc of %u bytes failed.", key->sensitiveSize);
+ 			free(key->pub.pcrInfo.pcrSelection.pcrSelect);
+ 			free(key->additionalArea);
+ 			return TSPERR(TSS_E_OUTOFMEMORY);
+ 		}
+ 		Trspi_UnloadBlob(offset, key->sensitiveSize, blob, key->sensitiveArea);
+ 	}
+ 
+ 	return TSS_SUCCESS;
+ }
+ 
+ void
+ Trspi_LoadBlob_TPM_DELEGATE_KEY_BLOB(UINT64 *offset, BYTE *blob, TPM_DELEGATE_KEY_BLOB *key)
+ {
+ 	Trspi_LoadBlob_UINT16(offset, key->tag, blob);
+ 	Trspi_LoadBlob_TPM_DELEGATE_PUBLIC(offset, blob, &key->pub);
+ 	Trspi_LoadBlob_DIGEST(offset, blob, key->integrityDigest);
+ 	Trspi_LoadBlob_DIGEST(offset, blob, key->pubKeyDigest);
+ 	Trspi_LoadBlob_UINT32(offset, key->additionalSize, blob);
+ 	Trspi_LoadBlob(offset, key->additionalSize, blob, key->additionalArea);
+ 	Trspi_LoadBlob_UINT32(offset, key->sensitiveSize, blob);
+ 	Trspi_LoadBlob(offset, key->sensitiveSize, blob, key->sensitiveArea);
+ }
+ 
+ void
+ Trspi_UnloadBlob_TSS_FAMILY_TABLE_ENTRY(UINT64 *offset, BYTE *blob, TSS_FAMILY_TABLE_ENTRY *entry)
+ {
+ 	Trspi_UnloadBlob_UINT32(offset, &entry->familyID, blob);
+ 	Trspi_UnloadBlob_BYTE(offset, &entry->label, blob);
+ 	Trspi_UnloadBlob_UINT32(offset, &entry->verificationCount, blob); 
+ 	Trspi_UnloadBlob_BOOL(offset, &entry->enabled, blob); 
+ 	Trspi_UnloadBlob_BOOL(offset, &entry->locked, blob); 
+ }
+ 
+ void
+ Trspi_LoadBlob_TSS_FAMILY_TABLE_ENTRY(UINT64 *offset, BYTE *blob, TSS_FAMILY_TABLE_ENTRY *entry)
+ {
+ 	Trspi_LoadBlob_UINT32(offset, entry->familyID, blob);
+ 	Trspi_LoadBlob_BYTE(offset, entry->label, blob);
+ 	Trspi_LoadBlob_UINT32(offset, entry->verificationCount, blob); 
+ 	Trspi_LoadBlob_BOOL(offset, entry->enabled, blob); 
+ 	Trspi_LoadBlob_BOOL(offset, entry->locked, blob); 
+ }
+ 
+ TSS_RESULT
+ Trspi_UnloadBlob_TSS_PCR_INFO_SHORT(UINT64 *offset, BYTE *blob, TSS_PCR_INFO_SHORT *pcr)
+ {
+ 	Trspi_UnloadBlob_UINT32(offset, &pcr->sizeOfSelect, blob);
+ 	if (pcr->sizeOfSelect > 0) {
+ 		pcr->selection = malloc(pcr->sizeOfSelect);
+ 		if (pcr->selection == NULL) {
+ 			LogError("malloc of %u bytes failed.", pcr->sizeOfSelect);
+ 			return TSPERR(TSS_E_OUTOFMEMORY);
+ 		}
+ 		Trspi_UnloadBlob(offset, pcr->sizeOfSelect, blob, pcr->selection);
+ 	} else {
+ 		pcr->selection = NULL;
+ 	}
+ 	Trspi_UnloadBlob_BYTE(offset, &pcr->localityAtRelease, blob);
+ 	Trspi_UnloadBlob_UINT32(offset, &pcr->sizeOfDigestAtRelease, blob);
+ 	if (pcr->sizeOfDigestAtRelease > 0) {
+ 		pcr->digestAtRelease = malloc(pcr->sizeOfDigestAtRelease);
+ 		if (pcr->digestAtRelease == NULL) {
+ 			LogError("malloc of %u bytes failed.", pcr->sizeOfDigestAtRelease);
+ 			free(pcr->selection);
+ 			return TSPERR(TSS_E_OUTOFMEMORY);
+ 		}
+ 		Trspi_UnloadBlob(offset, pcr->sizeOfDigestAtRelease, blob, pcr->digestAtRelease);
+ 	} else {
+ 		pcr->digestAtRelease = NULL;
+ 	}
+ 
+ 	return TSS_SUCCESS;
+ }
+ 
+ void
+ Trspi_LoadBlob_TSS_PCR_INFO_SHORT(UINT64 *offset, BYTE *blob, TSS_PCR_INFO_SHORT *pcr)
+ {
+ 	Trspi_LoadBlob_UINT32(offset, pcr->sizeOfSelect, blob);
+ 	Trspi_LoadBlob(offset, pcr->sizeOfSelect, blob, pcr->selection);
+ 	Trspi_LoadBlob_BYTE(offset, pcr->localityAtRelease, blob);
+ 	Trspi_LoadBlob_UINT32(offset, pcr->sizeOfDigestAtRelease, blob);
+ 	Trspi_LoadBlob(offset, pcr->sizeOfDigestAtRelease, blob, pcr->digestAtRelease);
+ }
+ 
+ TSS_RESULT
+ Trspi_UnloadBlob_TSS_DELEGATION_TABLE_ENTRY(UINT64 *offset, BYTE *blob, TSS_DELEGATION_TABLE_ENTRY *entry)
+ {
+ 	TSS_RESULT result;
+ 
+ 	Trspi_UnloadBlob_UINT32(offset, &entry->tableIndex, blob);
+ 	Trspi_UnloadBlob_BYTE(offset, &entry->label, blob);
+ 	if ((result = Trspi_UnloadBlob_TSS_PCR_INFO_SHORT(offset, blob, &entry->pcrInfo)))
+ 		return result;
+ 	Trspi_UnloadBlob_UINT32(offset, &entry->per1, blob);
+ 	Trspi_UnloadBlob_UINT32(offset, &entry->per2, blob);
+ 	Trspi_UnloadBlob_UINT32(offset, &entry->familyID, blob);
+ 	Trspi_UnloadBlob_UINT32(offset, &entry->verificationCount, blob); 
+ 
+ 	return TSS_SUCCESS;
+ }
+ 
+ void
+ Trspi_LoadBlob_TSS_DELEGATION_TABLE_ENTRY(UINT64 *offset, BYTE *blob, TSS_DELEGATION_TABLE_ENTRY *entry)
+ {
+ 	Trspi_LoadBlob_UINT32(offset, entry->tableIndex, blob);
+ 	Trspi_LoadBlob_BYTE(offset, entry->label, blob);
+ 	Trspi_LoadBlob_TSS_PCR_INFO_SHORT(offset, blob, &entry->pcrInfo);
+ 	Trspi_LoadBlob_UINT32(offset, entry->per1, blob);
+ 	Trspi_LoadBlob_UINT32(offset, entry->per2, blob);
+ 	Trspi_LoadBlob_UINT32(offset, entry->familyID, blob);
+ 	Trspi_LoadBlob_UINT32(offset, entry->verificationCount, blob); 
+ }
+

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv28052/src/trspi

Modified Files:
	trousers.c 
Log Message:
updates to blob loading functions

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** trousers.c	13 Aug 2007 20:17:11 -0000	1.36
--- trousers.c	16 Aug 2007 15:46:26 -0000	1.37
***************
*** 32,44 ****
  
  void
! Trspi_LoadBlob_DIGEST(UINT64 *offset, BYTE *blob, TCPA_DIGEST digest)
  {
! 	Trspi_LoadBlob(offset, TCPA_SHA1_160_HASH_LEN, blob, digest.digest);
  }
  
  void
! Trspi_UnloadBlob_DIGEST(UINT64 *offset, BYTE *blob, TCPA_DIGEST digest)
  {
! 	Trspi_UnloadBlob(offset, TCPA_SHA1_160_HASH_LEN, blob, digest.digest);
  }
  
--- 32,66 ----
  
  void
! Trspi_UnloadBlob_NONCE(UINT64 *offset, BYTE *blob, TPM_NONCE *n)
  {
! 	if (!n) {
! 		offset += TPM_SHA1_160_HASH_LEN;
! 		return;
! 	}
! 
! 	Trspi_UnloadBlob(offset, TPM_SHA1_160_HASH_LEN, blob, n->nonce);
  }
  
  void
! Trspi_LoadBlob_NONCE(UINT64 *offset, BYTE *blob, TPM_NONCE *n)
  {
! 	Trspi_LoadBlob(offset, TPM_SHA1_160_HASH_LEN, blob, n->nonce);
! }
! 
! void
! Trspi_LoadBlob_DIGEST(UINT64 *offset, BYTE *blob, TPM_DIGEST *digest)
! {
! 	Trspi_LoadBlob(offset, TPM_SHA1_160_HASH_LEN, blob, digest->digest);
! }
! 
! void
! Trspi_UnloadBlob_DIGEST(UINT64 *offset, BYTE *blob, TPM_DIGEST *digest)
! {
! 	if (!digest) {
! 		offset += TPM_SHA1_160_HASH_LEN;
! 		return;
! 	}
! 
! 	Trspi_UnloadBlob(offset, TPM_SHA1_160_HASH_LEN, blob, digest->digest);
  }
  
***************
*** 100,104 ****
  Trspi_UnloadBlob_BYTE(UINT64 *offset, BYTE *dataOut, BYTE *blob)
  {
! 	*dataOut = blob[*offset];
  	(*offset)++;
  }
--- 122,127 ----
  Trspi_UnloadBlob_BYTE(UINT64 *offset, BYTE *dataOut, BYTE *blob)
  {
! 	if (dataOut)
! 		*dataOut = blob[*offset];
  	(*offset)++;
  }
***************
*** 115,119 ****
  Trspi_UnloadBlob_BOOL(UINT64 *offset, TSS_BOOL *dataOut, BYTE *blob)
  {
! 	*dataOut = blob[*offset];
  	(*offset)++;
  }
--- 138,143 ----
  Trspi_UnloadBlob_BOOL(UINT64 *offset, TSS_BOOL *dataOut, BYTE *blob)
  {
! 	if (dataOut)
! 		*dataOut = blob[*offset];
  	(*offset)++;
  }
***************
*** 153,157 ****
  Trspi_UnloadBlob_UINT32(UINT64 *offset, UINT32 *out, BYTE *blob)
  {
! 	*out = Decode_UINT32(&blob[*offset]);
  	*offset += sizeof(UINT32);
  }
--- 177,182 ----
  Trspi_UnloadBlob_UINT32(UINT64 *offset, UINT32 *out, BYTE *blob)
  {
! 	if (out)
! 		*out = Decode_UINT32(&blob[*offset]);
  	*offset += sizeof(UINT32);
  }
***************
*** 160,164 ****
  Trspi_UnloadBlob_UINT16(UINT64 *offset, UINT16 *out, BYTE *blob)
  {
! 	*out = Decode_UINT16(&blob[*offset]);
  	*offset += sizeof(UINT16);
  }
--- 185,190 ----
  Trspi_UnloadBlob_UINT16(UINT64 *offset, UINT16 *out, BYTE *blob)
  {
! 	if (out)
! 		*out = Decode_UINT16(&blob[*offset]);
  	*offset += sizeof(UINT16);
  }
***************
*** 218,223 ****
  	if ((result = Trspi_UnloadBlob_PCR_SELECTION(offset, blob, &pcr->pcrSelection)))
  		return result;
! 	Trspi_UnloadBlob_DIGEST(offset, blob, pcr->digestAtRelease);
! 	Trspi_UnloadBlob_DIGEST(offset, blob, pcr->digestAtCreation);
  
  	return TSS_SUCCESS;
--- 244,249 ----
  	if ((result = Trspi_UnloadBlob_PCR_SELECTION(offset, blob, &pcr->pcrSelection)))
  		return result;
! 	Trspi_UnloadBlob_DIGEST(offset, blob, &pcr->digestAtRelease);
! 	Trspi_UnloadBlob_DIGEST(offset, blob, &pcr->digestAtCreation);
  
  	return TSS_SUCCESS;
***************
*** 228,233 ****
  {
  	Trspi_LoadBlob_PCR_SELECTION(offset, blob, &pcr->pcrSelection);
! 	Trspi_LoadBlob_DIGEST(offset, blob, pcr->digestAtRelease);
! 	Trspi_LoadBlob_DIGEST(offset, blob, pcr->digestAtCreation);
  }
  
--- 254,259 ----
  {
  	Trspi_LoadBlob_PCR_SELECTION(offset, blob, &pcr->pcrSelection);
! 	Trspi_LoadBlob_DIGEST(offset, blob, &pcr->digestAtRelease);
! 	Trspi_LoadBlob_DIGEST(offset, blob, &pcr->digestAtCreation);
  }
  
***************
*** 244,249 ****
  	if ((result = Trspi_UnloadBlob_PCR_SELECTION(offset, blob, &pcr->releasePCRSelection)))
  		return result;
! 	Trspi_UnloadBlob_DIGEST(offset, blob, pcr->digestAtCreation);
! 	Trspi_UnloadBlob_DIGEST(offset, blob, pcr->digestAtRelease);
  
  	return TSS_SUCCESS;
--- 270,275 ----
  	if ((result = Trspi_UnloadBlob_PCR_SELECTION(offset, blob, &pcr->releasePCRSelection)))
  		return result;
! 	Trspi_UnloadBlob_DIGEST(offset, blob, &pcr->digestAtCreation);
! 	Trspi_UnloadBlob_DIGEST(offset, blob, &pcr->digestAtRelease);
  
  	return TSS_SUCCESS;
***************
*** 258,263 ****
  	Trspi_LoadBlob_PCR_SELECTION(offset, blob, &pcr->creationPCRSelection);
  	Trspi_LoadBlob_PCR_SELECTION(offset, blob, &pcr->releasePCRSelection);
! 	Trspi_LoadBlob_DIGEST(offset, blob, pcr->digestAtCreation);
! 	Trspi_LoadBlob_DIGEST(offset, blob, pcr->digestAtRelease);
  }
  
--- 284,289 ----
  	Trspi_LoadBlob_PCR_SELECTION(offset, blob, &pcr->creationPCRSelection);
  	Trspi_LoadBlob_PCR_SELECTION(offset, blob, &pcr->releasePCRSelection);
! 	Trspi_LoadBlob_DIGEST(offset, blob, &pcr->digestAtCreation);
! 	Trspi_LoadBlob_DIGEST(offset, blob, &pcr->digestAtRelease);
  }
  
***************
*** 270,274 ****
  		return result;
  	Trspi_UnloadBlob_BYTE(offset, &pcr->localityAtRelease, blob);
! 	Trspi_UnloadBlob_DIGEST(offset, blob, pcr->digestAtRelease);
  
  	return TSS_SUCCESS;
--- 296,300 ----
  		return result;
  	Trspi_UnloadBlob_BYTE(offset, &pcr->localityAtRelease, blob);
! 	Trspi_UnloadBlob_DIGEST(offset, blob, &pcr->digestAtRelease);
  
  	return TSS_SUCCESS;
***************
*** 280,284 ****
  	Trspi_LoadBlob_PCR_SELECTION(offset, blob, &pcr->pcrSelection);
  	Trspi_LoadBlob_BYTE(offset, pcr->localityAtRelease, blob);
! 	Trspi_LoadBlob_DIGEST(offset, blob, pcr->digestAtRelease);
  }
  
--- 306,310 ----
  	Trspi_LoadBlob_PCR_SELECTION(offset, blob, &pcr->pcrSelection);
  	Trspi_LoadBlob_BYTE(offset, pcr->localityAtRelease, blob);
! 	Trspi_LoadBlob_DIGEST(offset, blob, &pcr->digestAtRelease);
  }
  
***************
*** 406,409 ****
--- 432,448 ----
  Trspi_UnloadBlob_KEY_PARMS(UINT64 *offset, BYTE *blob, TCPA_KEY_PARMS *keyParms)
  {
+ 	if (!keyParms) {
+ 		UINT32 parmSize;
+ 
+ 		Trspi_UnloadBlob_UINT32(offset, NULL, blob);
+ 		Trspi_UnloadBlob_UINT16(offset, NULL, blob);
+ 		Trspi_UnloadBlob_UINT16(offset, NULL, blob);
+ 		Trspi_UnloadBlob_UINT32(offset, &parmSize, blob);
+ 
+ 		offset += parmSize;
+ 
+ 		return TSS_SUCCESS;
+ 	}
+ 
  	Trspi_UnloadBlob_UINT32(offset, &keyParms->algorithmID, blob);
  	Trspi_UnloadBlob_UINT16(offset, &keyParms->encScheme, blob);
***************
*** 414,418 ****
  		keyParms->parms = malloc(keyParms->parmSize);
  		if (keyParms->parms == NULL) {
! 			LogError("malloc of %d bytes failed.", keyParms->parmSize);
  			return TSPERR(TSS_E_OUTOFMEMORY);
  		}
--- 453,457 ----
  		keyParms->parms = malloc(keyParms->parmSize);
  		if (keyParms->parms == NULL) {
! 			LogError("malloc of %u bytes failed.", keyParms->parmSize);
  			return TSPERR(TSS_E_OUTOFMEMORY);
  		}
***************
*** 1741,1744 ****
--- 1780,1821 ----
  }
  
+ TSS_RESULT
+ Trspi_UnloadBlob_CERTIFY_INFO(UINT64 *offset, BYTE *blob, TPM_CERTIFY_INFO *c)
+ {
+ 	TSS_RESULT result;
+ 
+ 	if (!c) {
+ 		UINT32 pcrInfoSize;
+ 
+ 		Trspi_UnloadBlob_VERSION(offset, blob, NULL);
+ 		Trspi_UnloadBlob_UINT16(offset, NULL, blob);
+ 		Trspi_UnloadBlob_UINT32(offset, NULL, blob);
+ 		Trspi_UnloadBlob_BYTE(offset, NULL, blob);
+ 		Trspi_UnloadBlob_KEY_PARMS(offset, blob, NULL);
+ 		Trspi_UnloadBlob_DIGEST(offset, blob, NULL);
+ 		Trspi_UnloadBlob_NONCE(offset, blob, NULL);
+ 		Trspi_UnloadBlob_BOOL(offset, NULL, blob);
+ 		Trspi_UnloadBlob_UINT32(offset, &pcrInfoSize, blob);
+ 
+ 		offset += pcrInfoSize;
+ 
+ 		return TSS_SUCCESS;
+ 	}
+ 
+ 	Trspi_UnloadBlob_VERSION(offset, blob, &c->version);
+ 	Trspi_UnloadBlob_UINT16(offset, &c->keyUsage, blob);
+ 	Trspi_UnloadBlob_UINT32(offset, &c->keyFlags, blob);
+ 	Trspi_UnloadBlob_BYTE(offset, &c->authDataUsage, blob);
+ 	if ((result = Trspi_UnloadBlob_KEY_PARMS(offset, blob, &c->algorithmParms)))
+ 		return result;
+ 	Trspi_UnloadBlob_DIGEST(offset, blob, &c->pubkeyDigest);
+ 	Trspi_UnloadBlob_NONCE(offset, blob, &c->data);
+ 	Trspi_UnloadBlob_BOOL(offset, &c->parentPCRStatus, blob);
+ 	Trspi_UnloadBlob_UINT32(offset, &c->PCRInfoSize, blob);
+ 	Trspi_UnloadBlob(offset, c->PCRInfoSize, blob, c->PCRInfo);
+ 
+ 	return TSS_SUCCESS;
+ }
+ 
  void
  Trspi_UnloadBlob_TPM_FAMILY_LABEL(UINT64 *offset, BYTE *blob, TPM_FAMILY_LABEL *label)
***************
*** 1758,1764 ****
  	Trspi_UnloadBlob_UINT16(offset, &entry->tag, blob);
  	Trspi_UnloadBlob_TPM_FAMILY_LABEL(offset, blob, &entry->label);
! 	Trspi_UnloadBlob_UINT32(offset, &entry->familyID, blob); 
! 	Trspi_UnloadBlob_UINT32(offset, &entry->verificationCount, blob); 
! 	Trspi_UnloadBlob_UINT32(offset, &entry->flags, blob); 
  }
  
--- 1835,1841 ----
  	Trspi_UnloadBlob_UINT16(offset, &entry->tag, blob);
  	Trspi_UnloadBlob_TPM_FAMILY_LABEL(offset, blob, &entry->label);
! 	Trspi_UnloadBlob_UINT32(offset, &entry->familyID, blob);
! 	Trspi_UnloadBlob_UINT32(offset, &entry->verificationCount, blob);
! 	Trspi_UnloadBlob_UINT32(offset, &entry->flags, blob);
  }
  
***************
*** 1768,1774 ****
  	Trspi_LoadBlob_UINT16(offset, entry->tag, blob);
  	Trspi_LoadBlob_TPM_FAMILY_LABEL(offset, blob, &entry->label);
! 	Trspi_LoadBlob_UINT32(offset, entry->familyID, blob); 
! 	Trspi_LoadBlob_UINT32(offset, entry->verificationCount, blob); 
! 	Trspi_LoadBlob_UINT32(offset, entry->flags, blob); 
  }
  
--- 1845,1851 ----
  	Trspi_LoadBlob_UINT16(offset, entry->tag, blob);
  	Trspi_LoadBlob_TPM_FAMILY_LABEL(offset, blob, &entry->label);
! 	Trspi_LoadBlob_UINT32(offset, entry->familyID, blob);
! 	Trspi_LoadBlob_UINT32(offset, entry->verificationCount, blob);
! 	Trspi_LoadBlob_UINT32(offset, entry->flags, blob);
  }
  
***************
*** 1815,1819 ****
  	Trspi_UnloadBlob_UINT32(offset, &pub->familyID, blob);
  	Trspi_UnloadBlob_UINT32(offset, &pub->verificationCount, blob);
! 	
  	return TSS_SUCCESS;
  }
--- 1892,1896 ----
  	Trspi_UnloadBlob_UINT32(offset, &pub->familyID, blob);
  	Trspi_UnloadBlob_UINT32(offset, &pub->verificationCount, blob);
! 
  	return TSS_SUCCESS;
  }
***************
*** 1838,1842 ****
  	if ((result = Trspi_UnloadBlob_TPM_DELEGATE_PUBLIC(offset, blob, &owner->pub)))
  		return result;
! 	Trspi_UnloadBlob_DIGEST(offset, blob, owner->integrityDigest);
  	Trspi_UnloadBlob_UINT32(offset, &owner->additionalSize, blob);
  	if (owner->additionalSize > 0) {
--- 1915,1919 ----
  	if ((result = Trspi_UnloadBlob_TPM_DELEGATE_PUBLIC(offset, blob, &owner->pub)))
  		return result;
! 	Trspi_UnloadBlob_DIGEST(offset, blob, &owner->integrityDigest);
  	Trspi_UnloadBlob_UINT32(offset, &owner->additionalSize, blob);
  	if (owner->additionalSize > 0) {
***************
*** 1869,1873 ****
  	Trspi_LoadBlob_UINT16(offset, owner->tag, blob);
  	Trspi_LoadBlob_TPM_DELEGATE_PUBLIC(offset, blob, &owner->pub);
! 	Trspi_LoadBlob_DIGEST(offset, blob, owner->integrityDigest);
  	Trspi_LoadBlob_UINT32(offset, owner->additionalSize, blob);
  	Trspi_LoadBlob(offset, owner->additionalSize, blob, owner->additionalArea);
--- 1946,1950 ----
  	Trspi_LoadBlob_UINT16(offset, owner->tag, blob);
  	Trspi_LoadBlob_TPM_DELEGATE_PUBLIC(offset, blob, &owner->pub);
! 	Trspi_LoadBlob_DIGEST(offset, blob, &owner->integrityDigest);
  	Trspi_LoadBlob_UINT32(offset, owner->additionalSize, blob);
  	Trspi_LoadBlob(offset, owner->additionalSize, blob, owner->additionalArea);
***************
*** 1884,1889 ****
  	if ((result = Trspi_UnloadBlob_TPM_DELEGATE_PUBLIC(offset, blob, &key->pub)))
  		return result;
! 	Trspi_UnloadBlob_DIGEST(offset, blob, key->integrityDigest);
! 	Trspi_UnloadBlob_DIGEST(offset, blob, key->pubKeyDigest);
  	Trspi_UnloadBlob_UINT32(offset, &key->additionalSize, blob);
  	if (key->additionalSize > 0) {
--- 1961,1966 ----
  	if ((result = Trspi_UnloadBlob_TPM_DELEGATE_PUBLIC(offset, blob, &key->pub)))
  		return result;
! 	Trspi_UnloadBlob_DIGEST(offset, blob, &key->integrityDigest);
! 	Trspi_UnloadBlob_DIGEST(offset, blob, &key->pubKeyDigest);
  	Trspi_UnloadBlob_UINT32(offset, &key->additionalSize, blob);
  	if (key->additionalSize > 0) {
***************
*** 1916,1921 ****
  	Trspi_LoadBlob_UINT16(offset, key->tag, blob);
  	Trspi_LoadBlob_TPM_DELEGATE_PUBLIC(offset, blob, &key->pub);
! 	Trspi_LoadBlob_DIGEST(offset, blob, key->integrityDigest);
! 	Trspi_LoadBlob_DIGEST(offset, blob, key->pubKeyDigest);
  	Trspi_LoadBlob_UINT32(offset, key->additionalSize, blob);
  	Trspi_LoadBlob(offset, key->additionalSize, blob, key->additionalArea);
--- 1993,1998 ----
  	Trspi_LoadBlob_UINT16(offset, key->tag, blob);
  	Trspi_LoadBlob_TPM_DELEGATE_PUBLIC(offset, blob, &key->pub);
! 	Trspi_LoadBlob_DIGEST(offset, blob, &key->integrityDigest);
! 	Trspi_LoadBlob_DIGEST(offset, blob, &key->pubKeyDigest);
  	Trspi_LoadBlob_UINT32(offset, key->additionalSize, blob);
  	Trspi_LoadBlob(offset, key->additionalSize, blob, key->additionalArea);
***************
*** 1929,1935 ****
  	Trspi_UnloadBlob_UINT32(offset, &entry->familyID, blob);
  	Trspi_UnloadBlob_BYTE(offset, &entry->label, blob);
! 	Trspi_UnloadBlob_UINT32(offset, &entry->verificationCount, blob); 
! 	Trspi_UnloadBlob_BOOL(offset, &entry->enabled, blob); 
! 	Trspi_UnloadBlob_BOOL(offset, &entry->locked, blob); 
  }
  
--- 2006,2012 ----
  	Trspi_UnloadBlob_UINT32(offset, &entry->familyID, blob);
  	Trspi_UnloadBlob_BYTE(offset, &entry->label, blob);
! 	Trspi_UnloadBlob_UINT32(offset, &entry->verificationCount, blob);
! 	Trspi_UnloadBlob_BOOL(offset, &entry->enabled, blob);
! 	Trspi_UnloadBlob_BOOL(offset, &entry->locked, blob);
  }
  
***************
*** 1939,1945 ****
  	Trspi_LoadBlob_UINT32(offset, entry->familyID, blob);
  	Trspi_LoadBlob_BYTE(offset, entry->label, blob);
! 	Trspi_LoadBlob_UINT32(offset, entry->verificationCount, blob); 
! 	Trspi_LoadBlob_BOOL(offset, entry->enabled, blob); 
! 	Trspi_LoadBlob_BOOL(offset, entry->locked, blob); 
  }
  
--- 2016,2022 ----
  	Trspi_LoadBlob_UINT32(offset, entry->familyID, blob);
  	Trspi_LoadBlob_BYTE(offset, entry->label, blob);
! 	Trspi_LoadBlob_UINT32(offset, entry->verificationCount, blob);
! 	Trspi_LoadBlob_BOOL(offset, entry->enabled, blob);
! 	Trspi_LoadBlob_BOOL(offset, entry->locked, blob);
  }
  
***************
*** 1986,1990 ****
  
  TSS_RESULT
! Trspi_UnloadBlob_TSS_DELEGATION_TABLE_ENTRY(UINT64 *offset, BYTE *blob, TSS_DELEGATION_TABLE_ENTRY *entry)
  {
  	TSS_RESULT result;
--- 2063,2068 ----
  
  TSS_RESULT
! Trspi_UnloadBlob_TSS_DELEGATION_TABLE_ENTRY(UINT64 *offset, BYTE *blob,
! 					    TSS_DELEGATION_TABLE_ENTRY *entry)
  {
  	TSS_RESULT result;
***************
*** 1997,2001 ****
  	Trspi_UnloadBlob_UINT32(offset, &entry->per2, blob);
  	Trspi_UnloadBlob_UINT32(offset, &entry->familyID, blob);
! 	Trspi_UnloadBlob_UINT32(offset, &entry->verificationCount, blob); 
  
  	return TSS_SUCCESS;
--- 2075,2079 ----
  	Trspi_UnloadBlob_UINT32(offset, &entry->per2, blob);
  	Trspi_UnloadBlob_UINT32(offset, &entry->familyID, blob);
! 	Trspi_UnloadBlob_UINT32(offset, &entry->verificationCount, blob);
  
  	return TSS_SUCCESS;
***************
*** 2003,2007 ****
  
  void
! Trspi_LoadBlob_TSS_DELEGATION_TABLE_ENTRY(UINT64 *offset, BYTE *blob, TSS_DELEGATION_TABLE_ENTRY *entry)
  {
  	Trspi_LoadBlob_UINT32(offset, entry->tableIndex, blob);
--- 2081,2086 ----
  
  void
! Trspi_LoadBlob_TSS_DELEGATION_TABLE_ENTRY(UINT64 *offset, BYTE *blob,
! 					  TSS_DELEGATION_TABLE_ENTRY *entry)
  {
  	Trspi_LoadBlob_UINT32(offset, entry->tableIndex, blob);
***************
*** 2011,2015 ****
  	Trspi_LoadBlob_UINT32(offset, entry->per2, blob);
  	Trspi_LoadBlob_UINT32(offset, entry->familyID, blob);
! 	Trspi_LoadBlob_UINT32(offset, entry->verificationCount, blob); 
  }
- 
--- 2090,2093 ----
  	Trspi_LoadBlob_UINT32(offset, entry->per2, blob);
  	Trspi_LoadBlob_UINT32(offset, entry->familyID, blob);
! 	Trspi_LoadBlob_UINT32(offset, entry->verificationCount, blob);
  }

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv23166/src/trspi

Modified Files:
	trousers.c 
Log Message:
cast TPM_BOOL to TSS_BOOL

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** trousers.c	16 Aug 2007 15:46:26 -0000	1.37
--- trousers.c	16 Aug 2007 20:34:57 -0000	1.38
***************
*** 1811,1815 ****
  	Trspi_UnloadBlob_DIGEST(offset, blob, &c->pubkeyDigest);
  	Trspi_UnloadBlob_NONCE(offset, blob, &c->data);
! 	Trspi_UnloadBlob_BOOL(offset, &c->parentPCRStatus, blob);
  	Trspi_UnloadBlob_UINT32(offset, &c->PCRInfoSize, blob);
  	Trspi_UnloadBlob(offset, c->PCRInfoSize, blob, c->PCRInfo);
--- 1811,1815 ----
  	Trspi_UnloadBlob_DIGEST(offset, blob, &c->pubkeyDigest);
  	Trspi_UnloadBlob_NONCE(offset, blob, &c->data);
! 	Trspi_UnloadBlob_BOOL(offset, (TSS_BOOL *)&c->parentPCRStatus, blob);
  	Trspi_UnloadBlob_UINT32(offset, &c->PCRInfoSize, blob);
  	Trspi_UnloadBlob(offset, c->PCRInfoSize, blob, c->PCRInfo);

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv7606/src/trspi

Modified Files:
	trousers.c 
Log Message:
added routines to load/unload a KEY12 struct

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** trousers.c	16 Aug 2007 20:34:57 -0000	1.38
--- trousers.c	17 Aug 2007 21:14:34 -0000	1.39
***************
*** 343,346 ****
--- 343,362 ----
  
  void
+ Trspi_LoadBlob_KEY12(UINT64 *offset, BYTE *blob, TPM_KEY12 *key)
+ {
+ 	Trspi_LoadBlob_UINT16(offset, key->tag, blob);
+ 	Trspi_LoadBlob_UINT16(offset, key->fill, blob);
+ 	Trspi_LoadBlob_UINT16(offset, key->keyUsage, blob);
+ 	Trspi_LoadBlob_KEY_FLAGS(offset, blob, &key->keyFlags);
+ 	Trspi_LoadBlob_BYTE(offset, key->authDataUsage, blob);
+ 	Trspi_LoadBlob_KEY_PARMS(offset, blob, &key->algorithmParms);
+ 	Trspi_LoadBlob_UINT32(offset, key->PCRInfoSize, blob);
+ 	Trspi_LoadBlob(offset, key->PCRInfoSize, blob, key->PCRInfo);
+ 	Trspi_LoadBlob_STORE_PUBKEY(offset, blob, &key->pubKey);
+ 	Trspi_LoadBlob_UINT32(offset, key->encSize, blob);
+ 	Trspi_LoadBlob(offset, key->encSize, blob, key->encData);
+ }
+ 
+ void
  Trspi_LoadBlob_KEY(UINT64 *offset, BYTE *blob, TCPA_KEY *key)
  {
***************
*** 465,468 ****
--- 481,527 ----
  
  TSS_RESULT
+ Trspi_UnloadBlob_KEY12(UINT64 *offset, BYTE *blob, TPM_KEY12 *key)
+ {
+ 	TSS_RESULT result;
+ 
+ 	Trspi_UnloadBlob_UINT16(offset, &key->tag, blob);
+ 	Trspi_UnloadBlob_UINT16(offset, &key->fill, blob);
+ 	Trspi_UnloadBlob_UINT16(offset, &key->keyUsage, blob);
+ 	Trspi_UnloadBlob_KEY_FLAGS(offset, blob, &key->keyFlags);
+ 	Trspi_UnloadBlob_BYTE(offset, &key->authDataUsage, blob);
+ 	if ((result = Trspi_UnloadBlob_KEY_PARMS(offset, (BYTE *) blob, &key->algorithmParms)))
+ 		return result;
+ 	Trspi_UnloadBlob_UINT32(offset, &key->PCRInfoSize, blob);
+ 
+ 	if (key->PCRInfoSize > 0) {
+ 		key->PCRInfo = malloc(key->PCRInfoSize);
+ 		if (key->PCRInfo == NULL) {
+ 			LogError("malloc of %d bytes failed.", key->PCRInfoSize);
+ 			return TSPERR(TSS_E_OUTOFMEMORY);
+ 		}
+ 		Trspi_UnloadBlob(offset, key->PCRInfoSize, blob, key->PCRInfo);
+ 	} else {
+ 		key->PCRInfo = NULL;
+ 	}
+ 
+ 	if ((result = Trspi_UnloadBlob_STORE_PUBKEY(offset, blob, &key->pubKey)))
+ 		return result;
+ 	Trspi_UnloadBlob_UINT32(offset, &key->encSize, blob);
+ 
+ 	if (key->encSize > 0) {
+ 		key->encData = malloc(key->encSize);
+ 		if (key->encData == NULL) {
+ 			LogError("malloc of %d bytes failed.", key->encSize);
+ 			return TSPERR(TSS_E_OUTOFMEMORY);
+ 		}
+ 		Trspi_UnloadBlob(offset, key->encSize, blob, key->encData);
+ 	} else {
+ 		key->encData = NULL;
+ 	}
+ 
+ 	return result;
+ }
+ 
+ TSS_RESULT
  Trspi_UnloadBlob_KEY(UINT64 *offset, BYTE *blob, TCPA_KEY *key)
  {

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv3297/src/trspi

Modified Files:
	trousers.c 
Log Message:
allow UnloadBlob_VERSION's to take a NULL out param

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** trousers.c	17 Aug 2007 21:14:34 -0000	1.39
--- trousers.c	17 Aug 2007 22:14:45 -0000	1.40
***************
*** 222,225 ****
--- 222,234 ----
  Trspi_UnloadBlob_TCPA_VERSION(UINT64 *offset, BYTE *blob, TCPA_VERSION *out)
  {
+ 	if (!out) {
+ 		Trspi_UnloadBlob_BYTE(offset, NULL, blob);
+ 		Trspi_UnloadBlob_BYTE(offset, NULL, blob);
+ 		Trspi_UnloadBlob_BYTE(offset, NULL, blob);
+ 		Trspi_UnloadBlob_BYTE(offset, NULL, blob);
+ 
+ 		return;
+ 	}
+ 
  	Trspi_UnloadBlob_BYTE(offset, &out->major, blob);
  	Trspi_UnloadBlob_BYTE(offset, &out->minor, blob);
***************
*** 587,590 ****
--- 596,608 ----
  Trspi_UnloadBlob_VERSION(UINT64 *offset, BYTE *blob, TCPA_VERSION *out)
  {
+ 	if (!out) {
+ 		Trspi_UnloadBlob_BYTE(offset, NULL, blob);
+ 		Trspi_UnloadBlob_BYTE(offset, NULL, blob);
+ 		Trspi_UnloadBlob_BYTE(offset, NULL, blob);
+ 		Trspi_UnloadBlob_BYTE(offset, NULL, blob);
+ 
+ 		return;
+ 	}
+ 
  	Trspi_UnloadBlob_BYTE(offset, &out->major, blob);
  	Trspi_UnloadBlob_BYTE(offset, &out->minor, blob);

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv16400/src/trspi

Modified Files:
	trousers.c 
Log Message:
fixes to dereferencing offset

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** trousers.c	17 Aug 2007 22:14:45 -0000	1.40
--- trousers.c	17 Aug 2007 22:43:12 -0000	1.41
***************
*** 35,39 ****
  {
  	if (!n) {
! 		offset += TPM_SHA1_160_HASH_LEN;
  		return;
  	}
--- 35,39 ----
  {
  	if (!n) {
! 		(*offset) += TPM_SHA1_160_HASH_LEN;
  		return;
  	}
***************
*** 58,62 ****
  {
  	if (!digest) {
! 		offset += TPM_SHA1_160_HASH_LEN;
  		return;
  	}
--- 58,62 ----
  {
  	if (!digest) {
! 		(*offset) += TPM_SHA1_160_HASH_LEN;
  		return;
  	}
***************
*** 99,103 ****
  	if (to)
  		memcpy(&to[(*offset)], from, size);
! 	*offset += size;
  }
  
--- 99,103 ----
  	if (to)
  		memcpy(&to[(*offset)], from, size);
! 	(*offset) += size;
  }
  
***************
*** 108,112 ****
  		return;
  	memcpy(to, &from[*offset], size);
! 	*offset += size;
  }
  
--- 108,112 ----
  		return;
  	memcpy(to, &from[*offset], size);
! 	(*offset) += size;
  }
  
***************
*** 148,152 ****
  	if (blob)
  		UINT64ToArray(in, &blob[*offset]);
! 	*offset += sizeof(UINT64);
  }
  
--- 148,152 ----
  	if (blob)
  		UINT64ToArray(in, &blob[*offset]);
! 	(*offset) += sizeof(UINT64);
  }
  
***************
*** 156,160 ****
  	if (blob)
  		UINT32ToArray(in, &blob[*offset]);
! 	*offset += sizeof(UINT32);
  }
  
--- 156,160 ----
  	if (blob)
  		UINT32ToArray(in, &blob[*offset]);
! 	(*offset) += sizeof(UINT32);
  }
  
***************
*** 164,168 ****
  	if (blob)
  		UINT16ToArray(in, &blob[*offset]);
! 	*offset += sizeof(UINT16);
  }
  
--- 164,168 ----
  	if (blob)
  		UINT16ToArray(in, &blob[*offset]);
! 	(*offset) += sizeof(UINT16);
  }
  
***************
*** 171,175 ****
  {
  	*out = Decode_UINT64(&blob[*offset]);
! 	*offset += sizeof(UINT64);
  }
  
--- 171,175 ----
  {
  	*out = Decode_UINT64(&blob[*offset]);
! 	(*offset) += sizeof(UINT64);
  }
  
***************
*** 179,183 ****
  	if (out)
  		*out = Decode_UINT32(&blob[*offset]);
! 	*offset += sizeof(UINT32);
  }
  
--- 179,183 ----
  	if (out)
  		*out = Decode_UINT32(&blob[*offset]);
! 	(*offset) += sizeof(UINT32);
  }
  
***************
*** 187,191 ****
  	if (out)
  		*out = Decode_UINT16(&blob[*offset]);
! 	*offset += sizeof(UINT16);
  }
  
--- 187,191 ----
  	if (out)
  		*out = Decode_UINT16(&blob[*offset]);
! 	(*offset) += sizeof(UINT16);
  }
  
***************
*** 465,469 ****
  		Trspi_UnloadBlob_UINT32(offset, &parmSize, blob);
  
! 		offset += parmSize;
  
  		return TSS_SUCCESS;
--- 465,469 ----
  		Trspi_UnloadBlob_UINT32(offset, &parmSize, blob);
  
! 		(*offset) += parmSize;
  
  		return TSS_SUCCESS;
***************
*** 1875,1879 ****
  		Trspi_UnloadBlob_UINT32(offset, &pcrInfoSize, blob);
  
! 		offset += pcrInfoSize;
  
  		return TSS_SUCCESS;
--- 1875,1879 ----
  		Trspi_UnloadBlob_UINT32(offset, &pcrInfoSize, blob);
  
! 		(*offset) += pcrInfoSize;
  
  		return TSS_SUCCESS;

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv25897/src/trspi

Modified Files:
	trousers.c 
Log Message:
Support for TCPA_KEY/TPM_KEY and TPM_KEY12


Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** trousers.c	17 Aug 2007 22:43:12 -0000	1.41
--- trousers.c	22 Aug 2007 18:21:05 -0000	1.42
***************
*** 385,397 ****
  Trspi_LoadBlob_KEY_FLAGS(UINT64 *offset, BYTE *blob, TCPA_KEY_FLAGS *flags)
  {
! 	UINT32 tempFlag = 0;
! 
! 	if (*flags & migratable)
! 		tempFlag |= TSS_FLAG_MIGRATABLE;
! 	if (*flags & redirection)
! 		tempFlag |= TSS_FLAG_REDIRECTION;
! 	if (*flags & volatileKey)
! 		tempFlag |= TSS_FLAG_VOLATILE;
! 	Trspi_LoadBlob_UINT32(offset, tempFlag, blob);
  }
  
--- 385,389 ----
  Trspi_LoadBlob_KEY_FLAGS(UINT64 *offset, BYTE *blob, TCPA_KEY_FLAGS *flags)
  {
! 	Trspi_LoadBlob_UINT32(offset, *flags, blob);
  }
  
***************
*** 399,413 ****
  Trspi_UnloadBlob_KEY_FLAGS(UINT64 *offset, BYTE *blob, TCPA_KEY_FLAGS *flags)
  {
! 	UINT32 tempFlag = 0;
! 	memset(flags, 0x00, sizeof(TCPA_KEY_FLAGS));
! 
! 	Trspi_UnloadBlob_UINT32(offset, &tempFlag, blob);
! 
! 	if (tempFlag & TSS_FLAG_REDIRECTION)
! 		*flags |= redirection;
! 	if (tempFlag & TSS_FLAG_MIGRATABLE)
! 		*flags |= migratable;
! 	if (tempFlag & TSS_FLAG_VOLATILE)
! 		*flags |= volatileKey;
  }
  
--- 391,395 ----
  Trspi_UnloadBlob_KEY_FLAGS(UINT64 *offset, BYTE *blob, TCPA_KEY_FLAGS *flags)
  {
! 	Trspi_UnloadBlob_UINT32(offset, flags, blob);
  }
  
***************
*** 716,722 ****
  
  /* loads a blob with the info needed to hash when creating the private key area
!  * of a TCPA_KEY from an external source
   */
  void
  Trspi_LoadBlob_PRIVKEY_DIGEST(UINT64 *offset, BYTE *blob, TCPA_KEY *key)
  {
--- 698,723 ----
  
  /* loads a blob with the info needed to hash when creating the private key area
!  * of a TPM_KEY(12) from an external source
   */
  void
+ Trspi_LoadBlob_PRIVKEY_DIGEST12(UINT64 *offset, BYTE *blob, TPM_KEY12 *key)
+ {
+ 	Trspi_LoadBlob_UINT16(offset, key->tag, blob);
+ 	Trspi_LoadBlob_UINT16(offset, key->fill, blob);
+ 	Trspi_LoadBlob_UINT16(offset, key->keyUsage, blob);
+ 	Trspi_LoadBlob_KEY_FLAGS(offset, blob, &key->keyFlags);
+ 	Trspi_LoadBlob_BYTE(offset, key->authDataUsage, blob);
+ 	Trspi_LoadBlob_KEY_PARMS(offset, blob, &key->algorithmParms);
+ 
+ 	Trspi_LoadBlob_UINT32(offset, key->PCRInfoSize, blob);
+ 	/* exclude pcrInfo when PCRInfoSize is 0 as spec'd in TPM 1.1b spec p.71 */
+ 	if (key->PCRInfoSize != 0)
+ 		Trspi_LoadBlob(offset, key->PCRInfoSize, blob, key->PCRInfo);
+ 
+ 	Trspi_LoadBlob_STORE_PUBKEY(offset, blob, &key->pubKey);
+ 	/* exclude encSize, encData as spec'd in TPM 1.1b spec p.71 */
+ }
+ 
+ void
  Trspi_LoadBlob_PRIVKEY_DIGEST(UINT64 *offset, BYTE *blob, TCPA_KEY *key)
  {
***************
*** 1569,1581 ****
  Trspi_Hash_KEY_FLAGS(Trspi_HashCtx *c, TCPA_KEY_FLAGS *flags)
  {
! 	UINT32 tempFlag = 0;
  
! 	if (*flags & migratable)
! 		tempFlag |= TSS_FLAG_MIGRATABLE;
! 	if (*flags & redirection)
! 		tempFlag |= TSS_FLAG_REDIRECTION;
! 	if (*flags & volatileKey)
! 		tempFlag |= TSS_FLAG_VOLATILE;
! 	return Trspi_Hash_UINT32(c, tempFlag);
  }
  
--- 1570,1594 ----
  Trspi_Hash_KEY_FLAGS(Trspi_HashCtx *c, TCPA_KEY_FLAGS *flags)
  {
! 	return Trspi_Hash_UINT32(c, *flags);
! }
  
! TSS_RESULT
! Trspi_Hash_KEY12(Trspi_HashCtx *c, TPM_KEY12 *key)
! {
! 	TSS_RESULT result;
! 
! 	result = Trspi_Hash_UINT16(c, key->tag);
! 	result |= Trspi_Hash_UINT16(c, key->fill);
! 	result |= Trspi_Hash_UINT16(c, key->keyUsage);
! 	result |= Trspi_Hash_KEY_FLAGS(c, &key->keyFlags);
! 	result |= Trspi_Hash_BYTE(c, key->authDataUsage);
! 	result |= Trspi_Hash_KEY_PARMS(c, &key->algorithmParms);
! 	result |= Trspi_Hash_UINT32(c, key->PCRInfoSize);
! 	result |= Trspi_HashUpdate(c, key->PCRInfoSize, key->PCRInfo);
! 	result |= Trspi_Hash_STORE_PUBKEY(c, &key->pubKey);
! 	result |= Trspi_Hash_UINT32(c, key->encSize);
! 	result |= Trspi_HashUpdate(c, key->encSize, key->encData);
! 
! 	return result;
  }
  
***************
*** 1636,1639 ****
--- 1649,1675 ----
  
  TSS_RESULT
+ Trspi_Hash_PRIVKEY_DIGEST12(Trspi_HashCtx *c, TPM_KEY12 *key)
+ {
+ 	TSS_RESULT result;
+ 
+ 	result = Trspi_Hash_UINT16(c, key->tag);
+ 	result |= Trspi_Hash_UINT16(c, key->fill);
+ 	result |= Trspi_Hash_UINT16(c, key->keyUsage);
+ 	result |= Trspi_Hash_KEY_FLAGS(c, &key->keyFlags);
+ 	result |= Trspi_Hash_BYTE(c, key->authDataUsage);
+ 	result |= Trspi_Hash_KEY_PARMS(c, &key->algorithmParms);
+ 
+ 	result |= Trspi_Hash_UINT32(c, key->PCRInfoSize);
+ 	/* exclude pcrInfo when PCRInfoSize is 0 as spec'd in TPM 1.1b spec p.71 */
+ 	if (key->PCRInfoSize != 0)
+ 		result |= Trspi_HashUpdate(c, key->PCRInfoSize, key->PCRInfo);
+ 
+ 	Trspi_Hash_STORE_PUBKEY(c, &key->pubKey);
+ 	/* exclude encSize, encData as spec'd in TPM 1.1b spec p.71 */
+ 
+ 	return result;
+ }
+ 
+ TSS_RESULT
  Trspi_Hash_PRIVKEY_DIGEST(Trspi_HashCtx *c, TCPA_KEY *key)
  {

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv5395/src/trspi

Modified Files:
	trousers.c 
Log Message:
added NULL cases to several blob functions

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** trousers.c	22 Aug 2007 18:21:05 -0000	1.42
--- trousers.c	23 Aug 2007 22:30:46 -0000	1.43
***************
*** 107,111 ****
  	if (size <= 0)
  		return;
! 	memcpy(to, &from[*offset], size);
  	(*offset) += size;
  }
--- 107,112 ----
  	if (size <= 0)
  		return;
! 	if (to)
! 		memcpy(to, &from[*offset], size);
  	(*offset) += size;
  }
***************
*** 170,174 ****
  Trspi_UnloadBlob_UINT64(UINT64 *offset, UINT64 *out, BYTE *blob)
  {
! 	*out = Decode_UINT64(&blob[*offset]);
  	(*offset) += sizeof(UINT64);
  }
--- 171,176 ----
  Trspi_UnloadBlob_UINT64(UINT64 *offset, UINT64 *out, BYTE *blob)
  {
! 	if (out)
! 		*out = Decode_UINT64(&blob[*offset]);
  	(*offset) += sizeof(UINT64);
  }
***************
*** 272,275 ****
--- 274,289 ----
  	TSS_RESULT result;
  
+ 	if (!pcr) {
+ 		Trspi_UnloadBlob_UINT16(offset, NULL, blob);
+ 		Trspi_UnloadBlob_BYTE(offset, NULL, blob);
+ 		Trspi_UnloadBlob_BYTE(offset, NULL, blob);
+ 		Trspi_UnloadBlob_PCR_SELECTION(offset, blob, NULL);
+ 		Trspi_UnloadBlob_PCR_SELECTION(offset, blob, NULL);
+ 		Trspi_UnloadBlob_DIGEST(offset, blob, NULL);
+ 		Trspi_UnloadBlob_DIGEST(offset, blob, NULL);
+ 
+ 		return TSS_SUCCESS;
+ 	}
+ 
  	Trspi_UnloadBlob_UINT16(offset, &pcr->tag, blob);
  	Trspi_UnloadBlob_BYTE(offset, &pcr->localityAtCreation, blob);
***************
*** 302,305 ****
--- 316,327 ----
  	TSS_RESULT result;
  
+ 	if (!pcr) {
+ 		Trspi_UnloadBlob_PCR_SELECTION(offset, blob, NULL);
+ 		Trspi_UnloadBlob_BYTE(offset, NULL, blob);
+ 		Trspi_UnloadBlob_DIGEST(offset, blob, NULL);
+ 
+ 		return TSS_SUCCESS;
+ 	}
+ 
  	if ((result = Trspi_UnloadBlob_PCR_SELECTION(offset, blob, &pcr->pcrSelection)))
  		return result;
***************
*** 323,326 ****
--- 345,357 ----
  	UINT16 i;
  
+ 	if (!pcr) {
+ 		UINT16 sizeOfSelect;
+ 
+ 		Trspi_UnloadBlob_UINT16(offset, &sizeOfSelect, blob);
+ 		(*offset) += sizeOfSelect;
+ 
+ 		return TSS_SUCCESS;
+ 	}
+ 
  	Trspi_UnloadBlob_UINT16(offset, &pcr->sizeOfSelect, blob);
  
***************
*** 1852,1855 ****
--- 1883,1895 ----
  Trspi_UnloadBlob_CURRENT_TICKS(UINT64 *offset, BYTE *blob, TPM_CURRENT_TICKS *ticks)
  {
+ 	if (!ticks) {
+ 		Trspi_UnloadBlob_UINT16(offset, NULL, blob);
+ 		Trspi_UnloadBlob_UINT64(offset, NULL, blob);
+ 		Trspi_UnloadBlob_UINT16(offset, NULL, blob);
+ 		Trspi_UnloadBlob(offset, sizeof(TPM_NONCE), blob, NULL);
+ 
+ 		return;
+ 	}
+ 
  	Trspi_UnloadBlob_UINT16(offset, &ticks->tag, blob);
  	Trspi_UnloadBlob_UINT64(offset, &ticks->currentTicks, blob);
***************
*** 2205,2206 ****
--- 2245,2276 ----
  	Trspi_LoadBlob_UINT32(offset, entry->verificationCount, blob);
  }
+ 
+ TSS_RESULT
+ Trspi_UnloadBlob_PCR_COMPOSITE(UINT64 *offset, BYTE *blob, TCPA_PCR_COMPOSITE *out)
+ {
+ 	TSS_RESULT result;
+ 
+ 	if (!out) {
+ 		UINT32 valueSize;
+ 
+ 		Trspi_UnloadBlob_PCR_SELECTION(offset, blob, NULL);
+ 		Trspi_UnloadBlob_UINT32(offset, &valueSize, blob);
+ 		(*offset) += valueSize;
+ 
+ 		return TSS_SUCCESS;
+ 	}
+ 
+ 	if ((result = Trspi_UnloadBlob_PCR_SELECTION(offset, blob, &out->select)))
+ 		return result;
+ 
+ 	Trspi_UnloadBlob_UINT32(offset, &out->valueSize, blob);
+ 	out->pcrValue = malloc(out->valueSize);
+ 	if (out->pcrValue == NULL) {
+ 		LogError("malloc of %u bytes failed.", out->valueSize);
+ 		return TSPERR(TSS_E_OUTOFMEMORY);
+ 	}
+ 	Trspi_UnloadBlob(offset, out->valueSize, blob, (BYTE *)out->pcrValue);
+ 
+ 	return TSS_SUCCESS;
+ }
+

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26728/src/trspi

Modified Files:
	trousers.c 
Log Message:
added NULL case to UnloadBlob_COUNTER_VALUE

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** trousers.c	23 Aug 2007 22:30:46 -0000	1.43
--- trousers.c	24 Aug 2007 23:33:36 -0000	1.44
***************
*** 1866,1869 ****
--- 1866,1878 ----
  Trspi_UnloadBlob_COUNTER_VALUE(UINT64 *offset, BYTE *blob, TPM_COUNTER_VALUE *ctr)
  {
+ 	if (!ctr) {
+ 		Trspi_UnloadBlob_UINT16(offset, NULL, blob);
+ 		/* '4' is hard-coded in the spec */
+ 		Trspi_UnloadBlob(offset, 4, blob, NULL);
+ 		Trspi_UnloadBlob_UINT32(offset, NULL, blob);
+ 
+ 		return;
+ 	}
+ 
  	Trspi_UnloadBlob_UINT16(offset, &ctr->tag, blob);
  	/* '4' is hard-coded in the spec */

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv13836/src/trspi

Modified Files:
	trousers.c 
Log Message:
added CMK code

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** trousers.c	24 Aug 2007 23:33:36 -0000	1.44
--- trousers.c	27 Aug 2007 20:50:50 -0000	1.45
***************
*** 2284,2285 ****
--- 2284,2341 ----
  }
  
+ TSS_RESULT
+ Trspi_UnloadBlob_MIGRATIONKEYAUTH(UINT64 *offset, BYTE *blob, TPM_MIGRATIONKEYAUTH *migAuth)
+ {
+ 	TSS_RESULT result;
+ 
+ 	if ((result = Trspi_UnloadBlob_PUBKEY(offset, blob, &migAuth->migrationKey)))
+ 		return result;
+ 
+ 	Trspi_UnloadBlob_UINT16(offset, &migAuth->migrationScheme, blob);
+ 	Trspi_UnloadBlob_DIGEST(offset, blob, &migAuth->digest);
+ 
+ 	return TSS_SUCCESS;
+ }
+ 
+ void
+ Trspi_LoadBlob_MIGRATIONKEYAUTH(UINT64 *offset, BYTE *blob, TPM_MIGRATIONKEYAUTH *migAuth)
+ {
+ 	Trspi_LoadBlob_PUBKEY(offset, blob, &migAuth->migrationKey);
+ 	Trspi_LoadBlob_UINT16(offset, migAuth->migrationScheme, blob);
+ 	Trspi_LoadBlob_DIGEST(offset, blob, &migAuth->digest);
+ }
+ 
+ void
+ Trspi_LoadBlob_MSA_COMPOSITE(UINT64 *offset, BYTE *blob, TPM_MSA_COMPOSITE *msaComp)
+ {
+ 	UINT32 i;
+ 
+ 	Trspi_LoadBlob_UINT32(offset, msaComp->MSAlist, blob);
+ 	for (i = 0; i < msaComp->MSAlist; i++)
+ 		Trspi_LoadBlob_DIGEST(offset, blob, &msaComp->migAuthDigest[i]); 
+ }
+ 
+ void
+ Trspi_LoadBlob_CMK_AUTH(UINT64 *offset, BYTE *blob, TPM_CMK_AUTH *cmkAuth)
+ {
+ 	Trspi_LoadBlob_DIGEST(offset, blob, &cmkAuth->migrationAuthorityDigest);
+ 	Trspi_LoadBlob_DIGEST(offset, blob, &cmkAuth->destinationKeyDigest);
+ 	Trspi_LoadBlob_DIGEST(offset, blob, &cmkAuth->sourceKeyDigest);
+ }
+ 
+ TSS_RESULT
+ Trspi_Hash_MSA_COMPOSITE(Trspi_HashCtx *c, TPM_MSA_COMPOSITE *m)
+ {
+ 	UINT32 i;
+ 	TPM_DIGEST *digest;
+ 	TSS_RESULT result;
+ 
+ 	result = Trspi_Hash_UINT32(c, m->MSAlist);
+ 	digest = m->migAuthDigest;
+ 	for (i = 0; i < m->MSAlist; i++) {
+ 		result |= Trspi_Hash_DIGEST(c, digest->digest);
+ 		digest++;
+ 	}
+ 
+ 	return result;
+ }

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4771/src/trspi

Modified Files:
	trousers.c 
Log Message:
update _KEY* funcs to take NULL pointers for size calculations

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** trousers.c	27 Aug 2007 20:50:50 -0000	1.45
--- trousers.c	28 Aug 2007 20:48:29 -0000	1.46
***************
*** 507,510 ****
--- 507,528 ----
  	TSS_RESULT result;
  
+ 	if (!key) {
+ 		UINT32 PCRInfoSize, encSize;
+ 
+ 		Trspi_UnloadBlob_UINT16(offset, NULL, blob);
+ 		Trspi_UnloadBlob_UINT16(offset, NULL, blob);
+ 		Trspi_UnloadBlob_UINT16(offset, NULL, blob);
+ 		Trspi_UnloadBlob_KEY_FLAGS(offset, blob, NULL);
+ 		Trspi_UnloadBlob_BYTE(offset, NULL, blob);
+ 		Trspi_UnloadBlob_KEY_PARMS(offset, blob, NULL);
+ 		Trspi_UnloadBlob_UINT32(offset, &PCRInfoSize, blob);
+ 		Trspi_UnloadBlob(offset, PCRInfoSize, blob, NULL);
+ 		Trspi_UnloadBlob_STORE_PUBKEY(offset, blob, NULL);
+ 		Trspi_UnloadBlob_UINT32(offset, &encSize, blob);
+ 		Trspi_UnloadBlob(offset, encSize, blob, NULL);
+ 
+ 		return TSS_SUCCESS;
+ 	}
+ 
  	Trspi_UnloadBlob_UINT16(offset, &key->tag, blob);
  	Trspi_UnloadBlob_UINT16(offset, &key->fill, blob);
***************
*** 550,553 ****
--- 568,588 ----
  	TSS_RESULT result;
  
+ 	if (!key) {
+ 		UINT32 PCRInfoSize, encSize;
+ 
+ 		Trspi_UnloadBlob_TCPA_VERSION(offset, blob, NULL);
+ 		Trspi_UnloadBlob_UINT16(offset, NULL, blob);
+ 		Trspi_UnloadBlob_KEY_FLAGS(offset, blob, NULL);
+ 		Trspi_UnloadBlob_BYTE(offset, NULL, blob);
+ 		Trspi_UnloadBlob_KEY_PARMS(offset, blob, NULL);
+ 		Trspi_UnloadBlob_UINT32(offset, &PCRInfoSize, blob);
+ 		Trspi_UnloadBlob(offset, PCRInfoSize, blob, NULL);
+ 		Trspi_UnloadBlob_STORE_PUBKEY(offset, blob, NULL);
+ 		Trspi_UnloadBlob_UINT32(offset, &encSize, blob);
+ 		Trspi_UnloadBlob(offset, encSize, blob, NULL);
+ 
+ 		return TSS_SUCCESS;
+ 	}
+ 
  	Trspi_UnloadBlob_TCPA_VERSION(offset, blob, &key->ver);
  	Trspi_UnloadBlob_UINT16(offset, &key->keyUsage, blob);
***************
*** 590,593 ****
--- 625,637 ----
  Trspi_UnloadBlob_STORE_PUBKEY(UINT64 *offset, BYTE *blob, TCPA_STORE_PUBKEY *store)
  {
+ 	if (!store) {
+ 		UINT32 keyLength;
+ 
+ 		Trspi_UnloadBlob_UINT32(offset, &keyLength, blob);
+ 		Trspi_UnloadBlob(offset, keyLength, blob, NULL);
+ 
+ 		return TSS_SUCCESS;
+ 	}
+ 
  	Trspi_UnloadBlob_UINT32(offset, &store->keyLength, blob);

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv22024/src/trspi

Modified Files:
	trousers.c 
Log Message:
added Trspi_UnloadBlob_TSS_PLATFORM_CLASS

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** trousers.c	28 Aug 2007 20:48:29 -0000	1.46
--- trousers.c	30 Aug 2007 22:07:22 -0000	1.47
***************
*** 2384,2385 ****
--- 2384,2414 ----
  	return result;
  }
+ 
+ TSS_RESULT 
+ Trspi_UnloadBlob_TSS_PLATFORM_CLASS(UINT64 *offset, BYTE *blob, TSS_PLATFORM_CLASS *platClass)
+ {
+ 	if (!platClass){
+ 		UINT32 classURISize;
+ 
+ 		Trspi_UnloadBlob_UINT32(offset, NULL, blob);
+ 		Trspi_UnloadBlob_UINT32(offset, &classURISize, blob);
+ 		(*offset) += classURISize;
+ 
+ 		return TSS_SUCCESS;
+ 		
+ 	}
+ 	Trspi_UnloadBlob_UINT32(offset, &platClass->platformClassSimpleIdentifier, blob);
+ 	Trspi_UnloadBlob_UINT32(offset, &platClass->platformClassURISize, blob);
+ 	
+ 	platClass->pPlatformClassURI = malloc(platClass->platformClassURISize);
+ 	if (platClass->pPlatformClassURI == NULL) {
+ 		LogError("malloc of %u bytes failed.", platClass->platformClassURISize);
+ 		return TSPERR(TSS_E_OUTOFMEMORY);
+ 	}
+ 	Trspi_UnloadBlob(offset, platClass->platformClassURISize, blob, (BYTE *)platClass->pPlatformClassURI);
+ 
+ 	return TSS_SUCCESS;
+ 	
+ }
+ 
+

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv16285/src/trspi

Modified Files:
	trousers.c 
Log Message:
removed whitespace; formatting only

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** trousers.c	30 Aug 2007 22:07:22 -0000	1.47
--- trousers.c	31 Aug 2007 16:38:47 -0000	1.48
***************
*** 2357,2361 ****
  	Trspi_LoadBlob_UINT32(offset, msaComp->MSAlist, blob);
  	for (i = 0; i < msaComp->MSAlist; i++)
! 		Trspi_LoadBlob_DIGEST(offset, blob, &msaComp->migAuthDigest[i]); 
  }
  
--- 2357,2361 ----
  	Trspi_LoadBlob_UINT32(offset, msaComp->MSAlist, blob);
  	for (i = 0; i < msaComp->MSAlist; i++)
! 		Trspi_LoadBlob_DIGEST(offset, blob, &msaComp->migAuthDigest[i]);
  }
  
***************
*** 2385,2389 ****
  }
  
! TSS_RESULT 
  Trspi_UnloadBlob_TSS_PLATFORM_CLASS(UINT64 *offset, BYTE *blob, TSS_PLATFORM_CLASS *platClass)
  {
--- 2385,2389 ----
  }
  
! TSS_RESULT
  Trspi_UnloadBlob_TSS_PLATFORM_CLASS(UINT64 *offset, BYTE *blob, TSS_PLATFORM_CLASS *platClass)
  {
***************
*** 2396,2404 ****
  
  		return TSS_SUCCESS;
- 		
  	}
  	Trspi_UnloadBlob_UINT32(offset, &platClass->platformClassSimpleIdentifier, blob);
  	Trspi_UnloadBlob_UINT32(offset, &platClass->platformClassURISize, blob);
! 	
  	platClass->pPlatformClassURI = malloc(platClass->platformClassURISize);
  	if (platClass->pPlatformClassURI == NULL) {
--- 2396,2403 ----
  
  		return TSS_SUCCESS;
  	}
  	Trspi_UnloadBlob_UINT32(offset, &platClass->platformClassSimpleIdentifier, blob);
  	Trspi_UnloadBlob_UINT32(offset, &platClass->platformClassURISize, blob);
! 
  	platClass->pPlatformClassURI = malloc(platClass->platformClassURISize);
  	if (platClass->pPlatformClassURI == NULL) {
***************
*** 2406,2414 ****
  		return TSPERR(TSS_E_OUTOFMEMORY);
  	}
! 	Trspi_UnloadBlob(offset, platClass->platformClassURISize, blob, (BYTE *)platClass->pPlatformClassURI);
  
  	return TSS_SUCCESS;
- 	
  }
- 
- 
--- 2405,2411 ----
  		return TSPERR(TSS_E_OUTOFMEMORY);
  	}
! 	Trspi_UnloadBlob(offset, platClass->platformClassURISize, blob,
! 			 (BYTE *)platClass->pPlatformClassURI);
  
  	return TSS_SUCCESS;
  }

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29915/src/trspi

Modified Files:
	trousers.c 
Log Message:
added TPM_E_DISABLED_CMD

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** trousers.c	31 Aug 2007 16:38:47 -0000	1.48
--- trousers.c	13 Sep 2007 19:33:35 -0000	1.49
***************
*** 1181,1184 ****
--- 1181,1185 ----
  			case TPM_E_DOING_SELFTEST:		return "TPM is currently executing a full selftest";
  			case TPM_E_DEFEND_LOCK_RUNNING:		return "TPM is defending against dictionary attacks and is in some time-out period";
+ 			case TPM_E_DISABLED_CMD:		return "The TPM target command has been disabled";
  			default:				return "Unknown error";
  		}

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv27646/src/trspi

Modified Files:
	trousers.c 
Log Message:
clean-ups and fixes for SF#1773158

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** trousers.c	13 Sep 2007 19:33:35 -0000	1.49
--- trousers.c	17 Sep 2007 02:57:03 -0000	1.50
***************
*** 77,80 ****
--- 77,87 ----
  	TSS_RESULT result;
  
+ 	if (!pubKey) {
+ 		(void)Trspi_UnloadBlob_KEY_PARMS(offset, blob, NULL);
+ 		(void)Trspi_UnloadBlob_STORE_PUBKEY(offset, blob, NULL);
+ 
+ 		return TSS_SUCCESS;
+ 	}
+ 
  	if ((result = Trspi_UnloadBlob_KEY_PARMS(offset, blob, &pubKey->algorithmParms)))
  		return result;
***************
*** 206,213 ****
  Trspi_UnloadBlob_TSS_VERSION(UINT64 *offset, BYTE *blob, TSS_VERSION *out)
  {
! 	out->bMajor = blob[(*offset)++];
! 	out->bMinor = blob[(*offset)++];
! 	out->bRevMajor = blob[(*offset)++];
! 	out->bRevMinor = blob[(*offset)++];
  }
  
--- 213,229 ----
  Trspi_UnloadBlob_TSS_VERSION(UINT64 *offset, BYTE *blob, TSS_VERSION *out)
  {
! 	if (!out) {
! 		Trspi_UnloadBlob_BYTE(offset, NULL, blob);
! 		Trspi_UnloadBlob_BYTE(offset, NULL, blob);
! 		Trspi_UnloadBlob_BYTE(offset, NULL, blob);
! 		Trspi_UnloadBlob_BYTE(offset, NULL, blob);
! 
! 		return;
! 	}
! 
! 	Trspi_UnloadBlob_BYTE(offset, &out->bMajor, blob);
! 	Trspi_UnloadBlob_BYTE(offset, &out->bMinor, blob);
! 	Trspi_UnloadBlob_BYTE(offset, &out->bRevMajor, blob);
! 	Trspi_UnloadBlob_BYTE(offset, &out->bRevMinor, blob);
  }
  
***************
*** 253,256 ****
--- 269,280 ----
  	TSS_RESULT result;
  
+ 	if (!pcr) {
+ 		(void)Trspi_UnloadBlob_PCR_SELECTION(offset, blob, NULL);
+ 		Trspi_UnloadBlob_DIGEST(offset, blob, NULL);
+ 		Trspi_UnloadBlob_DIGEST(offset, blob, NULL);
+ 
+ 		return TSS_SUCCESS;
+ 	}
+ 
  	if ((result = Trspi_UnloadBlob_PCR_SELECTION(offset, blob, &pcr->pcrSelection)))
  		return result;
***************
*** 343,353 ****
  Trspi_UnloadBlob_PCR_SELECTION(UINT64 *offset, BYTE *blob, TCPA_PCR_SELECTION *pcr)
  {
- 	UINT16 i;
- 
  	if (!pcr) {
  		UINT16 sizeOfSelect;
  
  		Trspi_UnloadBlob_UINT16(offset, &sizeOfSelect, blob);
! 		(*offset) += sizeOfSelect;
  
  		return TSS_SUCCESS;
--- 367,375 ----
  Trspi_UnloadBlob_PCR_SELECTION(UINT64 *offset, BYTE *blob, TCPA_PCR_SELECTION *pcr)
  {
  	if (!pcr) {
  		UINT16 sizeOfSelect;
  
  		Trspi_UnloadBlob_UINT16(offset, &sizeOfSelect, blob);
! 		Trspi_UnloadBlob(offset, sizeOfSelect, blob, NULL);
  
  		return TSS_SUCCESS;
***************
*** 359,368 ****
  		pcr->pcrSelect = calloc(1, pcr->sizeOfSelect);
  		if (pcr->pcrSelect == NULL) {
! 			LogError("malloc of %d bytes failed.", pcr->sizeOfSelect);
  			return TSPERR(TSS_E_OUTOFMEMORY);
  		}
  
! 		for (i = 0; i < pcr->sizeOfSelect; i++)
! 			Trspi_UnloadBlob_BYTE(offset, &pcr->pcrSelect[i], blob);
  	} else {
  		pcr->pcrSelect = NULL;
--- 381,389 ----
  		pcr->pcrSelect = calloc(1, pcr->sizeOfSelect);
  		if (pcr->pcrSelect == NULL) {
! 			LogError("malloc of %u bytes failed.", pcr->sizeOfSelect);
  			return TSPERR(TSS_E_OUTOFMEMORY);
  		}
  
! 		Trspi_UnloadBlob(offset, pcr->sizeOfSelect, blob, pcr->pcrSelect);
  	} else {
  		pcr->pcrSelect = NULL;
***************
*** 865,873 ****
  Trspi_UnloadBlob_IDENTITY_REQ(UINT64 *offset, BYTE *blob, TCPA_IDENTITY_REQ *req)
  {
  	Trspi_UnloadBlob_UINT32(offset, &req->asymSize, blob);
  	Trspi_UnloadBlob_UINT32(offset, &req->symSize, blob);
! 	/* XXX */
! 	Trspi_UnloadBlob_KEY_PARMS(offset, blob, &req->asymAlgorithm);
! 	Trspi_UnloadBlob_KEY_PARMS(offset, blob, &req->symAlgorithm);
  
  	if (req->asymSize > 0) {
--- 886,900 ----
  Trspi_UnloadBlob_IDENTITY_REQ(UINT64 *offset, BYTE *blob, TCPA_IDENTITY_REQ *req)
  {
+ 	TSS_RESULT result;
+ 
  	Trspi_UnloadBlob_UINT32(offset, &req->asymSize, blob);
  	Trspi_UnloadBlob_UINT32(offset, &req->symSize, blob);
! 	if ((result = Trspi_UnloadBlob_KEY_PARMS(offset, blob, &req->asymAlgorithm)))
! 		return result;
! 	if ((Trspi_UnloadBlob_KEY_PARMS(offset, blob, &req->symAlgorithm))) {
! 		free(req->asymAlgorithm.parms);
! 		req->asymAlgorithm.parmSize = 0;
! 		return result;
! 	}
  
  	if (req->asymSize > 0) {
***************
*** 875,878 ****
--- 902,909 ----
  		if (req->asymBlob == NULL) {
  			req->asymSize = 0;
+ 			req->asymAlgorithm.parmSize = 0;
+ 			free(req->asymAlgorithm.parms);
+ 			req->symAlgorithm.parmSize = 0;
+ 			free(req->symAlgorithm.parms);
  			return TSPERR(TSS_E_OUTOFMEMORY);
  		}
***************
*** 889,892 ****
--- 920,927 ----
  			free(req->asymBlob);
  			req->asymBlob = NULL;
+ 			req->asymAlgorithm.parmSize = 0;
+ 			free(req->asymAlgorithm.parms);
+ 			req->symAlgorithm.parmSize = 0;
+ 			free(req->symAlgorithm.parms);
  			return TSPERR(TSS_E_OUTOFMEMORY);
  		}
***************
*** 2028,2031 ****
--- 2063,2072 ----
  Trspi_UnloadBlob_TPM_FAMILY_LABEL(UINT64 *offset, BYTE *blob, TPM_FAMILY_LABEL *label)
  {
+ 	if (!label) {
+ 		Trspi_UnloadBlob_BYTE(offset, NULL, blob);
+ 
+ 		return;
+ 	}
+ 
  	Trspi_UnloadBlob_BYTE(offset, &label->label, blob);
  }
***************
*** 2040,2043 ****
--- 2081,2094 ----
  Trspi_UnloadBlob_TPM_FAMILY_TABLE_ENTRY(UINT64 *offset, BYTE *blob, TPM_FAMILY_TABLE_ENTRY *entry)
  {
+ 	if (!entry) {
+ 		Trspi_UnloadBlob_UINT16(offset, NULL, blob);
+ 		Trspi_UnloadBlob_TPM_FAMILY_LABEL(offset, blob, NULL);
+ 		Trspi_UnloadBlob_UINT32(offset, NULL, blob);
+ 		Trspi_UnloadBlob_UINT32(offset, NULL, blob);
+ 		Trspi_UnloadBlob_UINT32(offset, NULL, blob);
+ 
+ 		return;
+ 	}
+ 
  	Trspi_UnloadBlob_UINT16(offset, &entry->tag, blob);
  	Trspi_UnloadBlob_TPM_FAMILY_LABEL(offset, blob, &entry->label);
***************
*** 2060,2063 ****
--- 2111,2120 ----
  Trspi_UnloadBlob_TPM_DELEGATE_LABEL(UINT64 *offset, BYTE *blob, TPM_DELEGATE_LABEL *label)
  {
+ 	if (!label) {
+ 		Trspi_UnloadBlob_BYTE(offset, NULL, blob);
+ 
+ 		return;
+ 	}
+ 
  	Trspi_UnloadBlob_BYTE(offset, &label->label, blob);
  }
***************
*** 2072,2075 ****
--- 2129,2141 ----
  Trspi_UnloadBlob_TPM_DELEGATIONS(UINT64 *offset, BYTE *blob, TPM_DELEGATIONS *delegations)
  {
+ 	if (!delegations) {
+ 		Trspi_UnloadBlob_UINT16(offset, NULL, blob);
+ 		Trspi_UnloadBlob_UINT32(offset, NULL, blob);
+ 		Trspi_UnloadBlob_UINT32(offset, NULL, blob);
+ 		Trspi_UnloadBlob_UINT32(offset, NULL, blob);
+ 
+ 		return;
+ 	}
+ 
  	Trspi_UnloadBlob_UINT16(offset, &delegations->tag, blob);
  	Trspi_UnloadBlob_UINT32(offset, &delegations->delegateType, blob);
***************
*** 2092,2095 ****
--- 2158,2172 ----
  	TSS_RESULT result;
  
+ 	if (!pub) {
+ 		Trspi_UnloadBlob_UINT16(offset, NULL, blob);
+ 		Trspi_UnloadBlob_TPM_DELEGATE_LABEL(offset, blob, NULL);
+ 		(void)Trspi_UnloadBlob_PCR_INFO_SHORT(offset, blob, NULL);
+ 		Trspi_UnloadBlob_TPM_DELEGATIONS(offset, blob, NULL);
+ 		Trspi_UnloadBlob_UINT32(offset, NULL, blob);
+ 		Trspi_UnloadBlob_UINT32(offset, NULL, blob);
+ 
+ 		return TSS_SUCCESS;
+ 	}
+ 
  	Trspi_UnloadBlob_UINT16(offset, &pub->tag, blob);
  	Trspi_UnloadBlob_TPM_DELEGATE_LABEL(offset, blob, &pub->label);
***************
*** 2119,2122 ****
--- 2196,2213 ----
  	TSS_RESULT result;
  
+ 	if (!owner) {
+ 		UINT32 additionalSize, sensitiveSize;
+ 
+ 		Trspi_UnloadBlob_UINT16(offset, NULL, blob);
+ 		(void)Trspi_UnloadBlob_TPM_DELEGATE_PUBLIC(offset, blob, NULL);
+ 		Trspi_UnloadBlob_DIGEST(offset, blob, NULL);
+ 		Trspi_UnloadBlob_UINT32(offset, &additionalSize, blob);
+ 		(void)Trspi_UnloadBlob(offset, additionalSize, blob, NULL);
+ 		Trspi_UnloadBlob_UINT32(offset, &sensitiveSize, blob);
+ 		(void)Trspi_UnloadBlob(offset, sensitiveSize, blob, NULL);
+ 
+ 		return TSS_SUCCESS;
+ 	}
+ 
  	Trspi_UnloadBlob_UINT16(offset, &owner->tag, blob);
  	if ((result = Trspi_UnloadBlob_TPM_DELEGATE_PUBLIC(offset, blob, &owner->pub)))
***************
*** 2165,2168 ****
--- 2256,2274 ----
  	TSS_RESULT result;
  
+ 	if (!key) {
+ 		UINT32 additionalSize, sensitiveSize;
+ 
+ 		Trspi_UnloadBlob_UINT16(offset, NULL, blob);
+ 		(void)Trspi_UnloadBlob_TPM_DELEGATE_PUBLIC(offset, blob, NULL);
+ 		Trspi_UnloadBlob_DIGEST(offset, blob, NULL);
+ 		Trspi_UnloadBlob_DIGEST(offset, blob, NULL);
+ 		Trspi_UnloadBlob_UINT32(offset, &additionalSize, blob);
+ 		(void)Trspi_UnloadBlob(offset, additionalSize, blob, NULL);
+ 		Trspi_UnloadBlob_UINT32(offset, NULL, blob);
+ 		(void)Trspi_UnloadBlob(offset, sensitiveSize, blob, NULL);
+ 
+ 		return TSS_SUCCESS;
+ 	}
+ 
  	Trspi_UnloadBlob_UINT16(offset, &key->tag, blob);
  	if ((result = Trspi_UnloadBlob_TPM_DELEGATE_PUBLIC(offset, blob, &key->pub)))
***************
*** 2211,2214 ****
--- 2317,2330 ----
  Trspi_UnloadBlob_TSS_FAMILY_TABLE_ENTRY(UINT64 *offset, BYTE *blob, TSS_FAMILY_TABLE_ENTRY *entry)
  {
+ 	if (!entry) {
+ 		Trspi_UnloadBlob_UINT32(offset, NULL, blob);
+ 		Trspi_UnloadBlob_BYTE(offset, NULL, blob);
+ 		Trspi_UnloadBlob_UINT32(offset, NULL, blob);
+ 		Trspi_UnloadBlob_BOOL(offset, NULL, blob);
+ 		Trspi_UnloadBlob_BOOL(offset, NULL, blob);
+ 
+ 		return;
+ 	}
+ 
  	Trspi_UnloadBlob_UINT32(offset, &entry->familyID, blob);
  	Trspi_UnloadBlob_BYTE(offset, &entry->label, blob);
***************
*** 2231,2234 ****
--- 2347,2362 ----
  Trspi_UnloadBlob_TSS_PCR_INFO_SHORT(UINT64 *offset, BYTE *blob, TSS_PCR_INFO_SHORT *pcr)
  {
+ 	if (!pcr) {
+ 		UINT32 sizeOfSelect, sizeOfDigestAtRelease;
+ 
+ 		Trspi_UnloadBlob_UINT32(offset, &sizeOfSelect, blob);
+ 		(void)Trspi_UnloadBlob(offset, sizeOfSelect, blob, NULL);
+ 		Trspi_UnloadBlob_BYTE(offset, NULL, blob);
+ 		Trspi_UnloadBlob_UINT32(offset, &sizeOfDigestAtRelease, blob);
+ 		(void)Trspi_UnloadBlob(offset, sizeOfDigestAtRelease, blob, NULL);
+ 
+ 		return TSS_SUCCESS;
+ 	}
+ 
  	Trspi_UnloadBlob_UINT32(offset, &pcr->sizeOfSelect, blob);
  	if (pcr->sizeOfSelect > 0) {
***************
*** 2275,2278 ****
--- 2403,2418 ----
  	TSS_RESULT result;
  
+ 	if (!entry) {
+ 		Trspi_UnloadBlob_UINT32(offset, NULL, blob);
+ 		Trspi_UnloadBlob_BYTE(offset, NULL, blob);
+ 		(void)Trspi_UnloadBlob_TSS_PCR_INFO_SHORT(offset, blob, NULL);
+ 		Trspi_UnloadBlob_UINT32(offset, NULL, blob);
+ 		Trspi_UnloadBlob_UINT32(offset, NULL, blob);
+ 		Trspi_UnloadBlob_UINT32(offset, NULL, blob);
+ 		Trspi_UnloadBlob_UINT32(offset, NULL, blob);
+ 
+ 		return TSS_SUCCESS;
+ 	}
+ 
  	Trspi_UnloadBlob_UINT32(offset, &entry->tableIndex, blob);
  	Trspi_UnloadBlob_BYTE(offset, &entry->label, blob);
***************
*** 2310,2314 ****
  		Trspi_UnloadBlob_PCR_SELECTION(offset, blob, NULL);
  		Trspi_UnloadBlob_UINT32(offset, &valueSize, blob);
! 		(*offset) += valueSize;
  
  		return TSS_SUCCESS;
--- 2450,2454 ----
  		Trspi_UnloadBlob_PCR_SELECTION(offset, blob, NULL);
  		Trspi_UnloadBlob_UINT32(offset, &valueSize, blob);
! 		Trspi_UnloadBlob(offset, valueSize, blob, NULL);
  
  		return TSS_SUCCESS;
***************
*** 2334,2337 ****
--- 2474,2485 ----
  	TSS_RESULT result;
  
+ 	if (!migAuth) {
+ 		(void)Trspi_UnloadBlob_PUBKEY(offset, blob, NULL);
+ 		Trspi_UnloadBlob_UINT16(offset, NULL, blob);
+ 		Trspi_UnloadBlob_DIGEST(offset, blob, NULL);
+ 
+ 		return TSS_SUCCESS;
+ 	}
+ 
  	if ((result = Trspi_UnloadBlob_PUBKEY(offset, blob, &migAuth->migrationKey)))
  		return result;
***************
*** 2394,2398 ****
  		Trspi_UnloadBlob_UINT32(offset, NULL, blob);
  		Trspi_UnloadBlob_UINT32(offset, &classURISize, blob);
! 		(*offset) += classURISize;
  
  		return TSS_SUCCESS;
--- 2542,2546 ----
  		Trspi_UnloadBlob_UINT32(offset, NULL, blob);
  		Trspi_UnloadBlob_UINT32(offset, &classURISize, blob);
! 		Trspi_UnloadBlob(offset, classURISize, blob, NULL);
  
  		return TSS_SUCCESS;

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11438/src/trspi

Modified Files:
	trousers.c 
Log Message:
fixed passing uninitialized variable

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** trousers.c	17 Sep 2007 02:57:03 -0000	1.50
--- trousers.c	20 Sep 2007 21:27:12 -0000	1.51
***************
*** 2265,2269 ****
  		Trspi_UnloadBlob_UINT32(offset, &additionalSize, blob);
  		(void)Trspi_UnloadBlob(offset, additionalSize, blob, NULL);
! 		Trspi_UnloadBlob_UINT32(offset, NULL, blob);
  		(void)Trspi_UnloadBlob(offset, sensitiveSize, blob, NULL);
  
--- 2265,2269 ----
  		Trspi_UnloadBlob_UINT32(offset, &additionalSize, blob);
  		(void)Trspi_UnloadBlob(offset, additionalSize, blob, NULL);
! 		Trspi_UnloadBlob_UINT32(offset, &sensitiveSize, blob);
  		(void)Trspi_UnloadBlob(offset, sensitiveSize, blob, NULL);

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4687/src/trspi

Modified Files:
	trousers.c 
Log Message:
added the option to leave any unloadblob function's struct param as NULL to receive the size of the data in the blob (SF#1773158); moved bound data function

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** trousers.c	20 Sep 2007 21:27:12 -0000	1.51
--- trousers.c	12 Oct 2007 16:07:51 -0000	1.52
***************
*** 479,482 ****
--- 479,493 ----
  Trspi_UnloadBlob_UUID(UINT64 *offset, BYTE *blob, TSS_UUID *uuid)
  {
+ 	if (!uuid) {
+ 		Trspi_UnloadBlob_UINT32(offset, NULL, blob);
+ 		Trspi_UnloadBlob_UINT16(offset, NULL, blob);
+ 		Trspi_UnloadBlob_UINT16(offset, NULL, blob);
+ 		Trspi_UnloadBlob_BYTE(offset, NULL, blob);
+ 		Trspi_UnloadBlob_BYTE(offset, NULL, blob);
+ 		Trspi_UnloadBlob(offset, 6, blob, NULL);
+ 
+ 		return;
+ 	}
+ 
  	memset(uuid, 0, sizeof(TSS_UUID));
  	Trspi_UnloadBlob_UINT32(offset, &uuid->ulTimeLow, blob);
***************
*** 692,695 ****
--- 703,721 ----
  Trspi_UnloadBlob_KM_KEYINFO(UINT64 *offset, BYTE *blob, TSS_KM_KEYINFO *info)
  {
+ 	if (!info) {
+ 		UINT32 ulVendorDataLength;
+ 
+ 		Trspi_UnloadBlob_TSS_VERSION(offset, blob, NULL);
+ 		Trspi_UnloadBlob_UUID(offset, blob, NULL);
+ 		Trspi_UnloadBlob_UUID(offset, blob, NULL);
+ 		Trspi_UnloadBlob_BYTE(offset, NULL, blob);
+ 		Trspi_UnloadBlob_BOOL(offset, NULL, blob);
+ 		Trspi_UnloadBlob_UINT32(offset, &ulVendorDataLength, blob);
+ 
+ 		(*offset) += ulVendorDataLength;
+ 
+ 		return TSS_SUCCESS;
+ 	}
+ 
  	Trspi_UnloadBlob_TSS_VERSION(offset, blob, &info->versionInfo);
  	Trspi_UnloadBlob_UUID(offset, blob, &info->keyUUID);
***************
*** 716,719 ****
--- 742,762 ----
  Trspi_UnloadBlob_KM_KEYINFO2(UINT64 *offset, BYTE *blob, TSS_KM_KEYINFO2 *info)
  {
+ 	if (!info) {
+ 		UINT32 ulVendorDataLength;
+ 
+ 		Trspi_UnloadBlob_TSS_VERSION(offset, blob, NULL);
+ 		Trspi_UnloadBlob_UUID(offset, blob, NULL);
+ 		Trspi_UnloadBlob_UUID(offset, blob, NULL);
+ 		Trspi_UnloadBlob_BYTE(offset, NULL, blob);
+ 		Trspi_UnloadBlob_UINT32(offset, NULL, blob);
+ 		Trspi_UnloadBlob_UINT32(offset, NULL, blob);
+ 		Trspi_UnloadBlob_BOOL(offset, NULL, blob);
+ 		Trspi_UnloadBlob_UINT32(offset, &ulVendorDataLength, blob);
+ 
+ 		(*offset) += ulVendorDataLength;
+ 
+ 		return TSS_SUCCESS;
+ 	}
+ 
  	Trspi_UnloadBlob_TSS_VERSION(offset, blob, &info->versionInfo);
  	Trspi_UnloadBlob_UUID(offset, blob, &info->keyUUID);
***************
*** 760,763 ****
--- 803,822 ----
  Trspi_UnloadBlob_PCR_EVENT(UINT64 *offset, BYTE *blob, TSS_PCR_EVENT *event)
  {
+ 	if (!event) {
+ 		UINT32 ulPcrValueLength, ulEventLength;
+ 
+ 		Trspi_UnloadBlob_VERSION(offset, blob, NULL);
+ 		Trspi_UnloadBlob_UINT32(offset, NULL, blob);
+ 		Trspi_UnloadBlob_UINT32(offset, NULL, blob);
+ 
+ 		Trspi_UnloadBlob_UINT32(offset, &ulPcrValueLength, blob);
+ 		(*offset) += ulPcrValueLength;
+ 
+ 		Trspi_UnloadBlob_UINT32(offset, &ulEventLength, blob);
+ 		(*offset) += ulEventLength;
+ 
+ 		return TSS_SUCCESS;
+ 	}
+ 
  	Trspi_UnloadBlob_VERSION(offset, blob, (TCPA_VERSION *)&(event->versionInfo));
  	Trspi_UnloadBlob_UINT32(offset, &event->ulPcrIndex, blob);
***************
*** 847,850 ****
--- 906,920 ----
  Trspi_UnloadBlob_SYMMETRIC_KEY(UINT64 *offset, BYTE *blob, TCPA_SYMMETRIC_KEY *key)
  {
+ 	if (!key) {
+ 		UINT16 size;
+ 
+ 		Trspi_UnloadBlob_UINT32(offset, NULL, blob);
+ 		Trspi_UnloadBlob_UINT16(offset, NULL, blob);
+ 		Trspi_UnloadBlob_UINT16(offset, &size, blob);
+ 		(*offset) += size;
+ 
+ 		return TSS_SUCCESS;
+ 	}
+ 
  	Trspi_UnloadBlob_UINT32(offset, &key->algId, blob);
  	Trspi_UnloadBlob_UINT16(offset, &key->encScheme, blob);
***************
*** 888,891 ****
--- 958,975 ----
  	TSS_RESULT result;
  
+ 	if (!req) {
+ 		UINT32 asymSize, symSize;
+ 
+ 		Trspi_UnloadBlob_UINT32(offset, &asymSize, blob);
+ 		Trspi_UnloadBlob_UINT32(offset, &symSize, blob);
+ 		(void)Trspi_UnloadBlob_KEY_PARMS(offset, blob, NULL);
+ 		(void)Trspi_UnloadBlob_KEY_PARMS(offset, blob, NULL);
+ 
+ 		(*offset) += asymSize;
+ 		(*offset) += symSize;
+ 
+ 		return TSS_SUCCESS;
+ 	}
+ 
  	Trspi_UnloadBlob_UINT32(offset, &req->asymSize, blob);
  	Trspi_UnloadBlob_UINT32(offset, &req->symSize, blob);
***************
*** 939,942 ****
--- 1023,1048 ----
  	TSS_RESULT result;
  
+ 	if (!proof) {
+ 		UINT32 labelSize, identityBindingSize, endorsementSize, platformSize;
+ 		UINT32 conformanceSize;
+ 
+ 		Trspi_UnloadBlob_VERSION(offset, blob, NULL);
+ 		Trspi_UnloadBlob_UINT32(offset, &labelSize, blob);
+ 		Trspi_UnloadBlob_UINT32(offset, &identityBindingSize, blob);
+ 		Trspi_UnloadBlob_UINT32(offset, &endorsementSize, blob);
+ 		Trspi_UnloadBlob_UINT32(offset, &platformSize, blob);
+ 		Trspi_UnloadBlob_UINT32(offset, &conformanceSize, blob);
+ 
+ 		(void)Trspi_UnloadBlob_PUBKEY(offset, blob, NULL);
+ 
+ 		(*offset) += labelSize;
+ 		(*offset) += identityBindingSize;
+ 		(*offset) += endorsementSize;
+ 		(*offset) += platformSize;
+ 		(*offset) += conformanceSize;
+ 
+ 		return TSS_SUCCESS;
+ 	}
+ 
  	/* helps when an error occurs */
  	memset(proof, 0, sizeof(TCPA_IDENTITY_PROOF));
***************
*** 1057,1060 ****
--- 1163,1177 ----
  	TSS_RESULT result;
  
+ 	if (!sym) {
+ 		UINT32 credSize;
+ 
+ 		Trspi_UnloadBlob_UINT32(offset, &credSize, blob);
+ 		(void)Trspi_UnloadBlob_KEY_PARMS(offset, blob, NULL);
+ 
+ 		(*offset) += credSize;
+ 
+ 		return TSS_SUCCESS;
+ 	}
+ 
  	Trspi_UnloadBlob_UINT32(offset, &sym->credSize, blob);
  	if ((result = Trspi_UnloadBlob_KEY_PARMS(offset, blob, &sym->algorithm))) {
***************
*** 1091,1094 ****
--- 1208,1218 ----
  	TSS_RESULT result;
  
+ 	if (!asym) {
+ 		(void)Trspi_UnloadBlob_SYMMETRIC_KEY(offset, blob, NULL);
+ 		Trspi_UnloadBlob(offset, TCPA_SHA1_160_HASH_LEN, blob, NULL);
+ 
+ 		return TSS_SUCCESS;
+ 	}
+ 
  	if ((result = Trspi_UnloadBlob_SYMMETRIC_KEY(offset, blob, &asym->sessionKey)))
  		return result;
***************
*** 1099,1102 ****
--- 1223,1234 ----
  }
  
+ void
+ Trspi_LoadBlob_BOUND_DATA(UINT64 *offset, TCPA_BOUND_DATA bd, UINT32 payloadLength, BYTE *blob)
+ {
+ 	Trspi_LoadBlob_TCPA_VERSION(offset, blob, bd.ver);
+ 	Trspi_LoadBlob(offset, 1, blob, &bd.payload);
+ 	Trspi_LoadBlob(offset, payloadLength, blob, bd.payloadData);
+ }
+ 
  /* function to mimic strerror with TSS error codes */
  char *
***************
*** 1493,1504 ****
  }
  
- void
- Trspi_LoadBlob_BOUND_DATA(UINT64 *offset, TCPA_BOUND_DATA bd, UINT32 payloadLength, BYTE *blob)
- {
- 	Trspi_LoadBlob_TCPA_VERSION(offset, blob, bd.ver);
- 	Trspi_LoadBlob(offset, 1, blob, &bd.payload);
- 	Trspi_LoadBlob(offset, payloadLength, blob, bd.payloadData);
- }
- 
  /* Functions to support incremental hashing */
  TSS_RESULT
--- 1625,1628 ----

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv31572/src/trspi

Modified Files:
	trousers.c 
Log Message:
added blob  load/unload of CAP_VERSION_INFO structs

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -d -r1.52 -r1.53
*** trousers.c	12 Oct 2007 16:07:51 -0000	1.52
--- trousers.c	26 Oct 2007 20:34:31 -0000	1.53
***************
*** 2683,2684 ****
--- 2683,2735 ----
  	return TSS_SUCCESS;
  }
+ 
+ void
+ Trspi_LoadBlob_CAP_VERSION_INFO(UINT64 *offset, BYTE *blob, TPM_CAP_VERSION_INFO *v)
+ {
+ 	Trspi_LoadBlob_UINT16(offset, v->tag, blob);
+ 	Trspi_LoadBlob_TCPA_VERSION(offset, blob, *(TCPA_VERSION *)(&v->version));
+ 	Trspi_LoadBlob_UINT16(offset, v->specLevel, blob);
+ 	Trspi_LoadBlob_BYTE(offset, v->errataRev, blob);
+ 	Trspi_LoadBlob(offset, sizeof(v->tpmVendorID), blob, v->tpmVendorID);
+ 	Trspi_LoadBlob_UINT16(offset, v->vendorSpecificSize, blob);
+ 	Trspi_LoadBlob(offset, v->vendorSpecificSize, blob, v->vendorSpecific);
+ }
+ 
+ TSS_RESULT
+ Trspi_UnloadBlob_CAP_VERSION_INFO(UINT64 *offset, BYTE *blob, TPM_CAP_VERSION_INFO *v)
+ {
+ 	if (!v) {
+ 		UINT16 vendorSpecificSize;
+ 
+ 		Trspi_UnloadBlob_UINT16(offset, NULL, blob);
+ 		Trspi_UnloadBlob_VERSION(offset, blob, NULL);
+ 		Trspi_UnloadBlob_UINT16(offset, NULL, blob);
+ 		Trspi_UnloadBlob_BYTE(offset, NULL, blob);
+ 		Trspi_UnloadBlob(offset, 4, blob, NULL);
+ 		Trspi_UnloadBlob_UINT16(offset, &vendorSpecificSize, blob);
+ 
+ 		(*offset) += vendorSpecificSize;
+ 
+ 		return TSS_SUCCESS;
+ 	}
+ 
+ 	Trspi_UnloadBlob_UINT16(offset, &v->tag, blob);
+ 	Trspi_UnloadBlob_VERSION(offset, blob, (TCPA_VERSION *)&v->version);
+ 	Trspi_UnloadBlob_UINT16(offset, &v->specLevel, blob);
+ 	Trspi_UnloadBlob_BYTE(offset, &v->errataRev, blob);
+ 	Trspi_UnloadBlob(offset, sizeof(v->tpmVendorID), blob, v->tpmVendorID);
+ 	Trspi_UnloadBlob_UINT16(offset, &v->vendorSpecificSize, blob);
+ 
+ 	if (v->vendorSpecificSize > 0) {
+ 		if ((v->vendorSpecific = malloc(v->vendorSpecificSize)) == NULL) {
+ 			LogError("malloc of %u bytes failed.", v->vendorSpecificSize);
+ 			return TSPERR(TSS_E_OUTOFMEMORY);
+ 		}
+ 
+ 		Trspi_UnloadBlob(offset, v->vendorSpecificSize, blob, v->vendorSpecific);
+ 	} else {
+ 		v->vendorSpecific = NULL;
+ 	}
+ 
+ 	return TSS_SUCCESS;
+ }

Update of /cvsroot/trousers/trousers/src/trspi
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv2368/src/trspi

Modified Files:
	trousers.c 
Log Message:
only use a const for the iconv call in BSD

Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** trousers.c	26 Oct 2007 20:34:31 -0000	1.53
--- trousers.c	19 Nov 2007 19:59:49 -0000	1.54
***************
*** 1513,1517 ****
  Trspi_Native_To_UNICODE(BYTE *string, unsigned *size)
  {
! 	char *ptr, *ret, *outbuf, tmpbuf[MAX_BUF_SIZE] = { 0, };
  	unsigned len = 0, tmplen;
  	iconv_t cd = 0;
--- 1513,1518 ----
  Trspi_Native_To_UNICODE(BYTE *string, unsigned *size)
  {
! 	char *ret, *outbuf, tmpbuf[MAX_BUF_SIZE] = { 0, };
! 	BSD_CONST char *ptr;
  	unsigned len = 0, tmplen;
  	iconv_t cd = 0;
***************
*** 1571,1575 ****
  Trspi_UNICODE_To_Native(BYTE *string, unsigned *size)
  {
! 	char *ret, *ptr, *outbuf, tmpbuf[MAX_BUF_SIZE] = { 0, };
  	unsigned len = 0, tmplen;
  	iconv_t cd;
--- 1572,1577 ----
  Trspi_UNICODE_To_Native(BYTE *string, unsigned *size)
  {
! 	char *ret, *outbuf, tmpbuf[MAX_BUF_SIZE] = { 0, };
! 	BSD_CONST char *ptr;
  	unsigned len = 0, tmplen;
  	iconv_t cd;

Update of /cvsroot/trousers/trousers/src/trspi
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv16917/src/trspi

Modified Files:
	trousers.c 
Log Message:
The fix below adds a typecast to the iconv function calls in the UNICODE
conversion functions.  Some compilers complain about it otherwise.

Signed-off-by: Wyllys Ingersoll <wyllys.ingersoll@...>


Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -C2 -d -r1.54 -r1.55
*** trousers.c	19 Nov 2007 19:59:49 -0000	1.54
--- trousers.c	23 Jun 2009 18:07:48 -0000	1.55
***************
*** 1540,1544 ****
  		errno = 0;
  
! 		rc = iconv(cd, &ptr, &inbytesleft, &outbuf, &outbytesleft);
  	} while (rc == (size_t)-1 && errno == E2BIG);
  
--- 1540,1544 ----
  		errno = 0;
  
! 		rc = iconv(cd, (const char **)&ptr, &inbytesleft, &outbuf, &outbytesleft);
  	} while (rc == (size_t)-1 && errno == E2BIG);
  
***************
*** 1602,1606 ****
  		errno = 0;
  
! 		rc = iconv(cd, &ptr, &inbytesleft, &outbuf, &outbytesleft);
  	} while (rc == (size_t)-1 && errno == E2BIG);
  
--- 1602,1606 ----
  		errno = 0;
  
! 		rc = iconv(cd, (const char **)&ptr, &inbytesleft, &outbuf, &outbytesleft);
  	} while (rc == (size_t)-1 && errno == E2BIG);

Update of /cvsroot/trousers/trousers/src/trspi
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19727/src/trspi

Modified Files:
	trousers.c 
Log Message:
BSD_CONST only defined as const #ifdef ((__OpenBSD__) || (__FreeBSD__)),
if false, const here introduces a warning.

Signed-off-by: Rajiv Andrade <srajiv@...>


Index: trousers.c
===================================================================
RCS file: /cvsroot/trousers/trousers/src/trspi/trousers.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -d -r1.55 -r1.56
*** trousers.c	23 Jun 2009 18:07:48 -0000	1.55
--- trousers.c	24 Jun 2009 14:43:19 -0000	1.56
***************
*** 1540,1544 ****
  		errno = 0;
  
! 		rc = iconv(cd, (const char **)&ptr, &inbytesleft, &outbuf, &outbytesleft);
  	} while (rc == (size_t)-1 && errno == E2BIG);
  
--- 1540,1544 ----
  		errno = 0;
  
! 		rc = iconv(cd, (BSD_CONST char **)&ptr, &inbytesleft, &outbuf, &outbytesleft);
  	} while (rc == (size_t)-1 && errno == E2BIG);
  
***************
*** 1602,1606 ****
  		errno = 0;
  
! 		rc = iconv(cd, (const char **)&ptr, &inbytesleft, &outbuf, &outbytesleft);
  	} while (rc == (size_t)-1 && errno == E2BIG);
  
--- 1602,1606 ----
  		errno = 0;
  
! 		rc = iconv(cd, (BSD_CONST char **)&ptr, &inbytesleft, &outbuf, &outbytesleft);
  	} while (rc == (size_t)-1 && errno == E2BIG);