1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-10 02:45:11 +00:00
freebsd-ports/security/trousers/files/patch-src-tcs-ps-tcsps.c
Norikatsu Shigemura 7612f38ced Add trousers 0.3.6, is a CPL (Common Public License) licensed Trusted
Computing Software Stack.  It is mostly compliant with the TSS 1.2
specification.

Obtained from:	http://bsssd.sourceforge.net/
2010-11-07 12:05:27 +00:00

68 lines
1.4 KiB
C

--- src/tcs/ps/tcsps.c.orig 2010-05-02 11:39:11.000000000 +0900
+++ src/tcs/ps/tcsps.c 2010-10-24 21:04:04.833559489 +0900
@@ -24,6 +24,11 @@
#define LE_16 htole16
#define LE_32 htole32
#define LE_64 htole64
+#elif defined (HAVE_SYS_ENDIAN_H)
+#include <sys/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)
@@ -33,6 +38,26 @@
#include <fcntl.h>
#include <limits.h>
+#ifdef __sun
+#define LOCK_EX F_LOCK
+#define LOCK_UN F_ULOCK
+#define flock(fd, func) lockf(fd, func, 0)
+#endif
+
+#ifndef LOCK_SH
+#define LOCK_SH 1 /* shared lock */
+#endif
+#ifndef LOCK_EX
+#define LOCK_EX 2 /* exclusive lock */
+#endif
+#ifndef LOCK_NB
+#define LOCK_NB 4 /* don't block when locking */
+#endif
+#ifndef LOCK_UN
+#define LOCK_UN 8 /* unlock */
+#endif
+
+
#include "trousers/tss.h"
#include "trousers_types.h"
#include "tcsps.h"
@@ -43,6 +68,25 @@
#include "tcsd_wrap.h"
#include "tcsd.h"
+#ifndef LE_16
+static UINT16 htole16(UINT16 x)
+{
+ BYTE *b = &x;
+ return (UINT16) (b[0] + (b[1] << 8));
+}
+#define LE_16 htole16
+#endif
+
+#ifndef LE_32
+static UINT32 htole32(UINT32 x)
+{
+ BYTE *b = &x;
+ return (UINT32) (b[0] + (b[1] << 8) + (b[2] << 16) + (b[3] << 24));
+}
+#define LE_32 htole32
+#endif
+
+
int system_ps_fd = -1;
MUTEX_DECLARE(disk_cache_lock);