aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/secmem.c11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/secmem.c b/src/secmem.c
index ad82dfb..dd1d3cc 100644
--- a/src/secmem.c
+++ b/src/secmem.c
@@ -619,12 +619,6 @@ _gpgrt_secmem_malloc_internal (size_t size, int xhint)
return NULL;
}
}
- if (not_locked && fips_mode ())
- {
- _gpgrt_log_info (_("secure memory pool is not locked while in FIPS mode\n"));
- _gpg_err_set_errno (ENOMEM);
- return NULL;
- }
if (show_warning && !suspend_warning)
{
show_warning = 0;
@@ -642,9 +636,8 @@ _gpgrt_secmem_malloc_internal (size_t size, int xhint)
}
/* If we are called from xmalloc style function resort to the
- * overflow pools to return memory. We don't do this in FIPS mode,
- * though. */
- if ((xhint || auto_expand) && !fips_mode ())
+ * overflow pools to return memory. */
+ if ((xhint || auto_expand))
{
for (pool = pool->next; pool; pool = pool->next)
{