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

src/tspi/tsp_policy.c

Index: src/tspi/tsp_policy.c
diff --git a/src/tspi/tsp_policy.c b/src/tspi/tsp_policy.c
index 3b8d05e51de24aae782735f8fdf1787b4a9e07ca..9d5ec5da25bb29909fa1bbf70000d7a91078eb8f 100644
--- a/src/tspi/tsp_policy.c
+++ b/src/tspi/tsp_policy.c
@@ -26,6 +26,10 @@
 #include "tsplog.h"
 #include "obj.h"
 
+#define	PGSIZE sysconf(_SC_PAGESIZE)
+#define PGOFFSET (PGSIZE - 1)
+#define PGMASK (~PGOFFSET)
+
 /*
  *  popup_GetSecret()
  *
@@ -43,7 +47,7 @@ popup_GetSecret(UINT32 new_pin, UINT32 hash_mode, BYTE *popup_str, void *auth_ha
 {
 	BYTE secret[UI_MAX_SECRET_STRING_LENGTH] = { 0 };
 	BYTE *dflt = (BYTE *)"TSS Authentication Dialog";
-	UINT32 secret_len;
+	UINT32 secret_len = 0;
 	TSS_RESULT result;
 
 	if (popup_str == NULL)
@@ -88,6 +92,8 @@ pin_mem(void *addr, size_t len)
 		return 0;
 	}
 
+	len += (uintptr_t)addr & PGOFFSET;
+	addr = (void *)((uintptr_t)addr & PGMASK);
 	if (mlock(addr, len) == -1) {
 		LogError("mlock: %s", strerror(errno));
 		return 1;
@@ -104,6 +110,8 @@ unpin_mem(void *addr, size_t len)
 		return 0;
 	}
 
+	len += (uintptr_t)addr & PGOFFSET;
+	addr = (void *)((uintptr_t)addr & PGMASK);
 	if (munlock(addr, len) == -1) {
 		LogError("mlock: %s", strerror(errno));
 		return 1;