diff options
| author | NIIBE Yutaka <[email protected]> | 2018-09-06 00:22:24 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2018-09-06 01:16:46 +0000 |
| commit | 74dfa426d682906adb2679ad8e4a4824d3cd27e4 (patch) | |
| tree | 9f8695135ce4a519526b9c130c73c759a12530d1 | |
| parent | secmem.c migration into gpgrt. (diff) | |
| download | libgpg-error-74dfa426d682906adb2679ad8e4a4824d3cd27e4.tar.gz libgpg-error-74dfa426d682906adb2679ad8e4a4824d3cd27e4.zip | |
Remove fips_mode support originally available in libgcrypt.
* _gpgrt_secmem_malloc_internal: Remove fips_mode() call and its
handling.
| -rw-r--r-- | src/secmem.c | 11 |
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) { |