| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|
|
|
| |
--
|
|
|
|
| |
--
|
|
|
|
|
|
|
|
|
|
| |
--
Due to the recently introduced use of STARTUPINFOEXW in gpgrt we now
need at least Windows Vista. Version 8 of Mingw defaults to XP SP2
which requires us to explicit override that default.
The SO number of libassuan needs an update too.
|
|
|
|
| |
--
|
|
|
|
|
|
|
|
|
| |
--
Also one old option.
GnuPG-bug-id: 6882
(cherry picked from commit df977729ff3879fdeab7bce339b95ee3fd8ecc42)
|
|
|
|
|
|
|
|
|
|
|
| |
* sm/keylist.c (list_cert_colon): Rework listing of user IDs.
--
Only in colon mode this did not work. Note that an updated libksba is
anyway required to parse a certificate with an empty Subject.
GnuPG-bug-id: 7171
(cherry picked from commit 1067e544c29d652f6f19e47ed2d563e570611e43)
|
|
|
|
|
|
|
| |
* agent/call-scd.c (handle_pincache_put): Use log_debug only in cache
debug mode.
(cherry picked from commit fee890a2ab7f0baeb6575418ffcac0d695411e50)
|
|
|
|
|
|
|
|
|
|
|
| |
* g10/getkey.c (has_key_with_fingerprint): New.
* g10/keyedit.c (menu_addadsk): Replace code by new function.
(keyedit_quick_addadsk): Handle magic arg "default".
* g10/keygen.c (append_all_default_adsks): New.
--
GnuPG-bug-id: 6882
(cherry picked from commit 77afc9ee1c75a28083edf6d98888f9b472c3e39d)
|
|
|
|
|
|
|
|
|
|
|
|
| |
* g10/keylist.c (print_revokers): Add arg with_colon, adjust callers,
add human printable format.
(list_keyblock_print): Call print_revokers.
--
Designated revokers were only printed in --with-colons mode. For
quick inspection of a key it is useful to see them right away.
(cherry picked from commit 9d618d1273120ca2cca97028730352768b0c1897)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* g10/options.h (opt): Move the definition of struct akl to global
scope.
* g10/keydb.h (enum get_pubkey_modes): Add GET_PUBKEY_TRY_LDAP.
* g10/getkey.c (get_pubkey_byname): Implement GET_PUBKEY_BYNAME.
* g10/keygen.c (prepare_desig_revoker): Use it here.
(prepare_adsk): and here.
--
The revoker key is required before we create it along with a new key.
This is because the we need to know the algo and also to make sure
that the key really exists.
GnuPG-bug-id: 7133
(cherry picked from commit 465ea9116d1f9467814143ed35b515034a849e86)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* g10/options.h (opt): Add field def_new_key_adsks.
* g10/gpg.c (oDefaultNewKeyADSK): New.
(opts): Add --default-new-key-adsk.
(main): Parse option.
* g10/keyedit.c (menu_addadsk): Factor some code out to ...
(append_adsk_to_key): new. Add compliance check.
* g10/keygen.c (pADSK): New.
(para_data_s): Add adsk to the union.
(release_parameter_list): Free the adsk.
(prepare_adsk): New.
(get_parameter_adsk): New.
(get_parameter_revkey): Remove unneeded arg key and change callers.
(proc_parameter_file): Prepare adsk parameter from the configured
fingerprints.
(do_generate_keypair): Create adsk.
--
GnuPG-bug-id: 6882
(cherry picked from commit ed118e2ed521d82c1be7765a0a19d5b4f19afe10)
|
|
|
|
|
|
|
|
|
|
| |
* common/strlist.c (append_to_strlist_try): Factor code out to ...
(do_append_to_strlist): new.
(tokenize_to_strlist): New.
* common/t-strlist.c (test_tokenize_to_strlist): New.
(cherry picked from commit d2dca58338a4936b293c3ec6be4572d0e74b6a0d)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* g10/keyserver.c (keyserver_import_mbox): Add arg flags and change
callers.
(keyserver_import_ldap): Remove. It has always returned a not
implemented error since 2.1.
* g10/getkey.c (get_pubkey_byname): Repurpose LDAP to do basically the
same as KEYSERVER.
--
The old LDAP mechanism to locate a server via SRV records has long
been gone (since 2014) due to the dropping of the keyserver helpers.
The new purpose better reflects reality and can be used in
environments where keys are provided by an in-house LDAP server.
(cherry picked from commit 068ebb6f1eee37d31f5ffb44b7f8069d9ca3f7b8)
|
|
|
|
|
|
|
|
|
|
|
| |
* agent/call-scd.c (agent_card_devinfo): Check if client connects
by a socket.
--
GnuPG-bug-id: 7151
Signed-off-by: NIIBE Yutaka <[email protected]>
(cherry picked from commit c4ff9c5def1aaf76f7cec82d9aa7e5cb1b77f044)
|
|
|
|
|
|
|
|
|
| |
* agent/gpg-agent.c (main): Let it have defined value.
--
Signed-off-by: NIIBE Yutaka <[email protected]>
(cherry picked from commit 14400b2fb3d4e97307799325bb8f704476ce6354)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* agent/call-scd.c (devinfo_watch_thread): New.
(agent_card_devinfo): New.
(agent_card_scd): Call agent_card_devinfo when it's
DEVINFO_WATCH_COMMAND.
--
GnuPG-bug-id: 7151
Signed-off-by: NIIBE Yutaka <[email protected]>
(cherry picked from commit b3f1f2cd192b71f2c19ec6f871ece0c175d46db0)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* agent/agent.h (daemon_start): Add REQ_SOCK argument.
* agent/call-daemon.c (daemon_start): Support specifying a socket
connection.
* agent/call-scd.c (start_scd): Connection don't care.
* agent/call-tpm2d.c (start_tpm2d): Likewise.
--
GnuPG-bug-id: 7151
Signed-off-by: NIIBE Yutaka <[email protected]>
(cherry picked from commit 5d980802acb3e385c6d2a10e8b3ae95d362da953)
|
|
|
|
|
|
|
|
|
|
|
| |
* scd/app.c (app_send_devinfo): Return GPG_ERR_INV_HANDLE when
it's not socket when KEEP_LOOPING != 0.
--
GnuPG-bug-id: 7151
Signed-off-by: NIIBE Yutaka <[email protected]>
(cherry picked from commit d98521b934ec6a5abb0ad18e39a26009a8806c52)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* scd/app.c (card_list_signal): Use pipe on POSIX system, event on
Windows.
(card_list_wait): Detect input change as well as card list event
change.
(app_send_devinfo): Finish the command on input close.
(initialize_module_command): Initialize pipe or event.
--
GnuPG-bug-id: 7151
Signed-off-by: NIIBE Yutaka <[email protected]>
(cherry picked from commit 36d8cffc6cd2838e7cb439c566fdd2b3dd076c15)
|
|
|
|
|
|
|
|
|
| |
* scd/scdaemon.c (scd_init_event): New.
--
Signed-off-by: NIIBE Yutaka <[email protected]>
(cherry picked from commit 9aa6faaf10cf6739b0ddf5b42b6181a5c2a0000c)
|
|
|
|
|
|
|
|
|
|
|
| |
* scd/scdaemon.c (start_connection_thread): Recover call of
scd_command_handler.
--
GnuPG-bug-id: 7160
Signed-off-by: NIIBE Yutaka <[email protected]>
(cherry picked from commit 9bc3f2ad52ce527a3eb1a713eef3268affa0697e)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* scd/scdaemon.h (scd_command_handler): Fix the return type.
* scd/command.c (scd_command_handler): Not return a value.
* scd/scdaemon.c (pipe_server): Make it auto variable in main.
(main): Use auto PIPE_SERVER variable.
(start_connection_thread): When it's a pipe connection and it
finishes, let the service shutdown.
--
GnuPG-bug-id: 7151
Signed-off-by: NIIBE Yutaka <[email protected]>
(cherry picked from commit 01fa318be0f8ca60c78d99403fbfb75edb521b16)
|
|
|
|
|
|
|
|
|
| |
* agent/call-daemon.c (struct daemon_local_s): Remove G field.
--
Signed-off-by: NIIBE Yutaka <[email protected]>
(cherry picked from commit 55559c8b66ff495fa7102d1f856cb2c00b76efbd)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* agent/call-daemon.c (daemon_start): Decision of connection/reuse of
CTX and assignment to ->ctx should be done with the lock.
--
When scdaemon is exiting and agent tries to spawn/connect/reconnect,
there is a race condition between detecting finish of scd and
spawn/connect/reconnect.
Signed-off-by: NIIBE Yutaka <[email protected]>
(cherry picked from commit 563bfbb0be4ebbc85bc56426541f666839e6aa13)
|
|
|
|
|
|
|
|
|
|
| |
* tools/gpg-mail-tube.c: New.
* tools/Makefile.am: Add it.
--
Backported-from-master: 28a080bc9f9478f63a7edffa420512eaed3555ff
We had to use the old spawn interface from gnupg-2.4 here.
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* tools/rfc822parse.h (RFC822PARSE_HEADER_SEEN): New.
* tools/rfc822parse.c (rfc822_cmp_header_name): New.
(insert_header): Run header seen callback.
(rfc822parse_last_header_line): New.
(rfc822_free): New.
* tools/wks-receive.c (t2body): Use it here.
* tools/mime-parser.c (parse_message_cb): and here.
---
Backported-from-master: 675b12ddd8ca742314d96a02bc95b837841070fb
|
|
|
|
| |
--
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* doc/examples/common.conf: fix home dir path
--
Fix a few typos in user-specific path of common.conf added in d13c5bc24
(gpg,gpgsm: Move use-keyboxd to the new conf file common.conf,
2021-04-19). The file is in the GnuPG home dir. Replace 'use if' with
'use of' as well.
Signed-off-by: Todd Zullinger <[email protected]>
|
|
|
|
|
|
|
|
|
| |
* g10/import.c (parse_import_options): Rename option.
* g10/options.h (IMPORT_NO_SECKEY): Rename to IMPORT_ONLY_PUBKEYS.
Change all users.
--
GnuPG-bug-id: 7146
|
|
|
|
|
|
|
| |
* g10/import.c (parse_import_options): Add "no-seckeys".
--
GnuPG-bug-id: 7146
|
|
|
|
|
|
|
|
|
| |
* g10/getkey.c (lookup): Skip keys with unknown algos.
--
If the local store has private keys with an algorithm not supported by
thi version of gpg, gpg used to bail out. Thus decryption of proper
messages was not possible. This fix skips such secret keys.
|
|
|
|
| |
--
|
|
|
|
| |
--
|
|
|
|
|
|
| |
* g10/packet.h (PUBKEY_USAGE_BASIC_MASK): New.
* g10/getkey.c (merge_selfsigs_subkey): Mask the default.
(merge_selfsigs_main): Ditto.
|
|
|
|
|
|
|
|
|
|
|
| |
* tools/gpg-auth.c (ssh_authorized_keys): Move free after printing error
message.
--
Signed-off-by: Jakub Jelen <[email protected]>
This is part of
GnuPG-bug-id: 7129
(cherry picked from commit 9adaa79ab43e2f87178b8ee5ab1a353cba384606)
|
|
|
|
|
|
|
|
|
|
|
|
| |
* sm/certcheck.c (gpgsm_check_cms_signature): Do not free s_sig on
error. Its owned and freed by the caller.
--
This is part of
GnuPG-bug-id: 7129
Signed-off-by: Jakub Jelen <[email protected]>
Fixes-commit: 969abcf40cdfc65f3ee859c5e62889e1a8ccde91
(cherry picked from commit dcb0b6fd4822107d68bcb046d4d0650d02c82522)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* scd/apdu.c (apdu_dev_list_start): Fix end condition.
--
Signed-off-by: Jakub Jelen <[email protected]>
This is part of
GnuPG-bug-id: 7129
Fixes-commit: e8534f899915a039610973a84042cbe25a5e7ce2
(cherry picked from commit 4c1b0070354db0b9b0516d9e5453e47fc03a0aac)
|
|
|
|
|
|
|
|
|
|
|
|
| |
* agent/command.c (cmd_genkey): Moved init_membuf to the top.
--
Signed-off-by: Jakub Jelen <[email protected]>
This is part of
GnuPG-bug-id: 7129
(cherry picked from commit 379fc5569d604c4a7b5f12b2bbfc4106893c2a9e)
|
|
|
|
|
|
|
|
|
|
|
|
| |
* agent/call-scd.c (handle_pincache_get): Set PIN to NULL. Also add
DBG_CACHE conditionals and don't return the pin in the debug output.
--
This is part of
GnuPG-bug-id: 7129
Co-authored-by: Jakub Jelen <[email protected]>
(cherry picked from commit bdbf5cee2ff5bc0773011abde4074003ef9dac70)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* agent/genkey.c (store_key): Clear ERR on success.
--
This fixes a real problem which might let ephemeral store mode fail
randomly.
This is part of
GnuPG-bug-id: 7129
Co-authored-by: Jakub Jelen <[email protected]>
(cherry picked from commit fdc5003956407da1984f40fc27115e4704587e15)
|
|
|
|
|
|
|
|
|
|
|
|
| |
* tools/wks-util.c (install_key_from_spec_file): Initialize ERR in case
the loop is never run.
--
This is part of
GnuPG-bug-id: 7129
Co-authored-by: Jakub Jelen <[email protected]>
(cherry picked from commit 021c27510b52f86a95ae70b5f4ed5d2c3886c3e8)
|
|
|
|
|
|
|
|
|
|
|
|
| |
* g10/keygen.c (card_store_key_with_backup): Avoid double free and
simplify error handling.
--
This is part of
GnuPG-bug-id: 7129
Co-authored-by: Jakub Jelen <[email protected]>
(cherry picked from commit bcc002cd45d1c6bd51c2b2093f92d396970c082e)
|
|
|
|
| |
--
|
|
|
|
|
| |
* tools/gpg-card.h (opt): Make gpg_program, gpgsm_program, and
agent_program const.
|
|
|
|
|
| |
* kbx/kbxutil.c (main): Use setup_libgcrypt_logging.
(my_gcry_logger): Remove.
|
|
|
|
|
|
|
| |
--
Although it is largely outdated, it does not harm too much.
GnuPG-bug-id: 7120
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* scd/app-openpgp.c (get_cached_data): When it comes with
its tag and length for the constructed Data Object, remove
them.
--
Cherry-pick master commit of:
35ef87d8d9db42c3077996317781986a692552cc
GnuPG-bug-id: 7058
Signed-off-by: NIIBE Yutaka <[email protected]>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* g10/armor.c (radix64_read): Detect the end of armor when
there is no CRC24 checksum.
--
Cherry-pick master commit of:
3a344d6236521d768793e8b34a96a18ce13bab0e
GnuPG-bug-id: 7071
Signed-off-by: NIIBE Yutaka <[email protected]>
|
|
|
|
| |
--
|
|
|
|
|
|
|
| |
* tests/asschk.c (eval_boolean): s/true/tru/
--
GnuPG-bug-is: 7093
|