diff options
| author | Werner Koch <[email protected]> | 2018-01-25 15:48:07 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2018-01-25 15:58:29 +0000 |
| commit | 149369a92b447d06863e79dfe5589321eaf1f237 (patch) | |
| tree | 7fccbc08e642eca25f8d0327a3d2e3ecc5086e4e /kbx/kbxutil.c | |
| parent | gpg: New maintainer option --debug-set-iobuf-size. (diff) | |
| parent | doc: Note --quick-gen-key as an alias for --quick-generate-key (diff) | |
| download | gnupg-149369a92b447d06863e79dfe5589321eaf1f237.tar.gz gnupg-149369a92b447d06863e79dfe5589321eaf1f237.zip | |
Merge branch 'STABLE-BRANCH-2-2' into master
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'kbx/kbxutil.c')
| -rw-r--r-- | kbx/kbxutil.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kbx/kbxutil.c b/kbx/kbxutil.c index e3814d316..2cfd07019 100644 --- a/kbx/kbxutil.c +++ b/kbx/kbxutil.c @@ -464,7 +464,6 @@ main( int argc, char **argv ) /*create_dotlock(NULL); register locking cleanup */ /* We need to use the gcry malloc function because jnlib uses them. */ - keybox_set_malloc_hooks (gcry_malloc, gcry_realloc, gcry_free); ksba_set_malloc_hooks (gcry_malloc, gcry_realloc, gcry_free ); |