From 609df31a6a407092f7a92913c28b369d26e3a637 Mon Sep 17 00:00:00 2001
From: mdw <mdw>
Date: Sat, 17 Jun 2000 10:40:10 +0000
Subject: [PATCH] Support for secure memory arenas.

---
 arena.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 arena.h | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 160 insertions(+)
 create mode 100644 arena.c
 create mode 100644 arena.h

diff --git a/arena.c b/arena.c
new file mode 100644
index 0000000..947a8a2
--- /dev/null
+++ b/arena.c
@@ -0,0 +1,73 @@
+/* -*-c-*-
+ *
+ * $Id: arena.c,v 1.1 2000/06/17 10:40:10 mdw Exp $
+ *
+ * Abstraction for memory allocation arenas
+ *
+ * (c) 2000 Straylight/Edgeware
+ */
+
+/*----- Licensing notice --------------------------------------------------* 
+ *
+ * This file is part of Catacomb.
+ *
+ * Catacomb is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ * 
+ * Catacomb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with Catacomb; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA 02111-1307, USA.
+ */
+
+/*----- Revision history --------------------------------------------------* 
+ *
+ * $Log: arena.c,v $
+ * Revision 1.1  2000/06/17 10:40:10  mdw
+ * Support for secure memory arenas.
+ *
+ */
+
+/*----- Header files ------------------------------------------------------*/
+
+#include <mLib/arena.h>
+#include <mLib/sub.h>
+
+#include "arena.h"
+
+/*----- Global variables --------------------------------------------------*/
+
+arena *arena_secure = &arena_stdlib;
+subarena *arena_subsecure = &sub_global;
+
+/*----- Static variables --------------------------------------------------*/
+
+static subarena sub;
+
+/*----- Main code ---------------------------------------------------------*/
+
+/* --- @arena_setsecure@ --- *
+ *
+ * Arguments:	@arena *a@ = arena to use for secure allocation
+ *
+ * Returns:	---
+ *
+ * Use:		Call at the beginning of the program to set the arena for
+ *		secure allocations.
+ */
+
+void arena_setsecure(arena *a)
+{
+  arena_secure = a;
+  subarena_create(&sub, a);
+  arena_subsecure = &sub;
+}
+
+/*----- That's all, folks -------------------------------------------------*/
diff --git a/arena.h b/arena.h
new file mode 100644
index 0000000..ae1bf2a
--- /dev/null
+++ b/arena.h
@@ -0,0 +1,87 @@
+/* -*-c-*-
+ *
+ * $Id: arena.h,v 1.1 2000/06/17 10:40:10 mdw Exp $
+ *
+ * Abstraction for memory allocation arenas
+ *
+ * (c) 2000 Straylight/Edgeware
+ */
+
+/*----- Licensing notice --------------------------------------------------* 
+ *
+ * This file is part of Catacomb.
+ *
+ * Catacomb is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Library General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ * 
+ * Catacomb is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Library General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Library General Public
+ * License along with Catacomb; if not, write to the Free
+ * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
+ * MA 02111-1307, USA.
+ */
+
+/*----- Revision history --------------------------------------------------* 
+ *
+ * $Log: arena.h,v $
+ * Revision 1.1  2000/06/17 10:40:10  mdw
+ * Support for secure memory arenas.
+ *
+ */
+
+#ifndef CATACOMB_ARENA_H
+#define CATACOMB_ARENA_H
+
+#ifdef __cplusplus
+  extern "C" {
+#endif
+
+/*----- Header files ------------------------------------------------------*/
+
+#include <mLib/arena.h>
+#include <mLib/sub.h>
+
+/*----- Global variables --------------------------------------------------*/
+
+extern arena *arena_secure;
+extern subarena *arena_subsecure;
+
+/*----- Handy macros ------------------------------------------------------*/
+
+#define S_ALLOC(sz) A_ALLOC(arena_secure, sz)
+#define S_FREE(sz) A_FREE(arena_secure, sz)
+
+#define XS_ALLOC(sz) x_alloc(arena_secure, sz)
+#define XS_REALLOC(p, sz) x_realloc(arena_secure, p, sz)
+#define XS_FREE(p) x_free(arena_secure, p)
+
+#define S_CREATE(type) A_CREATE(arena_subsecure, type)
+#define S_DESTROY(p) A_DESTROY(arena_subsecure, p)
+
+/*----- Functions provided ------------------------------------------------*/
+
+/* --- @arena_setsecure@ --- *
+ *
+ * Arguments:	@arena *a@ = arena to use for secure allocation
+ *
+ * Returns:	---
+ *
+ * Use:		Call at the beginning of the program to set the arena for
+ *		secure allocations.
+ */
+
+extern void arena_setsecure(arena */*a*/);
+
+/*----- That's all, folks -------------------------------------------------*/
+
+#ifdef __cplusplus
+  }
+#endif
+
+#endif
-- 
2.11.0