diff options
Diffstat (limited to 'util')
| -rw-r--r-- | util/ChangeLog | 5 | ||||
| -rw-r--r-- | util/secmem.c | 14 |
2 files changed, 14 insertions, 5 deletions
diff --git a/util/ChangeLog b/util/ChangeLog index 226f24592..70a95c758 100644 --- a/util/ChangeLog +++ b/util/ChangeLog @@ -1,3 +1,8 @@ +2007-04-16 David Shaw <[email protected]> + + * secmem.c (init_pool): Use sysconf() if available to determine + page size. + 2007-04-15 David Shaw <[email protected]> * argparse.c (default_strusage): Copyright 2007. diff --git a/util/secmem.c b/util/secmem.c index a0248dae1..dc8a8f087 100644 --- a/util/secmem.c +++ b/util/secmem.c @@ -1,5 +1,6 @@ /* secmem.c - memory allocation from a secure heap - * Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc. + * Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, + * 2007 Free Software Foundation, Inc. * * This file is part of GnuPG. * @@ -218,19 +219,22 @@ lock_pool( void *p, size_t n ) static void init_pool( size_t n) { - size_t pgsize; + size_t pgsize=-1; poolsize = n; if( disable_secmem ) log_bug("secure memory is disabled"); -#ifdef HAVE_GETPAGESIZE +#if defined(HAVE_SYSCONF) && defined(_SC_PAGESIZE) + pgsize = sysconf(_SC_PAGESIZE); +#elif defined(HAVE_GETPAGESIZE) pgsize = getpagesize(); -#else - pgsize = 4096; #endif + if(pgsize==-1) + pgsize = 4096; + #ifdef HAVE_MMAP poolsize = (poolsize + pgsize -1 ) & ~(pgsize-1); #ifdef MAP_ANONYMOUS |