[svn] gcry - r1349 - trunk/doc

svn author wk cvs at cvs.gnupg.org
Mon Oct 20 17:24:01 CEST 2008


Author: wk
Date: 2008-10-20 17:24:01 +0200 (Mon, 20 Oct 2008)
New Revision: 1349

Modified:
   trunk/doc/ChangeLog
   trunk/doc/gcrypt.texi
Log:
doc fix.


Modified: trunk/doc/ChangeLog
===================================================================
--- trunk/doc/ChangeLog	2008-10-06 16:31:37 UTC (rev 1348)
+++ trunk/doc/ChangeLog	2008-10-20 15:24:01 UTC (rev 1349)
@@ -1,3 +1,9 @@
+2008-10-20  Werner Koch  <wk at g10code.com>
+
+	* gcrypt.texi (Error handler): Fix description of
+	gcry_handler_no_mem_t.  Reported by Patrick Strateman.  desribe
+	what what the error handler is expected to do.  Fixes bug #961.
+
 2008-09-18  Werner Koch  <wk at g10code.com>
 
 	* gcrypt.texi (FIPS Mode): Add state transition Error to Error.

Modified: trunk/doc/gcrypt.texi
===================================================================
--- trunk/doc/gcrypt.texi	2008-10-06 16:31:37 UTC (rev 1348)
+++ trunk/doc/gcrypt.texi	2008-10-20 15:24:01 UTC (rev 1349)
@@ -1320,12 +1320,18 @@
 may and should be registered prior to calling @code{gcry_check_version}.
 
 @deftp {Data type} gcry_handler_no_mem_t
-This type is defined as: @code{void (*gcry_handler_no_mem_t) (void *, size_t, unsigned int)}
+This type is defined as: @code{int (*gcry_handler_no_mem_t) (void *, size_t, unsigned int)}
 @end deftp
 @deftypefun void gcry_set_outofcore_handler (gcry_handler_no_mem_t @var{func_no_mem}, void *@var{cb_data})
 This function registers @var{func_no_mem} as `out-of-core handler',
 which means that it will be called in the case of not having enough
-memory available.
+memory available.  The handler is called with 3 arguments: The first
+one is the pointer @var{cb_data} as set with this function, the second
+is the requested memory size and the last being a flag.  If bit 0 of
+the flag is set, secure memory has been requested.  The handler should
+either return true to indicate that Libgcrypt should try again
+allocating memory or return false to let Libgcrypt use its default
+fatal error handler.
 @end deftypefun
 
 @deftp {Data type} gcry_handler_error_t




More information about the Gnupg-commits mailing list