TPM and string_to_uuid 64bits issue

[dti]

There is an issue running on 64b arch. and using TPM.
(Credit goes to Janos)
Patch to fix :

diff -urp ecryptfs-utils-81-orig/src/key_mod/ecryptfs_key_mod_tspi.c ecryptfs-utils-81-patched/src/key_mod/ecryptfs_key_mod_tspi.c
--- ecryptfs-utils-81-orig/src/key_mod/ecryptfs_key_mod_tspi.c 2009-09-08 18:10:56.000000000 +0200
+++ ecryptfs-utils-81-patched/src/key_mod/ecryptfs_key_mod_tspi.c 2009-10-21 17:40:24.000000000 +0200
@@ -542,17 +542,16 @@ static uint32_t tspi_num_params = 1;
  */
 static void string_to_uuid(TSS_UUID *uuid, char *str)
 {
- BYTE tmp[(sizeof(unsigned long) * 2 + 1)];
- unsigned long l;
- uint32_t i;
+ BYTE tmp[(sizeof(uint32_t) * 2 + 1)];
+ uint32_t i, l;

- tmp[sizeof(unsigned long) * 2] = '\0';
+ tmp[sizeof(uint32_t) * 2] = '\0';
        for (i = 0; i < (sizeof(TSS_UUID) * 2);
- i += (sizeof(unsigned long) * 2)) {
- memcpy(tmp, &str[i], sizeof(unsigned long) * 2);
+ i += (sizeof(uint32_t) * 2)) {
+ memcpy(tmp, &str[i], sizeof(uint32_t) * 2);
                l = strtoul((char *)tmp, NULL, 16);
                l = htonl(l);
- memcpy(&((BYTE *)uuid)[i/2], &l, sizeof(unsigned long));
+ memcpy(&((BYTE *)uuid)[i/2], &l, sizeof(uint32_t));
        }
 }

[Dustin Kirkland  (kirkland)]

Tyler, any objections here?

I'm inclined to apply this patch...

[Tyler Hicks (tyhicks)]

Dustin - No objections here. I was just helping someone in IRC who was on 64 bit Ubuntu and wasn't able to perform his mount without this patch. Lets go ahead and apply it.

[dave2008 (dave2008713)]

Why is this patch still not applied? I encountered the same problem here. :-)

[Dustin Kirkland  (kirkland)]

Fell through the cracks, unfortunately, Dave.

Committed revision 618. Will be in ecryptfs-utils-96.