diff options
| author | Werner Koch <wk@gnupg.org> | 2018-01-25 16:48:07 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2018-01-25 16:58:29 +0100 |
| commit | 149369a92b447d06863e79dfe5589321eaf1f237 (patch) | |
| tree | 7fccbc08e642eca25f8d0327a3d2e3ecc5086e4e /sm | |
| 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 | gnupg2-149369a92b447d06863e79dfe5589321eaf1f237.tar.xz gnupg2-149369a92b447d06863e79dfe5589321eaf1f237.zip | |
Merge branch 'STABLE-BRANCH-2-2' into master
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'sm')
| -rw-r--r-- | sm/gpgsm.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/sm/gpgsm.c b/sm/gpgsm.c index 650b13030..982be58ba 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -1009,8 +1009,6 @@ main ( int argc, char **argv) assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT); setup_libassuan_logging (&opt.debug, NULL); - keybox_set_malloc_hooks (gcry_malloc, gcry_realloc, gcry_free); - /* Setup a default control structure for command line mode */ memset (&ctrl, 0, sizeof ctrl); gpgsm_init_default_ctrl (&ctrl); |