diff --git a/acinclude.m4 b/acinclude.m4
index 96be8330..90b3cb96 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -1,396 +1,396 @@
 dnl macros to configure Libgcrypt
 dnl Copyright (C) 1998, 1999, 2000, 2001, 2002,
 dnl               2003 Free Software Foundation, Inc.
 dnl Copyright (C) 2013 g10 Code GmbH
 dnl
 dnl This file is part of Libgcrypt.
 dnl
 dnl Libgcrypt is free software; you can redistribute it and/or modify
 dnl it under the terms of the GNU Lesser General Public License as
 dnl published by the Free Software Foundation; either version 2.1 of
 dnl the License, or (at your option) any later version.
 dnl
 dnl Libgcrypt is distributed in the hope that it will be useful,
 dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
 dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 dnl GNU Lesser General Public License for more details.
 dnl
 dnl You should have received a copy of the GNU Lesser General Public
 dnl License along with this program; if not, write to the Free Software
 dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 
 dnl GCRY_MSG_SHOW(PREFIX,STRING)
 dnl Print a message with a prefix.
 dnl
 define([GCRY_MSG_SHOW],
   [
      echo "        $1 $2" 1>&AS_MESSAGE_FD([])
   ])
 
 dnl GCRY_MSG_WRAP(PREFIX, ALGOLIST)
 dnl Print a nicely formatted list of algorithms
 dnl with an approriate line wrap.
 dnl
 define([GCRY_MSG_WRAP],
   [
     tmp="        $1"
     tmpi="abc"
     if test "${#tmpi}" -ne 3 >/dev/null 2>&1 ; then
       dnl Without a POSIX shell, we don't botter to wrap it
       echo "$tmp $2" 1>&AS_MESSAGE_FD([])
     else
       tmpi=`echo "$tmp"| sed 's/./ /g'`
       echo $2 EOF | tr ' ' '\n' | \
         while read word; do
           if test "${#tmp}" -gt 70 ; then
             echo "$tmp" 1>&AS_MESSAGE_FD([])
             tmp="$tmpi"
           fi
           if test "$word" = "EOF" ; then
             echo "$tmp" 1>&AS_MESSAGE_FD([])
           else
             tmp="$tmp $word"
           fi
         done
     fi
   ])
 
 
 dnl GNUPG_CHECK_TYPEDEF(TYPE, HAVE_NAME)
 dnl Check whether a typedef exists and create a #define $2 if it exists
 dnl
 AC_DEFUN([GNUPG_CHECK_TYPEDEF],
   [ AC_MSG_CHECKING(for $1 typedef)
     AC_CACHE_VAL(gnupg_cv_typedef_$1,
     [AC_TRY_COMPILE([#define _GNU_SOURCE 1
     #include <stdlib.h>
     #include <sys/types.h>], [
     #undef $1
     int a = sizeof($1);
     ], gnupg_cv_typedef_$1=yes, gnupg_cv_typedef_$1=no )])
     AC_MSG_RESULT($gnupg_cv_typedef_$1)
     if test "$gnupg_cv_typedef_$1" = yes; then
         AC_DEFINE($2,1,[Defined if a `]$1[' is typedef'd])
     fi
   ])
 
 
 dnl GNUPG_CHECK_GNUMAKE
 dnl
 AC_DEFUN([GNUPG_CHECK_GNUMAKE],
   [
     if ${MAKE-make} --version 2>/dev/null | grep '^GNU ' >/dev/null 2>&1; then
         :
     else
         AC_MSG_WARN([[
 ***
 *** It seems that you are not using GNU make.  Some make tools have serious
 *** flaws and you may not be able to build this software at all. Before you
 *** complain, please try GNU make:  GNU make is easy to build and available
 *** at all GNU archives.  It is always available from ftp.gnu.org:/gnu/make.
 ***]])
     fi
   ])
 
 
 #
 # GNUPG_SYS_SYMBOL_UNDERSCORE
 # Does the compiler prefix global symbols with an underscore?
 #
 # Taken from GnuPG 1.2 and modified to use the libtool macros.
 AC_DEFUN([GNUPG_SYS_SYMBOL_UNDERSCORE],
 [tmp_do_check="no"
 case "${host}" in
     i?86-mingw32* | i?86-*-mingw32*)
         ac_cv_sys_symbol_underscore=yes
         ;;
     x86_64-*-mingw32*)
         ac_cv_sys_symbol_underscore=no
         ;;
     i386-emx-os2 | i[3456]86-pc-os2*emx | i386-pc-msdosdjgpp)
         ac_cv_sys_symbol_underscore=yes
         ;;
     *)
       if test "$cross_compiling" = yes; then
         if test "x$ac_cv_sys_symbol_underscore" = x ; then
            ac_cv_sys_symbol_underscore=yes
         fi
       else
          tmp_do_check="yes"
       fi
        ;;
 esac
 if test "$tmp_do_check" = "yes"; then
   AC_REQUIRE([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])
   AC_MSG_CHECKING([for _ prefix in compiled symbols])
   AC_CACHE_VAL(ac_cv_sys_symbol_underscore,
   [ac_cv_sys_symbol_underscore=no
    cat > conftest.$ac_ext <<EOF
       void nm_test_func(){}
       int main(){nm_test_func;return 0;}
 EOF
   if AC_TRY_EVAL(ac_compile); then
     # Now try to grab the symbols.
     ac_nlist=conftest.nm
     if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \| cut -d \' \' -f 2 \> $ac_nlist) && test -s "$ac_nlist"; then
       # See whether the symbols have a leading underscore.
       if egrep '^_nm_test_func' "$ac_nlist" >/dev/null; then
         ac_cv_sys_symbol_underscore=yes
       else
         if egrep '^nm_test_func ' "$ac_nlist" >/dev/null; then
           :
         else
           echo "configure: cannot find nm_test_func in $ac_nlist" >&AC_FD_CC
         fi
       fi
     else
       echo "configure: cannot run $lt_cv_sys_global_symbol_pipe" >&AC_FD_CC
     fi
   else
     echo "configure: failed program was:" >&AC_FD_CC
     cat conftest.c >&AC_FD_CC
   fi
   rm -rf conftest*
   ])
   else
   AC_MSG_CHECKING([for _ prefix in compiled symbols])
   fi
 AC_MSG_RESULT($ac_cv_sys_symbol_underscore)
 if test x$ac_cv_sys_symbol_underscore = xyes; then
   AC_DEFINE(WITH_SYMBOL_UNDERSCORE,1,
             [Defined if compiled symbols have a leading underscore])
 fi
 ])
 
 
 ######################################################################
 # Check whether mlock is broken (hpux 10.20 raises a SIGBUS if mlock
 # is not called from uid 0 (not tested whether uid 0 works)
 # For DECs Tru64 we have also to check whether mlock is in librt
 # mlock is there a macro using memlk()
 ######################################################################
 dnl GNUPG_CHECK_MLOCK
 dnl
 define(GNUPG_CHECK_MLOCK,
   [ AC_CHECK_FUNCS(mlock)
     if test "$ac_cv_func_mlock" = "no"; then
         AC_CHECK_HEADERS(sys/mman.h)
         if test "$ac_cv_header_sys_mman_h" = "yes"; then
             # Add librt to LIBS:
             AC_CHECK_LIB(rt, memlk)
             AC_CACHE_CHECK([whether mlock is in sys/mman.h],
                             gnupg_cv_mlock_is_in_sys_mman,
                 [AC_TRY_LINK([
                     #include <assert.h>
                     #ifdef HAVE_SYS_MMAN_H
                     #include <sys/mman.h>
                     #endif
                 ], [
 int i;
 
 /* glibc defines this for functions which it implements
  * to always fail with ENOSYS.  Some functions are actually
  * named something starting with __ and the normal name
  * is an alias.  */
 #if defined (__stub_mlock) || defined (__stub___mlock)
 choke me
 #else
 mlock(&i, 4);
 #endif
 ; return 0;
                 ],
                 gnupg_cv_mlock_is_in_sys_mman=yes,
                 gnupg_cv_mlock_is_in_sys_mman=no)])
             if test "$gnupg_cv_mlock_is_in_sys_mman" = "yes"; then
                 AC_DEFINE(HAVE_MLOCK,1,
                           [Defined if the system supports an mlock() call])
             fi
         fi
     fi
     if test "$ac_cv_func_mlock" = "yes"; then
         AC_CHECK_FUNCS(sysconf getpagesize)
         AC_MSG_CHECKING(whether mlock is broken)
           AC_CACHE_VAL(gnupg_cv_have_broken_mlock,
              AC_TRY_RUN([
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
 #include <sys/mman.h>
 #include <sys/types.h>
 #include <fcntl.h>
 
 int main()
 {
     char *pool;
     int err;
     long int pgsize;
 
 #if defined(HAVE_SYSCONF) && defined(_SC_PAGESIZE)
     pgsize = sysconf (_SC_PAGESIZE);
 #elif defined (HAVE_GETPAGESIZE)
     pgsize = getpagesize();
 #else
     pgsize = -1;
 #endif
 
     if (pgsize == -1)
       pgsize = 4096;
 
     pool = malloc( 4096 + pgsize );
     if( !pool )
         return 2;
     pool += (pgsize - ((long int)pool % pgsize));
 
     err = mlock( pool, 4096 );
-    if( !err || errno == EPERM )
+    if( !err || errno == EPERM || errno == EGAIN)
         return 0; /* okay */
 
     return 1;  /* hmmm */
 }
 
             ],
             gnupg_cv_have_broken_mlock="no",
             gnupg_cv_have_broken_mlock="yes",
             gnupg_cv_have_broken_mlock="assume-no"
            )
          )
          if test "$gnupg_cv_have_broken_mlock" = "yes"; then
              AC_DEFINE(HAVE_BROKEN_MLOCK,1,
                        [Defined if the mlock() call does not work])
              AC_MSG_RESULT(yes)
          else
             if test "$gnupg_cv_have_broken_mlock" = "no"; then
                 AC_MSG_RESULT(no)
             else
                 AC_MSG_RESULT(assuming no)
             fi
          fi
     fi
   ])
 
 # GNUPG_SYS_LIBTOOL_CYGWIN32 - find tools needed on cygwin32
 AC_DEFUN([GNUPG_SYS_LIBTOOL_CYGWIN32],
 [AC_CHECK_TOOL(DLLTOOL, dlltool, false)
 AC_CHECK_TOOL(AS, as, false)
 ])
 
 dnl LIST_MEMBER()
 dnl Check wether an element ist contained in a list.  Set `found' to
 dnl `1' if the element is found in the list, to `0' otherwise.
 AC_DEFUN([LIST_MEMBER],
 [
 name=$1
 list=$2
 found=0
 
 for n in $list; do
   if test "x$name" = "x$n"; then
     found=1
   fi
 done
 ])
 
 
 dnl Check for socklen_t: historically on BSD it is an int, and in
 dnl POSIX 1g it is a type of its own, but some platforms use different
 dnl types for the argument to getsockopt, getpeername, etc.  So we
 dnl have to test to find something that will work.
 AC_DEFUN([TYPE_SOCKLEN_T],
 [
    AC_CHECK_TYPE([socklen_t], ,[
       AC_MSG_CHECKING([for socklen_t equivalent])
       AC_CACHE_VAL([socklen_t_equiv],
       [
          # Systems have either "struct sockaddr *" or
          # "void *" as the second argument to getpeername
          socklen_t_equiv=
          for arg2 in "struct sockaddr" void; do
             for t in int size_t unsigned long "unsigned long"; do
                AC_TRY_COMPILE([
 #include <sys/types.h>
 #include <sys/socket.h>
 
 int getpeername (int, $arg2 *, $t *);
                ],[
                   $t len;
                   getpeername(0,0,&len);
                ],[
                   socklen_t_equiv="$t"
                   break
                ])
             done
          done
 
          if test "x$socklen_t_equiv" = x; then
             AC_MSG_ERROR([Cannot find a type to use in place of socklen_t])
          fi
       ])
       AC_MSG_RESULT($socklen_t_equiv)
       AC_DEFINE_UNQUOTED(socklen_t, $socklen_t_equiv,
 			[type to use in place of socklen_t if not defined])],
       [#include <sys/types.h>
 #include <sys/socket.h>])
 ])
 
 
 # GNUPG_PTH_VERSION_CHECK(REQUIRED)
 #
 # If the version is sufficient, HAVE_PTH will be set to yes.
 #
 # Taken form the m4 macros which come with Pth
 AC_DEFUN([GNUPG_PTH_VERSION_CHECK],
   [
     _pth_version=`$PTH_CONFIG --version | awk 'NR==1 {print [$]3}'`
     _req_version="ifelse([$1],,1.2.0,$1)"
 
     AC_MSG_CHECKING(for PTH - version >= $_req_version)
     for _var in _pth_version _req_version; do
         eval "_val=\"\$${_var}\""
         _major=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\1/'`
         _minor=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\2/'`
         _rtype=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\3/'`
         _micro=`echo $_val | sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\([[ab.]]\)\([[0-9]]*\)/\4/'`
         case $_rtype in
             "a" ) _rtype=0 ;;
             "b" ) _rtype=1 ;;
             "." ) _rtype=2 ;;
         esac
         _hex=`echo dummy | awk '{ printf("%d%02d%1d%02d", major, minor, rtype, micro); }' \
               "major=$_major" "minor=$_minor" "rtype=$_rtype" "micro=$_micro"`
         eval "${_var}_hex=\"\$_hex\""
     done
     have_pth=no
     if test ".$_pth_version_hex" != .; then
         if test ".$_req_version_hex" != .; then
             if test $_pth_version_hex -ge $_req_version_hex; then
                 have_pth=yes
             fi
         fi
     fi
     if test $have_pth = yes; then
        AC_MSG_RESULT(yes)
        AC_MSG_CHECKING([whether PTH installation is sane])
        AC_CACHE_VAL(gnupg_cv_pth_is_sane,[
          _gnupg_pth_save_cflags=$CFLAGS
          _gnupg_pth_save_ldflags=$LDFLAGS
          _gnupg_pth_save_libs=$LIBS
          CFLAGS="$CFLAGS `$PTH_CONFIG --cflags`"
          LDFLAGS="$LDFLAGS `$PTH_CONFIG --ldflags`"
          LIBS="$LIBS `$PTH_CONFIG --libs`"
          AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pth.h>
                                          ],
                                          [[ pth_init ();]])],
                         gnupg_cv_pth_is_sane=yes,
                         gnupg_cv_pth_is_sane=no)
          CFLAGS=$_gnupg_pth_save_cflags
          LDFLAGS=$_gnupg_pth_save_ldflags
          LIBS=$_gnupg_pth_save_libs
        ])
        if test $gnupg_cv_pth_is_sane != yes; then
           have_pth=no
        fi
        AC_MSG_RESULT($gnupg_cv_pth_is_sane)
     else
        AC_MSG_RESULT(no)
     fi
   ])
diff --git a/src/secmem.c b/src/secmem.c
index 4fa267b6..55424f21 100644
--- a/src/secmem.c
+++ b/src/secmem.c
@@ -1,878 +1,878 @@
 /* secmem.c  -	memory allocation from a secure heap
  * Copyright (C) 1998, 1999, 2000, 2001, 2002,
  *               2003, 2007 Free Software Foundation, Inc.
  * Copyright (C) 2013, 2016 g10 Code GmbH
  *
  * This file is part of Libgcrypt.
  *
  * Libgcrypt is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser general Public License as
  * published by the Free Software Foundation; either version 2.1 of
  * the License, or (at your option) any later version.
  *
  * Libgcrypt 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 Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
 #include <stdarg.h>
 #include <unistd.h>
 #include <stddef.h>
 
 #if defined(HAVE_MLOCK) || defined(HAVE_MMAP)
 #include <sys/mman.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #ifdef USE_CAPABILITIES
 #include <sys/capability.h>
 #endif
 #endif
 
 #include "g10lib.h"
 #include "secmem.h"
 
 #if defined (MAP_ANON) && ! defined (MAP_ANONYMOUS)
 #define MAP_ANONYMOUS MAP_ANON
 #endif
 
 #define MINIMUM_POOL_SIZE 16384
 #define STANDARD_POOL_SIZE 32768
 #define DEFAULT_PAGE_SIZE 4096
 
 typedef struct memblock
 {
   unsigned size;		/* Size of the memory available to the
 				   user.  */
   int flags;			/* See below.  */
   PROPERLY_ALIGNED_TYPE aligned;
 } memblock_t;
 
 /* This flag specifies that the memory block is in use.  */
 #define MB_FLAG_ACTIVE (1 << 0)
 
 /* An object describing a memory pool.  */
 typedef struct pooldesc_s
 {
   /* A link to the next pool.  This is used to connect the overflow
    * pools.  */
   struct pooldesc_s *next;
 
   /* A memory buffer used as allocation pool.  */
   void *mem;
 
   /* The allocated size of MEM. */
   size_t size;
 
   /* Flag indicating that this memory pool is ready for use.  May be
    * checked in an atexit function.  */
   volatile int okay;
 
   /* Flag indicating whether MEM is mmapped.  */
   volatile int is_mmapped;
 
   /* The number of allocated bytes and the number of used blocks in
    * this pool.  */
   unsigned int cur_alloced, cur_blocks;
 } pooldesc_t;
 
 
 /* The pool of secure memory.  This is the head of a linked list with
  * the first element being the standard mlock-ed pool and the
  * following elements being the overflow pools. */
 static pooldesc_t mainpool;
 
 
 /* A couple of flags whith some beeing set early. */
 static int disable_secmem;
 static int show_warning;
 static int not_locked;
 static int no_warning;
 static int suspend_warning;
 static int no_mlock;
 static int no_priv_drop;
 
 /* Lock protecting accesses to the memory pools.  */
 GPGRT_LOCK_DEFINE (secmem_lock);
 
 /* Convenient macros.  */
 #define SECMEM_LOCK   gpgrt_lock_lock   (&secmem_lock)
 #define SECMEM_UNLOCK gpgrt_lock_unlock (&secmem_lock)
 
 /* The size of the memblock structure; this does not include the
    memory that is available to the user.  */
 #define BLOCK_HEAD_SIZE \
   offsetof (memblock_t, aligned)
 
 /* Convert an address into the according memory block structure.  */
 #define ADDR_TO_BLOCK(addr) \
   (memblock_t *) (void *) ((char *) addr - BLOCK_HEAD_SIZE)
 
 /* Check whether P points into POOL.  */
 static inline int
 ptr_into_pool_p (pooldesc_t *pool, const void *p)
 {
   /* We need to convert pointers to addresses.  This is required by
      C-99 6.5.8 to avoid undefined behaviour.  See also
      http://lists.gnupg.org/pipermail/gcrypt-devel/2007-February/001102.html
   */
   uintptr_t p_addr    = (uintptr_t)p;
   uintptr_t pool_addr = (uintptr_t)pool->mem;
 
   return p_addr >= pool_addr && p_addr <  pool_addr + pool->size;
 }
 
 /* Update the stats.  */
 static void
 stats_update (pooldesc_t *pool, size_t add, size_t sub)
 {
   if (add)
     {
       pool->cur_alloced += add;
       pool->cur_blocks++;
     }
   if (sub)
     {
       pool->cur_alloced -= sub;
       pool->cur_blocks--;
     }
 }
 
 /* Return the block following MB or NULL, if MB is the last block.  */
 static memblock_t *
 mb_get_next (pooldesc_t *pool, memblock_t *mb)
 {
   memblock_t *mb_next;
 
   mb_next = (memblock_t *) (void *) ((char *) mb + BLOCK_HEAD_SIZE + mb->size);
 
   if (! ptr_into_pool_p (pool, mb_next))
     mb_next = NULL;
 
   return mb_next;
 }
 
 /* Return the block preceding MB or NULL, if MB is the first
    block.  */
 static memblock_t *
 mb_get_prev (pooldesc_t *pool, memblock_t *mb)
 {
   memblock_t *mb_prev, *mb_next;
 
   if (mb == pool->mem)
     mb_prev = NULL;
   else
     {
       mb_prev = (memblock_t *) pool->mem;
       while (1)
 	{
 	  mb_next = mb_get_next (pool, mb_prev);
 	  if (mb_next == mb)
 	    break;
 	  else
 	    mb_prev = mb_next;
 	}
     }
 
   return mb_prev;
 }
 
 /* If the preceding block of MB and/or the following block of MB
    exist and are not active, merge them to form a bigger block.  */
 static void
 mb_merge (pooldesc_t *pool, memblock_t *mb)
 {
   memblock_t *mb_prev, *mb_next;
 
   mb_prev = mb_get_prev (pool, mb);
   mb_next = mb_get_next (pool, mb);
 
   if (mb_prev && (! (mb_prev->flags & MB_FLAG_ACTIVE)))
     {
       mb_prev->size += BLOCK_HEAD_SIZE + mb->size;
       mb = mb_prev;
     }
   if (mb_next && (! (mb_next->flags & MB_FLAG_ACTIVE)))
     mb->size += BLOCK_HEAD_SIZE + mb_next->size;
 }
 
 /* Return a new block, which can hold SIZE bytes.  */
 static memblock_t *
 mb_get_new (pooldesc_t *pool, memblock_t *block, size_t size)
 {
   memblock_t *mb, *mb_split;
 
   for (mb = block; ptr_into_pool_p (pool, mb); mb = mb_get_next (pool, mb))
     if (! (mb->flags & MB_FLAG_ACTIVE) && mb->size >= size)
       {
 	/* Found a free block.  */
 	mb->flags |= MB_FLAG_ACTIVE;
 
 	if (mb->size - size > BLOCK_HEAD_SIZE)
 	  {
 	    /* Split block.  */
 
 	    mb_split = (memblock_t *) (void *) (((char *) mb) + BLOCK_HEAD_SIZE
 						+ size);
 	    mb_split->size = mb->size - size - BLOCK_HEAD_SIZE;
 	    mb_split->flags = 0;
 
 	    mb->size = size;
 
 	    mb_merge (pool, mb_split);
 
 	  }
 
 	break;
       }
 
   if (! ptr_into_pool_p (pool, mb))
     {
       gpg_err_set_errno (ENOMEM);
       mb = NULL;
     }
 
   return mb;
 }
 
 /* Print a warning message.  */
 static void
 print_warn (void)
 {
   if (!no_warning)
     log_info (_("Warning: using insecure memory!\n"));
 }
 
 
 /* Lock the memory pages of pool P of size N into core and drop
  * privileges.  */
 static void
 lock_pool_pages (void *p, size_t n)
 {
 #if defined(USE_CAPABILITIES) && defined(HAVE_MLOCK)
   int err;
 
   {
     cap_t cap;
 
     if (!no_priv_drop)
       {
         cap = cap_from_text ("cap_ipc_lock+ep");
         cap_set_proc (cap);
         cap_free (cap);
       }
     err = no_mlock? 0 : mlock (p, n);
     if (err && errno)
       err = errno;
     if (!no_priv_drop)
       {
         cap = cap_from_text ("cap_ipc_lock+p");
         cap_set_proc (cap);
         cap_free(cap);
       }
   }
 
   if (err)
     {
-      if (errno != EPERM
-#ifdef EAGAIN	/* OpenBSD returns this */
-	  && errno != EAGAIN
+      if (err != EPERM
+#ifdef EAGAIN	/* BSD and also Linux may return EAGAIN */
+	  && err != EAGAIN
 #endif
 #ifdef ENOSYS	/* Some SCOs return this (function not implemented) */
-	  && errno != ENOSYS
+	  && err != ENOSYS
 #endif
 #ifdef ENOMEM  /* Linux might return this. */
-            && errno != ENOMEM
+            && err != ENOMEM
 #endif
 	  )
 	log_error ("can't lock memory: %s\n", strerror (err));
       show_warning = 1;
       not_locked = 1;
     }
 
 #elif defined(HAVE_MLOCK)
   uid_t uid;
   int err;
 
   uid = getuid ();
 
 #ifdef HAVE_BROKEN_MLOCK
   /* Under HP/UX mlock segfaults if called by non-root.  Note, we have
      noch checked whether mlock does really work under AIX where we
      also detected a broken nlock.  Note further, that using plock ()
      is not a good idea under AIX. */
   if (uid)
     {
       errno = EPERM;
       err = errno;
     }
   else
     {
       err = no_mlock? 0 : mlock (p, n);
       if (err && errno)
 	err = errno;
     }
 #else /* !HAVE_BROKEN_MLOCK */
   err = no_mlock? 0 : mlock (p, n);
   if (err && errno)
     err = errno;
 #endif /* !HAVE_BROKEN_MLOCK */
 
   /* Test whether we are running setuid(0).  */
   if (uid && ! geteuid ())
     {
       /* Yes, we are.  */
       if (!no_priv_drop)
         {
           /* Check that we really dropped the privs.
            * Note: setuid(0) should always fail */
           if (setuid (uid) || getuid () != geteuid () || !setuid (0))
             log_fatal ("failed to reset uid: %s\n", strerror (errno));
         }
     }
 
   if (err)
     {
-      if (errno != EPERM
-#ifdef EAGAIN	/* OpenBSD returns this. */
-	  && errno != EAGAIN
+      if (err != EPERM
+#ifdef EAGAIN	/* BSD and also Linux may return this. */
+	  && err != EAGAIN
 #endif
 #ifdef ENOSYS	/* Some SCOs return this (function not implemented). */
-	  && errno != ENOSYS
+	  && err != ENOSYS
 #endif
 #ifdef ENOMEM  /* Linux might return this. */
-            && errno != ENOMEM
+            && err != ENOMEM
 #endif
 	  )
 	log_error ("can't lock memory: %s\n", strerror (err));
       show_warning = 1;
       not_locked = 1;
     }
 
 #elif defined ( __QNX__ )
   /* QNX does not page at all, so the whole secure memory stuff does
    * not make much sense.  However it is still of use because it
    * wipes out the memory on a free().
    * Therefore it is sufficient to suppress the warning.  */
   (void)p;
   (void)n;
 #elif defined (HAVE_DOSISH_SYSTEM) || defined (__CYGWIN__)
     /* It does not make sense to print such a warning, given the fact that
      * this whole Windows !@#$% and their user base are inherently insecure. */
   (void)p;
   (void)n;
 #elif defined (__riscos__)
     /* No virtual memory on RISC OS, so no pages are swapped to disc,
      * besides we don't have mmap, so we don't use it! ;-)
      * But don't complain, as explained above.  */
   (void)p;
   (void)n;
 #else
   (void)p;
   (void)n;
   if (!no_mlock)
     log_info ("Please note that you don't have secure memory on this system\n");
 #endif
 }
 
 /* Initialize POOL.  */
 static void
 init_pool (pooldesc_t *pool, size_t n)
 {
   memblock_t *mb;
 
   pool->size = n;
 
   if (disable_secmem)
     log_bug ("secure memory is disabled");
 
 
 #if HAVE_MMAP
   {
     size_t pgsize;
     long int pgsize_val;
 
 # if defined(HAVE_SYSCONF) && defined(_SC_PAGESIZE)
     pgsize_val = sysconf (_SC_PAGESIZE);
 # elif defined(HAVE_GETPAGESIZE)
     pgsize_val = getpagesize ();
 # else
     pgsize_val = -1;
 # endif
     pgsize = (pgsize_val != -1 && pgsize_val > 0)? pgsize_val:DEFAULT_PAGE_SIZE;
 
     pool->size = (pool->size + pgsize - 1) & ~(pgsize - 1);
 # ifdef MAP_ANONYMOUS
     pool->mem = mmap (0, pool->size, PROT_READ | PROT_WRITE,
                      MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
 # else /* map /dev/zero instead */
     {
       int fd;
 
       fd = open ("/dev/zero", O_RDWR);
       if (fd == -1)
         {
           log_error ("can't open /dev/zero: %s\n", strerror (errno));
           pool->mem = (void *) -1;
         }
       else
         {
           pool->mem = mmap (0, pool->size,
                            (PROT_READ | PROT_WRITE), MAP_PRIVATE, fd, 0);
           close (fd);
         }
     }
 # endif
     if (pool->mem == (void *) -1)
       log_info ("can't mmap pool of %u bytes: %s - using malloc\n",
                 (unsigned) pool->size, strerror (errno));
     else
       {
         pool->is_mmapped = 1;
         pool->okay = 1;
       }
   }
 #endif /*HAVE_MMAP*/
 
   if (!pool->okay)
     {
       pool->mem = malloc (pool->size);
       if (!pool->mem)
 	log_fatal ("can't allocate memory pool of %u bytes\n",
 		   (unsigned) pool->size);
       else
 	pool->okay = 1;
     }
 
   /* Initialize first memory block.  */
   mb = (memblock_t *) pool->mem;
   mb->size = pool->size;
   mb->flags = 0;
 }
 
 void
 _gcry_secmem_set_flags (unsigned flags)
 {
   int was_susp;
 
   SECMEM_LOCK;
 
   was_susp = suspend_warning;
   no_warning = flags & GCRY_SECMEM_FLAG_NO_WARNING;
   suspend_warning = flags & GCRY_SECMEM_FLAG_SUSPEND_WARNING;
   no_mlock      = flags & GCRY_SECMEM_FLAG_NO_MLOCK;
   no_priv_drop = flags & GCRY_SECMEM_FLAG_NO_PRIV_DROP;
 
   /* and now issue the warning if it is not longer suspended */
   if (was_susp && !suspend_warning && show_warning)
     {
       show_warning = 0;
       print_warn ();
     }
 
   SECMEM_UNLOCK;
 }
 
 unsigned int
 _gcry_secmem_get_flags (void)
 {
   unsigned flags;
 
   SECMEM_LOCK;
 
   flags = no_warning ? GCRY_SECMEM_FLAG_NO_WARNING : 0;
   flags |= suspend_warning ? GCRY_SECMEM_FLAG_SUSPEND_WARNING : 0;
   flags |= not_locked ? GCRY_SECMEM_FLAG_NOT_LOCKED : 0;
   flags |= no_mlock ? GCRY_SECMEM_FLAG_NO_MLOCK : 0;
   flags |= no_priv_drop ? GCRY_SECMEM_FLAG_NO_PRIV_DROP : 0;
 
   SECMEM_UNLOCK;
 
   return flags;
 }
 
 
 /* This function initializes the main memory pool MAINPOOL.  Itis
  * expected to be called with the secmem lock held.  */
 static void
 _gcry_secmem_init_internal (size_t n)
 {
   pooldesc_t *pool;
 
   pool = &mainpool;
   if (!n)
     {
 #ifdef USE_CAPABILITIES
       /* drop all capabilities */
       if (!no_priv_drop)
         {
           cap_t cap;
 
           cap = cap_from_text ("all-eip");
           cap_set_proc (cap);
           cap_free (cap);
         }
 
 #elif !defined(HAVE_DOSISH_SYSTEM)
       uid_t uid;
 
       disable_secmem = 1;
       uid = getuid ();
       if (uid != geteuid ())
 	{
 	  if (setuid (uid) || getuid () != geteuid () || !setuid (0))
 	    log_fatal ("failed to drop setuid\n");
 	}
 #endif
     }
   else
     {
       if (n < MINIMUM_POOL_SIZE)
 	n = MINIMUM_POOL_SIZE;
       if (! pool->okay)
 	{
 	  init_pool (pool, n);
 	  lock_pool_pages (pool->mem, n);
 	}
       else
 	log_error ("Oops, secure memory pool already initialized\n");
     }
 }
 
 
 
 /* Initialize the secure memory system.  If running with the necessary
    privileges, the secure memory pool will be locked into the core in
    order to prevent page-outs of the data.  Furthermore allocated
    secure memory will be wiped out when released.  */
 void
 _gcry_secmem_init (size_t n)
 {
   SECMEM_LOCK;
 
   _gcry_secmem_init_internal (n);
 
   SECMEM_UNLOCK;
 }
 
 
 gcry_err_code_t
 _gcry_secmem_module_init ()
 {
   /* Not anymore needed.  */
   return 0;
 }
 
 
 static void *
 _gcry_secmem_malloc_internal (size_t size, int xhint)
 {
   pooldesc_t *pool;
   memblock_t *mb;
 
   pool = &mainpool;
 
   if (!pool->okay)
     {
       /* Try to initialize the pool if the user forgot about it.  */
       _gcry_secmem_init_internal (STANDARD_POOL_SIZE);
       if (!pool->okay)
         {
           log_info (_("operation is not possible without "
                       "initialized secure memory\n"));
           gpg_err_set_errno (ENOMEM);
           return NULL;
         }
     }
   if (not_locked && fips_mode ())
     {
       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;
       print_warn ();
     }
 
   /* Blocks are always a multiple of 32. */
   size = ((size + 31) / 32) * 32;
 
   mb = mb_get_new (pool, (memblock_t *) pool->mem, size);
   if (mb)
     {
       stats_update (pool, size, 0);
       return &mb->aligned.c;
     }
 
   /* 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 && !fips_mode ())
     {
       for (pool = pool->next; pool; pool = pool->next)
         {
           mb = mb_get_new (pool, (memblock_t *) pool->mem, size);
           if (mb)
             {
               stats_update (pool, size, 0);
               return &mb->aligned.c;
             }
         }
       /* Allocate a new overflow pool.  We put a new pool right after
        * the mainpool so that the next allocation will happen in that
        * pool and not in one of the older pools.  When this new pool
        * gets full we will try to find space in the older pools.  */
       pool = calloc (1, sizeof *pool);
       if (!pool)
         return NULL;  /* Not enough memory for a new pool descriptor.  */
       pool->size = STANDARD_POOL_SIZE;
       pool->mem = malloc (pool->size);
       if (!pool->mem)
         return NULL; /* Not enough memory available for a new pool.  */
       /* Initialize first memory block.  */
       mb = (memblock_t *) pool->mem;
       mb->size = pool->size;
       mb->flags = 0;
 
       pool->okay = 1;
 
       /* Take care: in _gcry_private_is_secure we do not lock and thus
        * we assume that the second assignment below is atomic.  */
       pool->next = mainpool.next;
       mainpool.next = pool;
 
       /* After the first time we allocated an overflow pool, print a
        * warning.  */
       if (!pool->next)
         print_warn ();
 
       /* Allocate.  */
       mb = mb_get_new (pool, (memblock_t *) pool->mem, size);
       if (mb)
         {
           stats_update (pool, size, 0);
           return &mb->aligned.c;
         }
     }
 
   return NULL;
 }
 
 
 /* Allocate a block from the secmem of SIZE.  With XHINT set assume
  * that the caller is a xmalloc style function.  */
 void *
 _gcry_secmem_malloc (size_t size, int xhint)
 {
   void *p;
 
   SECMEM_LOCK;
   p = _gcry_secmem_malloc_internal (size, xhint);
   SECMEM_UNLOCK;
 
   return p;
 }
 
 static int
 _gcry_secmem_free_internal (void *a)
 {
   pooldesc_t *pool;
   memblock_t *mb;
   int size;
 
   for (pool = &mainpool; pool; pool = pool->next)
     if (pool->okay && ptr_into_pool_p (pool, a))
       break;
   if (!pool)
     return 0; /* A does not belong to use.  */
 
   mb = ADDR_TO_BLOCK (a);
   size = mb->size;
 
   /* This does not make much sense: probably this memory is held in the
    * cache. We do it anyway: */
 #define MB_WIPE_OUT(byte) \
   wipememory2 (((char *) mb + BLOCK_HEAD_SIZE), (byte), size);
 
   MB_WIPE_OUT (0xff);
   MB_WIPE_OUT (0xaa);
   MB_WIPE_OUT (0x55);
   MB_WIPE_OUT (0x00);
 
   /* Update stats.  */
   stats_update (pool, 0, size);
 
   mb->flags &= ~MB_FLAG_ACTIVE;
 
   mb_merge (pool, mb);
 
   return 1; /* Freed.  */
 }
 
 
 /* Wipe out and release memory.  Returns true if this function
  * actually released A.  */
 int
 _gcry_secmem_free (void *a)
 {
   int mine;
 
   if (!a)
     return 1; /* Tell caller that we handled it.  */
 
   SECMEM_LOCK;
   mine = _gcry_secmem_free_internal (a);
   SECMEM_UNLOCK;
   return mine;
 }
 
 
 static void *
 _gcry_secmem_realloc_internal (void *p, size_t newsize, int xhint)
 {
   memblock_t *mb;
   size_t size;
   void *a;
 
   mb = (memblock_t *) (void *) ((char *) p
 				- ((size_t) &((memblock_t *) 0)->aligned.c));
   size = mb->size;
   if (newsize < size)
     {
       /* It is easier to not shrink the memory.  */
       a = p;
     }
   else
     {
       a = _gcry_secmem_malloc_internal (newsize, xhint);
       if (a)
 	{
 	  memcpy (a, p, size);
 	  memset ((char *) a + size, 0, newsize - size);
 	  _gcry_secmem_free_internal (p);
 	}
     }
 
   return a;
 }
 
 
 /* Realloc memory.  With XHINT set assume that the caller is a xmalloc
  * style function.  */
 void *
 _gcry_secmem_realloc (void *p, size_t newsize, int xhint)
 {
   void *a;
 
   SECMEM_LOCK;
   a = _gcry_secmem_realloc_internal (p, newsize, xhint);
   SECMEM_UNLOCK;
 
   return a;
 }
 
 
 /* Return true if P points into the secure memory areas.  */
 int
 _gcry_private_is_secure (const void *p)
 {
   pooldesc_t *pool;
 
   /* We do no lock here because once a pool is allocatred it will not
    * be removed anymore (except for gcry_secmem_term).  Further,
    * adding a new pool to the list should be atomic.  */
   for (pool = &mainpool; pool; pool = pool->next)
     if (pool->okay && ptr_into_pool_p (pool, p))
       return 1;
 
   return 0;
 }
 
 
 /****************
  * Warning:  This code might be called by an interrupt handler
  *	     and frankly, there should really be such a handler,
  *	     to make sure that the memory is wiped out.
  *	     We hope that the OS wipes out mlocked memory after
  *	     receiving a SIGKILL - it really should do so, otherwise
  *	     there is no chance to get the secure memory cleaned.
  */
 void
 _gcry_secmem_term ()
 {
   pooldesc_t *pool, *next;
 
   for (pool = &mainpool; pool; pool = next)
     {
       next = pool->next;
       if (!pool->okay)
         continue;
 
       wipememory2 (pool->mem, 0xff, pool->size);
       wipememory2 (pool->mem, 0xaa, pool->size);
       wipememory2 (pool->mem, 0x55, pool->size);
       wipememory2 (pool->mem, 0x00, pool->size);
       if (0)
         ;
 #if HAVE_MMAP
       else if (pool->is_mmapped)
         munmap (pool->mem, pool->size);
 #endif
       else
         free (pool->mem);
       pool->mem = NULL;
       pool->okay = 0;
       pool->size = 0;
       if (pool != &mainpool)
         free (pool);
     }
   mainpool.next = NULL;
   not_locked = 0;
 }
 
 
 /* Print stats of the secmem allocator.  With EXTENDED passwed as true
  * a detiled listing is returned (used for testing).  */
 void
 _gcry_secmem_dump_stats (int extended)
 {
   pooldesc_t *pool;
   memblock_t *mb;
   int i, poolno;
 
   SECMEM_LOCK;
 
   for (pool = &mainpool, poolno = 0; pool; pool = pool->next, poolno++)
     {
       if (!extended)
         {
           if (pool->okay)
             log_info ("%-13s %u/%lu bytes in %u blocks\n",
                       pool == &mainpool? "secmem usage:":"",
                       pool->cur_alloced, (unsigned long)pool->size,
                       pool->cur_blocks);
         }
       else
         {
           for (i = 0, mb = (memblock_t *) pool->mem;
                ptr_into_pool_p (pool, mb);
                mb = mb_get_next (pool, mb), i++)
             log_info ("SECMEM: pool %d %s block %i size %i\n",
                       poolno,
                       (mb->flags & MB_FLAG_ACTIVE) ? "used" : "free",
                       i,
                       mb->size);
         }
     }
   SECMEM_UNLOCK;
 }