Index: trunk/include/samhain.h
===================================================================
--- trunk/include/samhain.h	(revision 132)
+++ trunk/include/samhain.h	(revision 133)
@@ -62,4 +62,5 @@
 #define KEY_LEN   48
 #define KEY_BLOCK 24
+#define KEYBUF_SIZE (KEY_LEN+1)
 
 /* The length of the compiled-in password.
Index: trunk/include/sh_pthread.h
===================================================================
--- trunk/include/sh_pthread.h	(revision 132)
+++ trunk/include/sh_pthread.h	(revision 133)
@@ -26,4 +26,9 @@
 #define SH_MUTEX_UNLOCK_UNSAFE(M) pthread_mutex_unlock(&(M))
 
+/* 
+ * ----   Global mutexes   ----
+ */
+SH_MUTEX_EXTERN(mutex_skey);
+
 #else
 
Index: trunk/include/sh_srp.h
===================================================================
--- trunk/include/sh_srp.h	(revision 132)
+++ trunk/include/sh_srp.h	(revision 133)
@@ -21,5 +21,5 @@
 void sh_srp_x (char * salt, char * password);
 int  sh_srp_make_a (void);
-char * sh_srp_M (char * x1, char * x2, char * x3);
+char * sh_srp_M (char * x1, char * x2, char * x3, char * buf, size_t size);
 
 char * sh_srp_verifier (void);
Index: trunk/include/sh_tiger.h
===================================================================
--- trunk/include/sh_tiger.h	(revision 132)
+++ trunk/include/sh_tiger.h	(revision 133)
@@ -7,4 +7,10 @@
 #include "samhain.h"
 
+typedef long int TigerType;
+
+#define TIGER_FILE -1;
+#define TIGER_DATA -2;
+
+/****************
 typedef enum {
   TIGER_FILE,
@@ -12,13 +18,12 @@
   TIGER_DATA
 } TigerType;
+*****************/
 
 #define TIGER_NOLIM ((UINT64)-1)
-
-extern SL_TICKET tiger_fd;
 
 /* the checksum function
  */
 /*@owned@*/ char * sh_tiger_hash (const char * filename, TigerType what, 
-				  UINT64 Length);
+				  UINT64 Length, char * out, size_t len);
 
 /* NEW Thu Oct 18 19:59:08 CEST 2001
@@ -26,9 +31,10 @@
 int sh_tiger_hashtype (const char * c);
 char * sh_tiger_generic_hash (char * filename, TigerType what, 
-			      UINT64 Length, int timeout);
+			      UINT64 Length, int timeout, 
+			      char * out, size_t len);
 
 UINT32 * sh_tiger_hash_uint32 (char * filename, 
 			       TigerType what, 
-			       UINT64 Length);
+			       UINT64 Length, UINT32 * out, size_t len);
 
 /* get the type of hash function used
@@ -37,5 +43,5 @@
 int sh_tiger_get_hashtype ();
 
-/* GnuPG-like format
+/* GnuPG-like format, returns allocated memory
  */
 /*@owned@*/ char * sh_tiger_hash_gpg (const char * filename, TigerType what,