security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

Revert patches applied wrongly. 

--

In the experiment for 4994, and patches were wrongly applied.

Fixes-commit: 46d185f603
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2020-07-28 16:57:52 +09:00
parent fa4a2bd7a1
commit d17b838921
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/init.c
View File

@ -161,6 +161,17 @@ _init_common_subsystems (gpg_err_source_t errsource, int *argcp, char ***argvp)
/* Try to auto set the character set. */ /* Try to auto set the character set. */
set_native_charset (NULL); set_native_charset (NULL);
#ifdef HAVE_W32_SYSTEM
/* For W32 we need to initialize the socket layer. This is because
we use recv and send in libassuan as well as at some other
places. */
{
WSADATA wsadat;
WSAStartup (0x202, &wsadat);
}
#endif
#ifdef HAVE_W32CE_SYSTEM #ifdef HAVE_W32CE_SYSTEM
/* Register the sleep exit function before the estream init so that /* Register the sleep exit function before the estream init so that
the sleep will be called after the estream registered atexit the sleep will be called after the estream registered atexit

10
dirmngr/dirmngr-client.c
View File

@ -208,6 +208,16 @@ main (int argc, char **argv )
* init_common_subsystems, but we don't need that here. */ * init_common_subsystems, but we don't need that here. */
gpgrt_set_fixed_string_mapper (map_static_macro_string); gpgrt_set_fixed_string_mapper (map_static_macro_string);
/* For W32 we need to initialize the socket subsystem. Because we
don't use Pth we need to do this explicit. */
#ifdef HAVE_W32_SYSTEM
{
WSADATA wsadat;
WSAStartup (0x202, &wsadat);
}
#endif /*HAVE_W32_SYSTEM*/
/* Init Assuan. */ /* Init Assuan. */
assuan_set_assuan_log_prefix (log_get_prefix (NULL)); assuan_set_assuan_log_prefix (log_get_prefix (NULL));
assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT); assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);