From: Dr. Stephen Henson <steve@openssl.org>
Date: Thu, 27 Jan 2011 18:09:05 +0000 (+0000)
Subject: add FIPS API malloc/free
X-Git-Tag: OpenSSL-fips-2_0-rc1~831
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1097bde192a8e4e37a10d7129b3b60996f068f4b;p=oweals%2Fopenssl.git

add FIPS API malloc/free
---

diff --git a/fips/utl/fips_mem.c b/fips/utl/fips_mem.c
new file mode 100644
index 0000000000..d8f197bd45
--- /dev/null
+++ b/fips/utl/fips_mem.c
@@ -0,0 +1,84 @@
+/* fips/utl/fips_mem.c */
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
+ * project.
+ */
+/* ====================================================================
+ * Copyright (c) 2010 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    licensing@OpenSSL.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+
+#include <openssl/err.h>
+#include <openssl/fips.h>
+
+/* Default malloc implementations */
+
+static void *fips_malloc_def(int num, const char *file, int line)
+	{
+	return malloc(num);
+	}
+
+static void fips_free_def(void *x)
+	{
+	free(x);
+	}
+
+/* FIPS memory allocation callbacks */
+
+static void *(*fips_malloc_cb)(int num, const char *file, int line) =
+		fips_malloc_def;
+void (*fips_free_cb)(void *) =
+		fips_free_def;
+
+void *FIPS_malloc(int num, const char *file, int line)
+	{
+	return fips_malloc_cb(num, file, line);
+	}
+
+void FIPS_free(void *x)
+	{
+	fips_free_cb(x);
+	}