aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
Diffstat (limited to 'util')
-rw-r--r--util/ChangeLog5
-rw-r--r--util/secmem.c9
2 files changed, 11 insertions, 3 deletions
diff --git a/util/ChangeLog b/util/ChangeLog
index 51e99173f..566b1fa62 100644
--- a/util/ChangeLog
+++ b/util/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-16 David Shaw <[email protected]>
+
+ * secmem.c (secmem_init): Return a flag to indicate whether we got
+ the lock.
+
2004-12-06 Werner Koch <[email protected]>
* iobuf.c (fd_cache_strcmp): New. Use whenever we compare
diff --git a/util/secmem.c b/util/secmem.c
index 91cd3eb99..82df884e4 100644
--- a/util/secmem.c
+++ b/util/secmem.c
@@ -88,8 +88,8 @@ print_warn(void)
if (!no_warning)
{
log_info(_("WARNING: using insecure memory!\n"));
- log_info(_("please see http://www.gnupg.org/faq.html "
- "for more information\n"));
+ log_info(_("please see http://www.gnupg.org/faq.html"
+ " for more information\n"));
}
}
@@ -297,7 +297,8 @@ secmem_get_flags(void)
return flags;
}
-void
+/* Returns 1 if memory was locked, 0 if not. */
+int
secmem_init( size_t n )
{
if( !n ) {
@@ -326,6 +327,8 @@ secmem_init( size_t n )
else
log_error("Oops, secure memory pool already initialized\n");
}
+
+ return !show_warning;
}