asm volatile ("" : : "g" (ptr), "g" (len));
}
#else
-# define zap(ptr, len) memset((void *)(volatile void *)ptr, 0, len)
-#endif /* WIN32 */
+/* Use a function from libkrb5support to defeat inlining. */
+# define zap(ptr, len) krb5int_zap(ptr, len)
+#endif
/* Convenience function: zap and free ptr if it is non-NULL. */
static inline void
fake-addrinfo.o \
utf8.o \
utf8_conv.o \
+ zap.o \
$(IPC_ST_OBJ) \
$(STRLCPY_ST_OBJ) \
$(PRINTF_ST_OBJ) \
$(OUTPRE)fake-addrinfo.$(OBJEXT) \
$(OUTPRE)utf8.$(OBJEXT) \
$(OUTPRE)utf8_conv.$(OBJEXT) \
+ $(OUTPRE)zap.$(OBJEXT) \
$(IPC_OBJ) \
$(STRLCPY_OBJ) \
$(PRINTF_OBJ) \
$(srcdir)/printf.c \
$(srcdir)/mkstemp.c \
$(srcdir)/t_k5buf.c \
- $(srcdir)/t_unal.c
+ $(srcdir)/t_unal.c \
+ $(srcdir)/zap.c
SHLIB_EXPDEPS =
# Add -lm if dumping thread stats, for sqrt.
--- /dev/null
+/* -*- mode: c; indent-tabs-mode: nil -*- */
+
+/*
+ * zap.c
+ *
+ * Copyright 2008 Massachusetts Institute of Technology.
+ * All Rights Reserved.
+ *
+ * Export of this software from the United States of America may
+ * require a specific license from the United States Government.
+ * It is the responsibility of any person or organization contemplating
+ * export to obtain such a license before exporting.
+ *
+ * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and
+ * distribute this software and its documentation for any purpose and
+ * without fee is hereby granted, provided that the above copyright
+ * notice appear in all copies and that both that copyright notice and
+ * this permission notice appear in supporting documentation, and that
+ * the name of M.I.T. not be used in advertising or publicity pertaining
+ * to distribution of the software without specific, written prior
+ * permission. Furthermore if you modify this software you must label
+ * your software as modified software and not distribute it in such a
+ * fashion that it might be confused with the original M.I.T. software.
+ * M.I.T. makes no representations about the suitability of
+ * this software for any purpose. It is provided "as is" without express
+ * or implied warranty.
+ *
+ * krb5int_zap() is used by zap() (a static inline function defined in
+ * k5-int.h) on non-Windows, non-gcc compilers, in order to prevent the
+ * compiler from inlining and optimizing out the memset() call.
+ */
+
+#include <k5-platform.h>
+
+void krb5int_zap(void *ptr, size_t len)
+{
+ memset(ptr, 0, len);
+}