summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <wk@gnupg.org>2002-09-03 16:53:53 +0200
committerWerner Koch <wk@gnupg.org>2002-09-03 16:53:53 +0200
commit94a917356c9767a01062906897df33a686ca2f32 (patch)
tree48228d59a5d44381af5bf0c60f98266d1ae69cc9
parent* gnupg.7: New mini man page. (diff)
downloadgnupg2-94a917356c9767a01062906897df33a686ca2f32.tar.xz
gnupg2-94a917356c9767a01062906897df33a686ca2f32.zip
* gpgsm.c (main): Disable the internal libgcrypt locking.
-rw-r--r--sm/ChangeLog4
-rw-r--r--sm/gpgsm.c6
2 files changed, 9 insertions, 1 deletions
diff --git a/sm/ChangeLog b/sm/ChangeLog
index c27f596b4..a33416118 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,7 @@
+2002-09-03 Werner Koch <wk@gnupg.org>
+
+ * gpgsm.c (main): Disable the internal libgcrypt locking.
+
2002-08-21 Werner Koch <wk@gnupg.org>
* import.c (print_imported_summary): Cleaned up. Print new
diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index cffb17f5c..bfcdeb741 100644
--- a/sm/gpgsm.c
+++ b/sm/gpgsm.c
@@ -74,7 +74,7 @@ enum cmd_and_opt_values {
aSendKeys,
aRecvKeys,
aExport,
- aCheckKeys,
+ aCheckKeys, /* nyi */
aServer,
aLearnCard,
@@ -606,6 +606,10 @@ main ( int argc, char **argv)
/* trap_unaligned ();*/
set_strusage (my_strusage);
gcry_control (GCRYCTL_SUSPEND_SECMEM_WARN);
+ /* We don't need any locking in libgcrypt unless we use any kind of
+ threading. */
+ gcry_control (GCRYCTL_DISABLE_INTERNAL_LOCKING);
+
/* Please note that we may running SUID(ROOT), so be very CAREFUL
when adding any stuff between here and the call to secmem_init()
somewhere after the option parsing */