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

src/tcs/ps/tcsps.c

 
 /*
  * Licensed Materials - Property of IBM
  *
  * trousers - An open source TCG Software Stack
  *
  * (C) Copyright International Business Machines Corp. 2004-2006
  *
  */
 
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <sys/file.h>
 #include <sys/stat.h>
+#if defined (HAVE_BYTEORDER_H)
+#include <sys/byteorder.h>
+#elif defined (HAVE_ENDIAN_H)
+#include <endian.h>
+#define LE_16 htole16
+#define LE_32 htole32
+#define LE_64 htole64
+#else
+#define LE_16(x) (x)
+#define LE_32(x) (x)
+#define LE_64(x) (x)
+#endif
 #include <assert.h>
 #include <fcntl.h>
 #include <limits.h>
 
 #include "trousers/tss.h"
 #include "trousers_types.h"
 #include "tcsps.h"
 #include "tcs_tsp.h"
 #include "tcs_utils.h"
 #include "capabilities.h"
@@ skipping 555 matching lines @@
                 goto done;
         }
 
         /* [TSS_UUID uuid_parent0    ] yes */
         if ((rc = write_data(fd, (void *)parent_uuid, sizeof(TSS_UUID)))) {
                 LogError("%s", __FUNCTION__);
                 goto done;
         }
 
         /* [UINT16   pub_data_size0  ] yes */
+        pub_key_size = LE_16(pub_key_size);
         if ((rc = write_data(fd, &pub_key_size, sizeof(UINT16)))) {
                 LogError("%s", __FUNCTION__);
                 goto done;
         }
+        /* Swap it back for later */
+        pub_key_size = LE_16(pub_key_size);
 
         /* [UINT16   blob_size0      ] yes */
+        key_blob_size = LE_16(key_blob_size);
         if ((rc = write_data(fd, &key_blob_size, sizeof(UINT16)))) {
                 LogError("%s", __FUNCTION__);
                 goto done;
         }
+        /* Swap it back for later */
+        key_blob_size = LE_16(key_blob_size);
 
         /* [UINT32   vendor_data_size0 ] yes */
+        vendor_size = LE_32(vendor_size);
         if ((rc = write_data(fd, &vendor_size, sizeof(UINT32)))) {
                 LogError("%s", __FUNCTION__);
                 goto done;
         }
+        /* Swap it back for later */
+        vendor_size = LE_32(vendor_size);
 
         /* [UINT16   cache_flags0    ] yes */
+        cache_flags = LE_16(cache_flags);
         if ((rc = write_data(fd, &cache_flags, sizeof(UINT16)))) {
                 LogError("%s", __FUNCTION__);
                 goto done;
         }
+        /* Swap it back for later */
+        cache_flags = LE_16(cache_flags);
 
         /* [BYTE[]   pub_data0       ] no */
         if ((rc = write_data(fd, (void *)key.pubKey.key, pub_key_size))) {
                 LogError("%s", __FUNCTION__);
                 goto done;
         }
 
         /* [BYTE[]   blob0           ] no */
         if ((rc = write_data(fd, (void *)key_blob, key_blob_size))) {
                 LogError("%s", __FUNCTION__);
@@ skipping 101 matching lines @@
 
         /* we succeeded in removing a key from the disk. Decrement the number
          * of keys in the file */
         rc = lseek(fd, TSSPS_NUM_KEYS_OFFSET, SEEK_SET);
         if (rc == ((off_t) - 1)) {
                 LogError("lseek: %s", strerror(errno));
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         }
 
         rc = read(fd, &num_keys, sizeof(UINT32));
+        num_keys = LE_32(num_keys);
         if (rc != sizeof(UINT32)) {
                 LogError("read of %zd bytes: %s", sizeof(UINT32), strerror(errno));
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         }
 
         rc = lseek(fd, TSSPS_NUM_KEYS_OFFSET, SEEK_SET);
         if (rc == ((off_t) - 1)) {
                 LogError("lseek: %s", strerror(errno));
                 return TCSERR(TSS_E_INTERNAL_ERROR);
         }
 
         /* decrement, then write back out to disk */
         num_keys--;
 
+        num_keys = LE_32(num_keys);
         if ((result = write_data(fd, (void *)&num_keys, sizeof(UINT32)))) {
                 LogError("%s", __FUNCTION__);
                 return result;
         }
 
         return TSS_SUCCESS;
 }