aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* client: Only call _assuan_waitpid when it's not socket.NIIBE Yutaka2022-11-041-1/+2
| | | | | | | | | * src/client.c (_assuan_client_finish): Check if it's socket. -- GnuPG-bug-id: 6236 Signed-off-by: NIIBE Yutaka <[email protected]>
* build: Prefer gpgrt-config when available.NIIBE Yutaka2022-11-011-2/+2
| | | | | | | | | | | | | * src/libassuan.m4: Overriding the decision by --with-libassuan-prefix, use gpgrt-config libassuan when gpgrt-config is available. -- This may offer better migration. GnuPG-bug-id: 5034 Signed-off-by: NIIBE Yutaka <[email protected]>
* w32: Fix make distAndre Heinecke2022-10-251-1/+1
| | | | | | | | * src/Makefile.am (parts_of_assuan_h): Readd w32-includes.h -- This was accidentally removed. Fixes-commit: df6aec566ce450e4e0702e4784569642f2bc6703
* Fix an explanation for socket on Windows.NIIBE Yutaka2022-10-241-1/+1
| | | | | | -- Signed-off-by: NIIBE Yutaka <[email protected]>
* build: Remove WindowsCE support from mkheader.NIIBE Yutaka2022-10-122-30/+3
| | | | | | | | | | | | * src/assuan.h.in (@include:sys/types.h@, @include:unistd.h@): Simply include <sys/types.h> and <unistd.h>. (@include:w32ce-add@): Remove. * src/mkheader.c (write_special): Remove mingw32ce support. -- GnuPG-bug-id: 6170 Signed-off-by: NIIBE Yutaka <[email protected]>
* Silence compiler warnings.NIIBE Yutaka2022-09-081-2/+2
| | | | | | | | | * src/assuan-socket.c (assuan_sock_init): It's no args. (assuan_sock_deinit): Likewise. -- Signed-off-by: NIIBE Yutaka <[email protected]>
* Drop WindowsCE support.NIIBE Yutaka2022-08-3115-3216/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * contrib/*: Remove. * Makefile.am (EXTRA_DIST): Don't include contrib/. * configure.ac (HAVE_W32CE_SYSTEM): Remove. * src/gpgcedev.c: Remove. * src/gpgcedev.def: Remove. * src/gpgcemgr.c: Remove. * src/system-w32ce.c: Remove. * src/w32ce-add.h: Remove. * src/w32ce-fd-t.inc.h: Remove. * src/Makefile.am (EXTRA_DIST, parts_of_assuan_h, common_sources): Fix. * src/assuan-buffer.c [HAVE_W32CE_SYSTEM]: No conditionalize. * src/setenv.c [HAVE_W32CE_SYSTEM]: Likewise. * src/assuan-defs.h [HAVE_W32CE_SYSTEM]: Remove dependent part. * src/assuan-error.c [HAVE_W32CE_SYSTEM]: Likewise. * src/assuan-handler.c [HAVE_W32CE_SYSTEM]: Likewise. * src/assuan-socket.c [HAVE_W32CE_SYSTEM]: Likewise. * src/system.c [HAVE_W32CE_SYSTEM]: Likewise. * src/sysutils.c [HAVE_W32CE_SYSTEM]: Likewise. * tests/Makefile.am (EXTRA_DIST): Fix. (w32cetools): Remove. * tests/common.h [HAVE_W32CE_SYSTEM]: Remove dependent part. * tests/pipeconnect.c [HAVE_W32CE_SYSTEM]: Likewise. * tests/ce-createpipe.c: Remove. * tests/ce-server.c: Remove. -- GnuPG-bug-id: 6170 Signed-off-by: NIIBE Yutaka <[email protected]>
* Fix the previous commit.NIIBE Yutaka2022-06-201-1/+1
| | | | | | -- Signed-off-by: NIIBE Yutaka <[email protected]>
* Don't access NULL by wipememory.NIIBE Yutaka2022-06-201-1/+1
| | | | | | | | | | | * src/assuan-inquire.c (assuan_inquire): Check mb->buf. -- There is a case where mb->buf may be cleared already by get_membuf. Fixes-commit: d812e28af637144d078005887cb7519d7a2d0c58 Signed-off-by: NIIBE Yutaka <[email protected]>
* config: Remove 18 years unused variableJakub Jelen2022-06-081-1/+0
| | | | | | | | | Its use was removed in 2004 in 9096d0adb448330b5b197579bd57d942635d7021 * src/libassuan-config.in: Remove unused variable -- Signed-off-by: Jakub Jelen <[email protected]>
* client: Handle inquiry from server with CONFIDENTIAL.NIIBE Yutaka2022-05-253-2/+16
| | | | | | | | | | | | | | * src/assuan-defs.h (struct assuan_context_s): Add new flags, in_inq_cb and confidential_inquiry. * src/client.c (assuan_transact): Use the new flags to wipe the outbound buffer for inquiry when CONFIDENTIAL. * src/context.c (assuan_set_flag): When ASSUAN_CONFIDENTIAL is set in inquire callback, set the confidential_inquiry flag. -- GnuPG-bug-id: 5977 Signed-off-by: NIIBE Yutaka <[email protected]>
* struct assuan_context_s: Move boolean fields to flags.NIIBE Yutaka2022-05-256-40/+39
| | | | | | | | | | | | | | | * src/assuan-defs.h (struct assuan_context_s): Move is_server, in_inquire, in_process_next, process_complete, in_command into flags. * src/assuan-buffer.c: Follow the change. * src/assuan-handler.c: Likewise. * src/assuan-inquire.c: Likewise. * src/assuan-pipe-server.c: Likewise. * src/assuan-socket-server.c: Likewise. -- Signed-off-by: NIIBE Yutaka <[email protected]>
* client: Wipe the inbound buffer when CONFIDENTIAL.NIIBE Yutaka2022-05-251-0/+2
| | | | | | | | | * src/client.c (assuan_transact): Wipe the buffer. -- GnuPG-bug-id: 5977 Signed-off-by: NIIBE Yutaka <[email protected]>
* server,client: Wipe the outbound buffer when CONFIDENTIAL.NIIBE Yutaka2022-05-251-0/+2
| | | | | | | | | * src/assuan-buffer.c (assuan_send_data): Wipe the buffer. -- GnuPG-bug-id: 5977 Signed-off-by: NIIBE Yutaka <[email protected]>
* server: Wipe out the memory used by assuan_inquire if CONFIDENTIAL.NIIBE Yutaka2022-05-251-1/+7
| | | | | | | | | | * src/assuan-inquire.c (assuan_inquire): Wipe the memory and inbound buffer. -- GnuPG-bug-id: 5977 Signed-off-by: NIIBE Yutaka <[email protected]>
* Add assuan_sock_accept function.NIIBE Yutaka2022-04-082-0/+27
| | | | | | | | | | | * src/assuan-socket.c (_assuan_sock_accept): New. (assuan_sock_accept): New. * src/assuan.h.in (assuan_sock_accept): New. -- GnuPG-bug-id: 5925 Signed-off-by: NIIBE Yutaka <[email protected]>
* w32: Store a flag if it's socket or not in Assuan CTX.NIIBE Yutaka2022-04-065-34/+16
| | | | | | | | | | | | | | * src/assuan-defs.h (struct assuan_context_s): Add is_socket flag. * src/assuan-socket.c (assuan_sock_init): Set the flag. * src/assuan-socket-connect.c (_assuan_connect_finalize): Likewise. * src/assuan-socket-server.c (assuan_init_socket_server): Likewise. * src/system-w32.c (__assuan_close): Use the flag. (is_socket): Remove. (__assuan_read, __assuan_write): Use the flag. -- Signed-off-by: NIIBE Yutaka <[email protected]>
* Fix API break.NIIBE Yutaka2022-04-053-10/+20
| | | | | | | | | | | | | * src/posix-fd-t.inc.h (assuan_fd_from_posix_fd): Revert. * src/w32-fd-t.inc.h (assuan_fd_from_posix_fd): Revert. * src/system-w32.c (assuan_fd_from_posix_fd): Revert. -- Note that assuan_fd_from_posix_fd is exposed inline function. Fixes-commit: 28a40a298661877e1bbeb3eb9ac58a85bdd85b02 Signed-off-by: NIIBE Yutaka <[email protected]>
* build: Remove unused putc_unlocked.c.NIIBE Yutaka2022-04-051-31/+0
| | | | | | | | | * src/putc_unlocked.c: Remove. * configure.ac: Remove putc_unlocked replace. -- Signed-off-by: NIIBE Yutaka <[email protected]>
* Take advantage of gpgrt_get_syscall_clamp function.NIIBE Yutaka2022-04-055-22/+179
| | | | | | | | | | | | | | | | | | | | | | | * src/assuan-defs.h (_assuan_pre_syscall, _assuan_post_syscall): New. * src/assuan.c (_assuan_pre_syscall, _assuan_post_syscall): New. (pre_syscall_func, post_syscall_func): New. (_assuan_syscall_func_initialized): New. (assuan_new_ext): Call gpgrt_get_syscall_clamp to get clamp functions. * src/system-posix.c (_assuan_system_hooks): Use version 0. * src/system-w32.c (_assuan_system_hooks): Likewise. * src/system.c (_assuan_usleep): Call clamp functions if no hooks. (_assuan_close, _assuan_close_inheritable, _assuan_read): Likewise. (_assuan_write, _assuan_recvmsg, _assuan_sendmsg): Likewise. (_assuan_waitpid, _assuan_connect): Likewise. (_assuan_pipe): Call __assuan_pipe directly if no hooks. (_assuan_spawn): Call __assuan_spawn directly if no hooks. (_assuan_socketpair): Call __assuan_socketpair directly if no hooks. (_assuan_socket): Call __assuan_socket directly if no hooks. -- GnuPG-bug-id: 5914 Signed-off-by: NIIBE Yutaka <[email protected]>
* w32: Fix assuan_socket_connect_fd to be usable.NIIBE Yutaka2022-04-045-27/+16
| | | | | | | | | | | | | | | | | | | | | | * src/assuan.h.in (assuan_socket_connect_fd): Second arg assuan_fd_t. * src/assuan-socket-connect.c (assuan_socket_connect_fd): Second arg should be an object of type SOCKET. * src/posix-fd-t.inc.h (assuan_fd_from_posix_fd): Remove. * src/w32-fd-t.inc.h (assuan_fd_from_posix_fd): Move to... * src/system-w32.c (assuan_fd_from_posix_fd): ... here. -- On Windows, when an application has an already-connected socket, it must be an object of type SOCKET. In this case, it is wrong to use _get_osfhandle. This does not constitute any ABI/API change for POSIX system. This is an API change for Windows, as assuan_fd_t on Windows is pointer type, but it's a fix from non-correctly-usable API. Signed-off-by: NIIBE Yutaka <[email protected]>
* build: Better cross build support.NIIBE Yutaka2022-04-011-3/+3
| | | | | | | | | | * configure.ac: Use AX_CC_FOR_BUILD. * src/Makefile.am: Use EXEEXT_FOR_BUILD. * m4/ax_cc_for_build.m4: New from libgpg-error. -- Signed-off-by: NIIBE Yutaka <[email protected]>
* Fix internal socket API to be consistent for SOCKET.NIIBE Yutaka2022-03-315-34/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * src/assuan-defs.h (_assuan_socket): Return value has type assuan_fd_t. (_assuan_connect): Second argument has type assuan_fd_t. [HAVE_W64_SYSTEM] (SOCKET2HANDLE): Revert the change before. * src/assuan-socket.c (_assuan_sock_new): No type coercion for _assuan_socket. (socks5_connect): No type coercion for _assuan_connect. (_assuan_sock_connect): Likewise. * src/assuan.h.in (struct assuan_system_hooks): Fix method signature of socket for return value type and of connect for the second argument. (__assuan_socket): Return value has type assuan_fd_t. (__assuan_connect): Second argument has type assuan_fd_t. (ASSUAN_SYSTEM_NPTH_IMPL): Fix for _assuan_npth_connect for its second argument. * src/system-w32.c (__assuan_socket): Return value has type assuan_fd_t. Use SOCKET2HANDLE for type coercion for socket. Use INVALID_SOCKET. (__assuan_connect): Second argument has type assuan_fd_t. Use HANDLE2SOCKET for type coercion for sock. * src/system.c (_assuan_socket): Return value has type assuan_fd_t. (_assuan_connect): Second argument has type assuan_fd_t. -- Note that this change does *NOT* constitute any ABI change, no API change, either. It is fix for internal consistency for socket. The change of SOCKET2HANDLE in the past for HAVE_W64_SYSTEM was done, because of internal use of 'int' which represents the type for socket. Instead of fixing that part of code for 'int', I touched another part to silence warnings. That's not correct fix, but a work around. This time, with the changes, whole parts are now consisitent. Fixes-commit: 6c736325c028647dc3283bf723e2e28199e7f45b Signed-off-by: NIIBE Yutaka <[email protected]>
* build: When no gpg-error-config, not install libassuan-config.NIIBE Yutaka2022-03-311-0/+4
| | | | | | | | | | | | | | * configure.ac (USE_GPGRT_CONFIG): New. * src/Makefile.am [USE_GPGRT_CONFIG]: Conditionalize the install of libassuan-config. -- When system will migrate use of gpgrt-config and removal of gpg-error-config, libassuan-config will not be installed (but use libassuan.pc by gpgrt-config). Signed-off-by: NIIBE Yutaka <[email protected]>
* Remove GNU Pth support.NIIBE Yutaka2022-03-315-162/+0
| | | | | | | | | | | | | * src/posix-sys-pth-impl.h: Remove. * src/w32-sys-pth-impl.h: Remove. * src/Makefile.am: Follow the change. * src/assuan.h.in (ASSUAN_SYSTEM_PTH_IMPL, ASSUAN_SYSTEM_PTH): Remove. * src/mkheader.c (write_special): Remove Pth support. -- GnuPG-bug-id: 5911 Signed-off-by: NIIBE Yutaka <[email protected]>
* w32: Fix definition of type to be generated into assuan.h.NIIBE Yutaka2022-03-291-0/+5
| | | | | | | | * src/w32-types.inc.h: Distinguish the case of _WIN64. -- Signed-off-by: NIIBE Yutaka <[email protected]>
* Release 2.5.5.libassuan-2.5.5Werner Koch2021-03-222-2/+2
|
* Support Unicode when starting servers on Windows.Werner Koch2021-03-093-21/+36
| | | | | | | | | * src/assuan-socket.c (utf8_to_wchar): Rename to (_assuan_utf8_to_wchar): this and give global scope. * src/system-w32.c (__assuan_spawn): Use CreateProcessW. -- GnuPG-bug-id: 4398
* m4: Update with newer autoconf constructs.NIIBE Yutaka2020-11-171-1/+2
| | | | | | * src/libassuan.m4: Replace AC_HELP_STRING to AS_HELP_STRING. Signed-off-by: NIIBE Yutaka <[email protected]>
* Fix crash when logging.Ben Kibbey2020-11-121-1/+1
| | | | | | * src/assuan-logging.c (_assuan_log_control_channel): Use gpgrt_malloc. Signed-off-by: Ben Kibbey <[email protected]>
* Release 2.5.4libassuan-2.5.4Werner Koch2020-10-233-3/+3
|
* Support Unicode socket file names under Windows.Werner Koch2020-10-202-10/+6
| | | | | | | | | | * src/assuan-socket.c [W32]: Always use CreateFileW. Drop support for Windows-CE (read_port_and_nonce): Use gpgrt_fopen. -- GnuPG-bug-id: 5098 Signed-off-by: Werner Koch <[email protected]>
* build: Use Requires.private and Libs.private.NIIBE Yutaka2020-02-251-1/+2
| | | | | | | | | * configure.ac (LIBASSUAN_CONFIG_LIBS): Remove NETLIBS. * src/libassuan.pc.in: Distinguish static link. * tests/Makefile.am: Don't need to link NETLIBS. GnuPG-bug-id: 4624 Signed-off-by: NIIBE Yutaka <[email protected]>
* w32: Fix bad-function-cast warning.Werner Koch2019-11-271-0/+7
| | | | | | | | | | | | | * src/w32-fd-t.inc.h (assuan_fd_from_posix_fd): Avoid compiler warning. -- The actual warning was: warning: cast from function call of type 'intptr_t' {aka 'int'} to non-matching type 'void *' [-Wbad-function-cast] return (assuan_fd_t)(HANDLE) _get_osfhandle (fd); Signed-off-by: Werner Koch <[email protected]>
* doc: Minor comment cleanup and beautification.Werner Koch2019-11-272-63/+81
| | | | --
* libassuan.pc: Fix to have -I for Cflags and -L for Libs.NIIBE Yutaka2019-08-201-2/+2
| | | | | | | | * src/libassuan.pc.in (Cflags): Add -I flag. (Libs): Add -L flag. GnuPG-bug-id: 4678 Signed-off-by: NIIBE Yutaka <[email protected]>
* build: Use {CFLAGS,CPPFLAGS,LDFLAGS}_FOR_BUILD for helper programs.Daniel Kahn Gillmor2019-07-181-1/+2
| | | | | | | | | | | | | | | | | | * src/Makefile.am: pass distinct build flags to CC_FOR_BUILD. -- We don't want to use the standard CFLAGS, CPPFLAGS, and LDFLAGS for build helper tools because when cross-compiling they might include choices that only make sense for the platform we are aiming to build for. That said, the environment might offer standard build flags for non-cross-built helper tools too. So we include those flags in the right place here. Debian-bug-id: 932213 Signed-off-by: Daniel Kahn Gillmor <[email protected]>
* Release 2.5.3libassuan-2.5.3Werner Koch2019-02-113-4/+4
|
* socks5: Fix compiler warning on Windows.Werner Koch2019-01-251-1/+1
| | | | | | | | | * src/assuan-socket.c (socks5_connect): Use cast macro to get the hightest socket number. -- GnuPG-bug-id: 3381 Signed-off-by: Werner Koch <[email protected]>
* socks5: Implement timeout to detect bogus service.NIIBE Yutaka2019-01-251-0/+26
| | | | | | | | | | | * src/assuan-socket.c (TIMEOUT_NOT_WAITING_SOCKS5_FOREVER): New. (socks5_connect): Call 'select' in order to not waiting response forever. -- GnuPG-bug-id: 3381 Signed-off-by: NIIBE Yutaka <[email protected]>
* Release 2.5.2libassuan-2.5.2Werner Koch2018-12-132-3/+3
| | | | | | * configure.ac: Bump LT version to C8/A8/R2. Signed-off-by: Werner Koch <[email protected]>
* libassuan.vers: Remove duplicates.NIIBE Yutaka2018-11-141-2/+0
| | | | Signed-off-by: NIIBE Yutaka <[email protected]>
* server: Don't call _assuan_waitpid on server side.NIIBE Yutaka2018-11-142-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | * src/server.c (_assuan_server_finish): Never call waitpid here. * src/assuan-socket-server.c (accept_connection_bottom): Indentation. -- The waitpid/wait only makes sense by parent catching its child process. Since the commit 93595de1ede96dedfcaa93c7442536a2cde0b6ef (for version 0.6.5, in 2004-04-21), CTX->PID on server side has client PID. In the commit cb53f862ff2a864da822d1c16d3df6a02157608b (2009-11-19), call of _assuan_waitpid was introduced in assuan_server_finish, but this call always fails because the process is not a child process of server. (If we could catch exit of non-child process, it might cause a dead lock, since client does call waitpid too.) The indentation fix is to show the place where PID is assigned. Signed-off-by: NIIBE Yutaka <[email protected]>
* socket: Use union for sockaddr access.NIIBE Yutaka2018-11-081-15/+21
| | | | | | | | | | | | | | | | | | | | | | | * src/assuan-socket.c (socks5_connect, use_socks): Use union to access, instead of using cast to the pointer. -- In some machine like 32-bit ARM, alignment requirement of struct sockaddr and struct sockaddr_in (or struct sockaddr_in6) is different. Although it is completely valid to use the value of the address by cast here, because the object should be allocated by struct sockaddr_in or struct sockaddr_in6 to be referred by struct sockaddr *. But compiler doesn't assume such a usage, thus, emits warnings. The API with struct sockaddr * is a bit difficult thing. I examined GNU C library for the implementation of the connect function, it uses transparent union, the GCC feature. It would be too much, if we do same thing here. Signed-off-by: NIIBE Yutaka <[email protected]>
* build: Update gpg-error.m4 and libassuan.m4.NIIBE Yutaka2018-11-021-0/+1
| | | | | | | * m4/gpg-error.m4: Update to 2018-11-02. * src/libassuan.m4: Add AC_MSG_NOTICE. Signed-off-by: NIIBE Yutaka <[email protected]>
* build: Update gpg-error.m4 and libassuan.m4.NIIBE Yutaka2018-10-291-9/+9
| | | | | | | * m4/gpg-error.m4: Update to 2018-10-26. * src/libassuan.m4: Follow the change of gpgrt-config. Signed-off-by: NIIBE Yutaka <[email protected]>
* libassuan.m4: Better backward compatibility support.NIIBE Yutaka2018-10-261-3/+15
| | | | | | | * m4/gpg-error.m4: Update. * src/libassuan.m4: Don't assume libassuan-config is newer. Signed-off-by: NIIBE Yutaka <[email protected]>
* build: Fix libassuan.m4.NIIBE Yutaka2018-10-261-1/+1
| | | | | | * src/libassuan.m4: Use AC_PATH_PROG to detect libassuan-config. Signed-off-by: NIIBE Yutaka <[email protected]>
* build: Fix previous commit.NIIBE Yutaka2018-10-261-0/+1
| | | | Signed-off-by: NIIBE Yutaka <[email protected]>
* build: Improve libassuan.m4.NIIBE Yutaka2018-10-261-4/+4
| | | | | | | | * src/libassuan.m4: Don't try gpgrt-config when LIBASSUAN_CONFIG set. Fall back to detecting libassuan-config, when gpgrt-config doesn't work well. Signed-off-by: NIIBE Yutaka <[email protected]>