10238 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
NIIBE Yutaka	dad880155e	build: Update libassuan.m4 for API compatibility. ... * m4/libassuan.m4: Update from libassuan master. -- Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-26 11:29:05 +09:00
NIIBE Yutaka	1ddd69935d	gpg: Add parallelized filter for hashing. ... * g10/options.h (COMPAT_PARALLELIZED): New. * g10/filter.h (md_thd_filter_context_t): New type. (md_thd_filter_set_md, md_thd_filter): New. * g10/gpg.c (compatibility_flags): Update to support COMPAT_PARALLELIZED. * g10/mdfilter.c (struct md_thd_filter_context): New. (lock_md, unlock_md, get_buffer_to_hash, put_buffer_to_recv): New. (get_buffer_to_fill, put_buffer_to_send, md_thread): New. (md_thd_filter, md_thd_filter_set_md): New. * g10/sign.c (sign_file): Add support for md_thd_filter. (sign_symencrypt_file): Likewise. -- GnuPG-bug-id: 6570 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-25 12:10:07 +09:00
NIIBE Yutaka	96b69c1866	gpg: Add support for Subkey-Expire-Date. ... * g10/keygen.c (enum para_name): Add pSUBKEYEXPIREDATE. (proc_parameter_file): Add support for pSUBKEYEXPIREDATE. (read_parameter_file): Add "Subkey-Expire-Date". -- Cherry-pick from master commit of: 23bcb78d279ebc81ec9340356401d19cf89985f1 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-25 11:15:22 +09:00
NIIBE Yutaka	2258bcded6	gpg: Fix expiration time when Creation-Date is specified. ... * g10/keygen.c (parse_expire_string_with_ct): New function, optionally supply the creation time. (parse_expire_string): Use parse_expire_string_with_ct with no creation time. (proc_parameter_file): Use parse_expire_string_with_ct possibly with the creation time. -- Cherry-pick from master commit of: b07b5144ff6a9208ea27fe1e1518270bd22b382c GnuPG-bug-id: 5252 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-25 11:14:43 +09:00
NIIBE Yutaka	95d9761509	sm: Use estream for I/O. ... * sm/decrypt.c (gpgsm_decrypt): Use estream for the input. * sm/encrypt.c (gpgsm_encrypt): Likewise. * sm/gpgsm.c (open_read): Remove. (main): Use open_es_fread for gpgsm_import_files. Fix call of gpgsm_encrypt, gpgsm_sign, gpgsm_verify and gpgsm_decrypt. (open_es_fread): Use gnupg_check_special_filename and open_stream_nc. * sm/gpgsm.h: Fix function declarations. * sm/import.c (import_one): Use estream for the input. (reimport_one, gpgsm_import, gpgsm_import_files): Likewise. * sm/server.c (struct server_local_s): Rename MESSAGE_FD to MESSAGE_FP. (close_message_fp): Rename from close_message_fd. (reset_notify): Follow the change of close_message_fp. (cmd_encrypt, cmd_decrypt, cmd_verify, cmd_sign): Follow the change of close_message_fp. Use open_stream_nc to get estream. (cmd_import): Likewise. (cmd_export, cmd_delkeys, gpgsm_server): Follow the change of close_message_fp. (cmd_message): Setup MESSAGE_FP with open_stream_nc. * sm/sign.c (hash_data): Use estream for the input. (hash_and_copy_data): Likewise. (gpgsm_sign): Likewise. * sm/verify.c (hash_data): Use estream_t for FP. (gpgsm_verify): Use estream_t for IN_FP and DATA_FP. -- GnuPG-bug-id: 6592 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-25 10:04:18 +09:00
Andre Heinecke	c68b70ce9d	w32: Add keyboxd.exe to signed files ... * build-aux/speedo.mk (AUTHENTICODE_FILES): Add keyboxd.exe -- This should prevent that keyboxd.exe is blocked on systems that only allow signed executables.	2023-07-21 10:29:22 +02:00
Andre Heinecke	083a16ae08	dirmngr: Add doc for faked-system-time ... * dirmngr/dirmngr.c (gpgrt_opt_t): Use string for oFakedSystemTime. (oFakedSystemTime): Use similar conversion as gpgsm has. * dirmngr/dirmngr.texi (faked-system-time): Document it. -- For testing X509 certificates this is usually required and then confusing that the example from the gpgsm man page does not work for dirmngr.	2023-07-21 10:26:44 +02:00
NIIBE Yutaka	30fc365124	dirmngr: Silence compiler when it's without LDAP. ... * dirmngr/ks-action.c [!USE_LDAP] (ks_action_get): NEWER is not used. * ks_action_query [!USE_LDAP] (ks_action_query): Ignore unused args. -- Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-21 14:27:57 +09:00
NIIBE Yutaka	eceba4f207	kbx: Fix error paths to fall back to D-lines. ... * kbx/kbx-client-util.c (prepare_data_pipe): Return an error. (kbx_client_data_new): Recover from an error by use of D-lines. (kbx_client_data_release): Handle the case of use of D-lines. -- Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-21 14:22:19 +09:00
Andre Heinecke	6e2412e74a	dirmngr: Add doc for faked-system-time ... * dirmngr/dirmngr.c (gpgrt_opt_t): Use string for oFakedSystemTime. (oFakedSystemTime): Use similar conversion as gpgsm has. * dirmngr/dirmngr.texi (faked-system-time): Document it. -- For testing X509 certificates this is usually required and then confusing that the example from the gpgsm man page does not work for dirmngr.	2023-07-19 11:27:08 +02:00
NIIBE Yutaka	6524becf28	Revert "kbx,w32: Disable the fd-passing." ... This reverts commit 6944aefa3c2ef79cf3f14306ed384d22de36ba7f. -- The fd-passing works well on Windows with new libassuan (to be 3.0), and it doesn't require ASSUAN_SOCKET_SERVER_FDPASSING actually. Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-19 13:35:26 +09:00
NIIBE Yutaka	ea1935252e	commond: Introduce FD2NUM to express conversion to number of fds. ... * common/sysutils.h (FD2NUM): New. * agent/call-pinentry.c (watch_sock): Use FD2NUM. * agent/gpg-agent.c (handle_connections): Likewise. * dirmngr/dirmngr.c (handle_connections): Likewise. * dirmngr/http.c (connect_with_timeout): Likewise. * kbx/keyboxd.c (handle_connections): Likewise. * scd/scdaemon.c (handle_connections): Likewise. * tpm2d/tpm2daemon.c (handle_connections): Likewise. -- GnuPG-bug-id: 6598 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-18 14:43:36 +09:00
NIIBE Yutaka	521ec40aea	common,w32: Fix FD2INT macro. ... * common/sysutils.h [HAVE_W32_SYSTEM] (FD2INT): Use intptr_t for 64-bit Windows. -- GnuPG-bug-id: 6598 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-18 14:21:19 +09:00
NIIBE Yutaka	ae188a3357	agent,build,w32: Fix use of SOCKET. ... * configure.ac (HAVE_SOCKET): Detect SOCKET type. * agent/command-ssh.c [HAVE_SOCKET] (start_command_handler_ssh): Use SOCKET to cast. -- GnuPG-bug-id: 6508 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-18 14:05:13 +09:00
NIIBE Yutaka	81055baf5c	dirmngr,kbk,tools: Fix type casting. ... * dirmngr/http.c (send_request): Remove cast which is not needed. * kbx/kbx-client-util.c (prepare_data_pipe): Cast to HANDLE. * tools/gpg-connect-agent.c (do_open): Ditto. -- GnuPG-bug-id: 6508 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-18 12:07:25 +09:00
NIIBE Yutaka	b849c930e9	common: Introduce FD_DBG to display gnupg_fd_t value. ... * common/sysutils.h (FD_DBG): New. * agent/gpg-agent.c (check_nonce): Use FD_DBG. (do_start_connection_thread, start_connection_thread_ssh): Likewise. * common/iobuf.c (fd_cache_close, file_filter, do_open): Likewise. (do_iobuf_fdopen): Likewise. * dirmngr/dirmngr.c (check_nonce, start_connection_thread) (handle_connections): Likewise. * dirmngr/http.c (_my_socket_new, _my_socket_ref): Likewise. (_my_socket_unref): Likewise. * g10/decrypt.c (decrypt_message_fd): Likewise. * g10/encrypt.c (encrypt_crypt): Likewise. * g10/openfile.c (open_outfile): Likewise. * g10/plaintext.c (get_output_file, hash_datafile_by_fd): Likewise. * g10/verify.c (gpg_verify): Likewise. * kbx/keyboxd.c (check_nonce, do_start_connection_thread): Likewise. * scd/scdaemon.c (start_connection_thread): Likewise. (handle_connections): Likewise. * sm/gpgsm.c (open_es_fread, open_es_fwrite): Likewise. * tpm2d/tpm2daemon.c (start_connection_thread): Likewise. (handle_connections): Likewise. -- GnuPG-bug-id: 6597 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-18 11:54:16 +09:00
NIIBE Yutaka	ee9e3578ce	gpg: Use gnupg_fd_t for iobuf_get_fd and is_secured_file. ... * common/iobuf.c (iobuf_get_fd): Return type is now gnupg_fd_t. * common/iobuf.h (iobuf_get_fd): Fix the return type. * g10/misc.c (is_secured_file): Argument is now gnupg_fd_t. * g10/main.h (is_secured_file): Fix the argument type. -- GnuPG-bug-id: 6580 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-14 15:52:08 +09:00
NIIBE Yutaka	5d375bb168	gpg: Use is_secured_filename before opening the file. ... * g10/gpg.c (print_mds): Check by is_secured_filename, earlier. * g10/tdbdump.c (import_ownertrust): Likewise. -- GnuPG-bug-id: 6508 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-14 15:49:23 +09:00
NIIBE Yutaka	cf270b0d30	sm: Fix open_es_fread and open_es_fwrite for gnupg_fd_t. ... * sm/gpgsm.c (open_es_fread, open_es_fwrite): Use gnupg_fd_t and open_stream_nc. -- GnuPG-bug-id: 6580 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-13 14:37:20 +09:00
NIIBE Yutaka	ea625c74f0	sm: Use open_stream_nc for do_listkeys. ... * sm/server.c (do_listkeys): Use open_stream_nc. -- GnuPG-bug-id: 6580 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-13 13:53:49 +09:00
NIIBE Yutaka	69c1d81284	sm: Use gnupg_fd_t and open_stream_nc for assuan_get_input_fd. ... * sm/server.c (cmd_genkey): Use open_stream_nc for input and output. (cmd_getauditlog): Use open_stream_nc for output. -- GnuPG-bug-id: 6580 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-13 13:46:43 +09:00
NIIBE Yutaka	fb046ccd93	sm: Use open_stream_nc for HANDLE by assuan_get_output_fd. ... * sm/server.c (cmd_encrypt): Use gnupg_fd_t for OUT_FD. Call open_stream_nc with OUT_FD. (cmd_decrypt, cmd_verify, cmd_sign, cmd_export): Likewise. -- GnuPG-bug-id: 6580 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-13 11:18:47 +09:00
NIIBE Yutaka	23bcb78d27	gpg: Add support for Subkey-Expire-Date. ... * g10/keygen.c (enum para_name): Add pSUBKEYEXPIREDATE. (proc_parameter_file): Add support for pSUBKEYEXPIREDATE. (read_parameter_file): Add "Subkey-Expire-Date". -- Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-12 14:04:28 +09:00
NIIBE Yutaka	b07b5144ff	gpg: Fix expiration time when Creation-Date is specified. ... * g10/keygen.c (parse_expire_string_with_ct): New function, optionally supply the creation time. (parse_expire_string): Use parse_expire_string_with_ct with no creation time. (proc_parameter_file): Use parse_expire_string_with_ct possibly with the creation time. -- GnuPG-bug-id: 5252 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-12 13:34:19 +09:00
NIIBE Yutaka	067bc2ed4c	gpg: Move the check by is_secured_file earlier. ... * g10/decrypt.c (decrypt_message_fd): Call is_secured_file here. * g10/plaintext.c (get_output_file): Remove the call. -- Fixes-commit: 71625f56fd98ab37bc05f1806b4b49a2e418ac37 GnuPG-bug-id: 6580 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-11 13:49:41 +09:00
NIIBE Yutaka	16d135c396	common: Change iobuf_fdopen argument type to gnupg_fd_t. ... * common/iobuf.h (iobuf_fdopen): Use gnupg_fd_t. * common/iobuf.c (iobuf_fdopen): Use gnupg_fd_t. (iobuf_sockopen): Call do_iobuf_fdopen. -- GnuPG-bug-id: 6580 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-11 11:21:05 +09:00
NIIBE Yutaka	250733c0d8	common: Add gnupg_check_special_filename. ... * common/sysutils.h (gnupg_check_special_filename): New. * common/sysutils.c (gnupg_check_special_filename): New. * common/iobuf.c (translate_file_handle): Remove. (iobuf_is_pipe_filename): Use gnupg_check_special_filename. (do_open): Use gnupg_check_special_filename. * g10/plaintext.c (get_output_file): Use gnupg_check_special_filename and open_stream_nc. -- GnuPG-bug-id: 6580 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-11 10:46:36 +09:00
NIIBE Yutaka	37343db08f	common,gpg,kbx: Factor out open_stream_nc. ... * common/sysutils.h (open_stream_nc): New. * common/sysutils.c (open_stream_nc): New. * g10/decrypt.c (decrypt_message_fd): Use open_stream_nc. * g10/server.c (cmd_verify): Likewise. * kbx/kbxserver.c (prepare_outstream): Likewise. -- GnuPG-bug-id: 6580 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-10 11:22:43 +09:00
NIIBE Yutaka	a3be97df4d	common:w32: Fix gnupg_w32_set_errno. ... * common/sysutils.c (gnupg_w32_set_errno): Return EC. -- Cherry-pick master commit of: 4c6b759368bcf19a13df07c5c6080765ecac28ca Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-10 11:21:16 +09:00
NIIBE Yutaka	5bc949d230	common:w32: Fix gnupg_w32_set_errno. ... * common/sysutils.c (gnupg_w32_set_errno): Return EC. -- Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-10 11:20:13 +09:00
Werner Koch	9f39e4da29	gpg: Add algo constants for PQC. ... * common/openpgpdefs.h (PUBKEY_ALGO_KY768_25519): New. (PUBKEY_ALGO_KY1024_448): New. (PUBKEY_ALGO_DIL3_25519): New. (PUBKEY_ALGO_DIL5_448): New. (PUBKEY_ALGO_SPHINX_SHA2): New. * g10/keygen.c (parse_key_parameter_part): Force v5 keys for these algos. * g10/keyid.c (pubkey_string): Add mapping. * g10/misc.c (openpgp_pk_algo_usage): Add standard key usage. -- See draft-wussler-openpgp-pqc-01.txt for the code points. To limit the number of algorithms, only MUST and SHOULD algorithms are considered.	2023-07-07 10:21:39 +02:00
NIIBE Yutaka	8cacfce898	kbx: Fix memory leak at spawning a thread for data pipe. ... * kbx/kbx-client-util.c (prepare_data_pipe): Release the attribute for thread creation. -- Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-06 16:02:14 +09:00
NIIBE Yutaka	2abea42d9c	kbx: Use es_sysopen_nc instead of es_fdopen_nc. ... * kbx/kbxserver.c (prepare_outstream): Use es_sysopen_nc and avoid the use of translate_sys2libc_fd. -- On Windows, it's better directly use the system HANDLE. Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-06 10:25:15 +09:00
NIIBE Yutaka	f2dcd158a5	gpg: Fix gpg --server mode on Windows. ... * g10/server.c (cmd_encrypt): Don't translate_sys2libc_fd, since it requires HANDLE on Windows. (cmd_decrypt): Likewise. -- GnuPG-bug-id: 6580 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-05 13:22:16 +09:00
NIIBE Yutaka	577baf4af3	gpg: Format the value of type gnupg_fd_t by casting to int. ... * g10/openfile.c (open_outfile): Cast to int. * g10/encrypt.c (encrypt_crypt): Ditto. * g10/decrypt.c (decrypt_message_fd): Ditto. -- GnuPG-bug-id: 6580 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-05 13:11:16 +09:00
NIIBE Yutaka	9ae3cfcabe	dirmngr: Enable the call of ks_ldap_help_variables when USE_LDAP. ... * dirmngr/server.c [USE_LDAP] (cmd_ad_query): Conditionalize. -- Cherry-pick master commit of: dc13361524c1477b2106c7385f2059f9ea111b84 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-05 10:46:45 +09:00
NIIBE Yutaka	3fb69641e8	gpg: Use gnupg_fd_t for decryption and sign. ... * g10/decrypt.c (decrypt_message_fd): Use gnupg_fd_t. * g10/plaintext.c (hash_datafile_by_fd): Use gnupg_fd_t. * g10/main.h: Fix the declarations. * g10/mainproc.c (struct mainproc_context): Use gnupg_fd_t for DATA_FD. (proc_compressed_cb, proc_signature_packets): Follow the change. (proc_signature_packets_by_fd): Use gnupg_fd_t. * g10/packet.h: Fix the declaration. -- GnuPG-bug-id: 6580 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-05 10:29:23 +09:00
NIIBE Yutaka	2c2516f03a	gpg: Use gnupg_fd_t for encrypt_crypt and gpg_verify. ... * common/iobuf.h (iobuf_fdopen_nc): Use gnupg_t. * common/iobuf.c (iobuf_fdopen_nc): Use gnupg_t. * g10/main.h (encrypt_crypt, gpg_verify): Use gnupg_fd_t. * g10/encrypt.c (encrypt_crypt): Use gnupg_fd_t. (encrypt_crypt_files): Follow the change. * g10/gpg.c (main): Follow the change. * g10/verify.c (gpg_verify): Use gnupg_fd_t. -- GnuPG-bug-id: 6580 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-05 10:05:31 +09:00
NIIBE Yutaka	68d3a73ea7	gpg: Use gnupg_fd_t for open_outfile. ... * g10/main.h (open_outfile): Use gnupg_fd_t instead of int. * g10/openfile.c (open_outfile): Likewise. Use GNUPG_INVALID_FD. * g10/dearmor.c (dearmor_file, enarmor_file): Follow the change. * g10/encrypt.c (encrypt_simple): Likewise. * g10/export.c (do_export): Likewise. * g10/revoke.c (gen_desig_revoke, create_revocation): Likewise. * g10/sign.c (sign_file, clearsign_file, sign_symencrypt_file): Likewise. -- GnuPG-bug-id: 6580 Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-05 09:36:00 +09:00
NIIBE Yutaka	dc13361524	dirmngr: Enable the call of ks_ldap_help_variables when USE_LDAP. ... * dirmngr/server.c [USE_LDAP] (cmd_ad_query): Conditionalize. -- Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-05 09:29:54 +09:00
NIIBE Yutaka	2c5a93e66e	gpg:card: Remove the code for GnuPG version 1. ... * g10/card-util.c [GNUPG_MAJOR_VERSION == 1] (get_data_from_file): Remove the old code. (put_data_to_file): Likewise. -- Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-05 09:26:16 +09:00
Werner Koch	334f5d95c8	Merge branch 'STABLE-BRANCH-2-4' into master	2023-07-04 17:37:54 +02:00
Werner Koch	2378ccf97c	Post release updates ... --	2023-07-04 16:44:01 +02:00
Werner Koch	d073f26d81	Release 2.4.3 gnupg-2.4.3	2023-07-04 16:06:59 +02:00
Werner Koch	7c04a6a284	po: msgmerge ... --	2023-07-04 16:06:57 +02:00
Emir SARI	7f8ea1c9be	po: Update Turkish translation ... --	2023-07-04 15:52:05 +02:00
Werner Koch	b83d86b988	scd:p15: Make signing work for Nexus cards. ... * scd/app-p15.c (CARD_PRODUCT_NEXUS): New. (read_p15_info): Detect Nexus cards. (get_dispserialno): Use product_id instead of comparing the manufacturer_id. (do_sign): Handle Nexus like BELPIC.	2023-07-04 14:32:08 +02:00
Werner Koch	7a2831bc0e	gpgsm: Init a diagnostic var. ... * sm/minip12.c (p12_parse): Init where. --	2023-07-04 09:26:55 +02:00
Werner Koch	5e94470d05	common,w32: Add missing GetLastError->errno mapping. ... * common/iobuf.c (file_filter, sock_filter): Add missing mapping. -- GnuPG-bug-id: 6528	2023-07-04 09:19:05 +02:00
NIIBE Yutaka	b5efb52d43	agent: Fix formatting thread ID of nPth. ... * agent/call-pinentry.c (agent_query_dump_state): Use %lx to format thread ID. -- Fixes-commit: ba6f8b3d9ec83b35c4f3839853567491fee2f99c Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>	2023-07-03 10:46:46 +09:00