diff options
| author | Werner Koch <[email protected]> | 2014-09-08 17:26:02 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2014-09-08 17:26:02 +0000 |
| commit | 64329cce9a0f21cf941ff2c3f542a08c57cb5378 (patch) | |
| tree | 2757f807c51b06645bff08cb9c85c72e49b151d9 /common/init.c | |
| parent | gpg: Do not show "MD5" and triplicated "RSA" in --version. (diff) | |
| parent | gpg: Fix memory leak in ECC encryption. (diff) | |
| download | gnupg-64329cce9a0f21cf941ff2c3f542a08c57cb5378.tar.gz gnupg-64329cce9a0f21cf941ff2c3f542a08c57cb5378.zip | |
Merge branch 'wk/test-gpgrt-estream'
Diffstat (limited to 'common/init.c')
| -rw-r--r-- | common/init.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/common/init.c b/common/init.c index 91ee912bb..1cbd709d7 100644 --- a/common/init.c +++ b/common/init.c @@ -173,7 +173,11 @@ _init_common_subsystems (gpg_err_source_t errsource, int *argcp, char ***argvp) #endif /* Initialize the Estream library. */ - es_init (); + gpgrt_init (); + gpgrt_set_alloc_func (gcry_realloc); +#ifdef USE_NPTH + gpgrt_set_syscall_clamp (npth_unprotect, npth_protect); +#endif /* Special hack for Windows CE: We extract some options from arg to setup the standard handles. */ @@ -191,7 +195,7 @@ _init_common_subsystems (gpg_err_source_t errsource, int *argcp, char ***argvp) { int i; for (i=0; i < 3; i++) - (void)_es_get_std_stream (i); + (void)_gpgrt_get_std_stream (i); } /* --version et al shall use estream as well. */ |