security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-11-10 21:38:50 +01:00
Code Activity
1af3c09831
gnupg/g10
History
Werner Koch 1af3c09831
gpg: Improve decryption diagnostic for an ADSK key. 
* g10/keydb.h (GET_PUBKEYBLOCK_FLAG_ADSK): New constant.
* g10/packet.h (PUBKEY_USAGE_XENC_MASK): New constant.
* g10/pubkey-enc.c (get_session_key): Consider an ADSK also as "marked
for encryption use".
(get_it): Print a note if an ADSK key was used.  Use the new
get_pubkeyblock flag.
* g10/getkey.c (struct getkey_ctx_s): Add field allow_adsk.
(get_pubkeyblock): Factor all code out to ...
(get_pubkeyblock_ext): new.
(finish_lookup): Add new arg allow_adsk and make use of it.
--

This patch solves two purposes:
- We write a note that the ADSK key was used for decryption
- We avoid running into a
  "oops: public key not found for preference check\n"
  due to ADSK keys.  The error is mostly harmless but lets gpg return
  with an exit code of 2.

Backported-from-master: 6fa4d7973d
2024-08-12 15:05:44 +02:00
..
all-tests.scm tests: Support semihosted environment. 2022-12-01 13:59:06 +09:00
armor.c gpg: Allow no CRC24 checksum in armor. 2024-05-16 09:42:39 +09:00
build-packet.c gpg: Fix gpg_mpi_write for the unused opaque case. 2024-02-21 15:55:14 +01:00
call-agent.c gpg: Don't show the "fast path listing" diagnostic with --quiet. 2024-04-05 11:02:43 +02:00
call-agent.h gpg: Use ephemeral mode for generating card keys. 2024-01-22 16:52:22 +01:00
call-dirmngr.c gpg: Show just keyserver and port with --send-keys. 2022-09-30 16:40:31 +02:00
call-dirmngr.h gpg: Lookup a missing public key of the current card via LDAP. 2021-04-16 20:21:23 +02:00
call-keyboxd.c keyboxd: Pass lock info back to gpg and gpgsm. 2023-12-18 16:23:19 +01:00
card-util.c gpg,tools: Handle GPG_ERR_PIN_BLOCKED and GPG_ERR_NO_RESET_CODE. 2023-11-08 13:57:53 +09:00
ChangeLog-2011 delete redundant characters 2023-06-20 09:08:14 +09:00
cipher-aead.c gpg: Report BEGIN_* status before examining the input. 2023-11-17 08:40:49 +09:00
cipher-cfb.c gpg: Report BEGIN_* status before examining the input. 2023-11-17 08:40:49 +09:00
compress-bz2.c gpg: Emit status lines for errors in the compression layer. 2024-02-27 11:33:21 +01:00
compress.c gpg: Emit status lines for errors in the compression layer. 2024-02-27 11:33:21 +01:00
cpr.c gpg,common,scd,sm: Function prototype fixes for modern compiler. 2022-09-13 16:34:00 +09:00
dearmor.c g10/dearmor: use iobuf_copy 2022-03-02 21:12:28 +02:00
decrypt-data.c gpg: Make sure a DECRYPTION_OKAY is never issued for a bad OCB tag. 2024-03-14 21:51:27 +01:00
decrypt.c gpg: Fix wrong use of FD2INT with iobuf_fdopen_nc. 2022-10-07 11:16:55 +09:00
dek.h gpg: More check for symmetric key encryption. 2019-07-18 11:02:34 +09:00
delkey.c gpg: Fix the previous commit. 2020-11-11 09:13:13 +09:00
distsigkey.gpg Update release signing keys 2021-11-13 21:03:02 +01:00
ecdh.c gpg: Use GCRY_KDF_ONESTEP_KDF with newer libgcrypt in future. 2022-10-14 14:49:37 +09:00
encrypt.c gpg: Report BEGIN_* status before examining the input. 2023-11-17 08:40:49 +09:00
exec.c gpg: Move w32_system function. 2022-11-09 10:37:58 +09:00
exec.h gpg: Move w32_system function. 2022-11-09 10:37:58 +09:00
expand-group.c gpg: Fix expand GPG groups when resolving a key 2019-09-30 14:08:13 +02:00
export.c gpg: Prepare for a new export option export-realclean. 2024-03-04 14:22:42 +01:00
filter.h gpg: Make progress work for large files on Windows. 2023-06-13 10:07:07 +02:00
free-packet.c gpg: Allow adding of Additional Decryption Subkeys. 2023-03-01 17:22:20 +01:00
getkey.c gpg: Improve decryption diagnostic for an ADSK key. 2024-08-12 15:05:44 +02:00
gpg-w32info.rc w32: Add manifest to gpg. 2015-02-04 09:15:34 +01:00
gpg.c gpg: New option --default-new-key-adsk. 2024-07-01 15:00:16 +02:00
gpg.h gpg: Improve speed of secret key listing. 2021-05-19 02:42:35 +02:00
gpg.w32-manifest.in w32: Add missing supportedOS Ids for Windows-10 2023-05-24 14:16:10 +02:00
gpgsql.c Remove -I option to common. 2017-03-07 20:25:54 +09:00
gpgsql.h Change all http://www.gnu.org in license notices to https:// 2016-11-05 12:02:19 +01:00
gpgv-w32info.rc w32: Add missing manifests and set a requestedExecutionLevel. 2023-05-24 12:06:37 +02:00
gpgv.c gpg: Mark disabled keys and add show-ownertrust list option. 2024-04-17 12:57:53 +02:00
gpgv.w32-manifest.in w32: Add missing supportedOS Ids for Windows-10 2023-05-24 14:16:10 +02:00
helptext.c Remove -I option to common. 2017-03-07 20:25:54 +09:00
import.c gpg: Rename recently added import option no-seckeys to only-pubkeys. 2024-06-24 11:49:51 +02:00
kbnode.c gpg: Import stray revocation certificates. 2022-10-28 09:30:49 +02:00
key-check.c agent,dirmngr,gpg,scd: Clean up for modern compiler. 2022-09-14 12:08:58 +09:00
key-check.h gpg: Avoid output to the tty during import. 2017-07-27 11:38:57 +02:00
key-clean.c gpg: Prepare for a new export option export-realclean. 2024-03-04 14:22:42 +01:00
key-clean.h gpg: Prepare for a new export option export-realclean. 2024-03-04 14:22:42 +01:00
keydb-private.h gpg: Set the found-by flags in the keyblock in keyboxd mode. 2020-09-22 16:20:41 +02:00
keydb.c gpg: Don't call keybox_compress when KEYDB_RESOURCE_FLAG_READONLY. 2023-12-29 10:57:26 +09:00
keydb.h gpg: Improve decryption diagnostic for an ADSK key. 2024-08-12 15:05:44 +02:00
keyedit.c gpg: Add magic parameter "default" to --quick-add-adsk. 2024-07-01 15:07:03 +02:00
keyedit.h gpg: New option --default-new-key-adsk. 2024-07-01 15:00:16 +02:00
keygen.c gpg: Add magic parameter "default" to --quick-add-adsk. 2024-07-01 15:07:03 +02:00
keyid.c gpg: Prepare for a new export option export-realclean. 2024-03-04 14:22:42 +01:00
keylist.c gpg: Print designated revokers also in a standard listing. 2024-07-01 15:01:50 +02:00
keyring.c gpg: Support KEYGRIP search with traditional keyring. 2021-06-03 13:32:25 +09:00
keyring.h gpg: Pass CTRL to many more functions. 2017-03-31 20:07:20 +02:00
keyserver-internal.h gpg: Implement the LDAP AKL method. 2024-07-01 14:48:48 +02:00
keyserver.c gpg: Implement the LDAP AKL method. 2024-07-01 14:48:48 +02:00
main.h gpg: Add magic parameter "default" to --quick-add-adsk. 2024-07-01 15:07:03 +02:00
mainproc.c gpg: Make sure a DECRYPTION_OKAY is never issued for a bad OCB tag. 2024-03-14 21:51:27 +01:00
Makefile.am gpg: Add option --assert-pubkey_algo. 2024-02-10 14:26:55 +01:00
mdfilter.c Remove -I option to common. 2017-03-07 20:25:54 +09:00
migrate.c Replace most of the remaining stdio calls by estream calls. 2020-10-20 12:15:56 +02:00
misc.c gpg: Allow adding of Additional Decryption Subkeys. 2023-03-01 17:22:20 +01:00
objcache.c Spelling cleanup. 2020-02-18 18:07:46 -05:00
objcache.h gpg: Fix getting User ID. 2019-07-11 12:32:44 +09:00
openfile.c gpg: Partial fix for Unicode problem in output files. 2021-05-25 13:39:59 +02:00
options.h gpg: Autoload designated revoker key and ADSK when needed. 2024-07-01 15:01:14 +02:00
packet.h gpg: Improve decryption diagnostic for an ADSK key. 2024-08-12 15:05:44 +02:00
parse-packet.c gpg: Print a useful error id SKI algo 253 is found. 2024-01-09 17:25:48 +01:00
passphrase.c gpg,common,scd,sm: Function prototype fixes for modern compiler. 2022-09-13 16:34:00 +09:00
photoid.c gpg: Make progress work for large files on Windows. 2023-06-13 10:07:07 +02:00
photoid.h gpg: A little clean up. 2019-07-23 12:04:21 +09:00
pkclist.c gpg: New option --debug-ignore-expiration to help with testing. 2023-05-09 08:17:30 +02:00
pkglue.c gpg: Emit compatible Ed25519 signature. 2021-12-10 15:43:28 +09:00
pkglue.h gpg: Emit compatible Ed25519 signature. 2021-12-10 15:43:28 +09:00
plaintext.c g10/plaintext: disable estream buffering in binary mode 2022-03-08 20:00:31 +02:00
progress.c gpg: Make progress work for large files on Windows. 2023-06-13 10:07:07 +02:00
pubkey-enc.c gpg: Improve decryption diagnostic for an ADSK key. 2024-08-12 15:05:44 +02:00
pubring.asc Update copyright notices for 2017. 2017-01-23 19:16:55 +01:00
revoke.c g10: Fix memory leaks 2021-05-20 13:38:39 +02:00
rmd160.c Clean up word replication. 2017-02-21 13:11:46 -05:00
rmd160.h Change all http://www.gnu.org in license notices to https:// 2016-11-05 12:02:19 +01:00
seckey-cert.c More change for common. 2017-03-07 20:32:09 +09:00
server.c Remove -I option to common. 2017-03-07 20:25:54 +09:00
seskey.c gpg,ecc: Handle external representation as SOS with opaque MPI. 2020-06-09 10:32:47 +09:00
sig-check.c gpg: Allow adding of Additional Decryption Subkeys. 2023-03-01 17:22:20 +01:00
sign.c gpg: Allow to create revocations even with non-compliant algos. 2024-01-10 17:18:34 +01:00
skclist.c gpg: Allow decryption w/o public key but with correct card inserted. 2021-04-23 08:50:39 +02:00
t-keydb-get-keyblock.c gpg: Add option --assert-pubkey_algo. 2024-02-10 14:26:55 +01:00
t-keydb-get-keyblock.gpg gpg: Correctly handle keyblocks followed by legacy keys. 2015-11-17 14:53:03 +01:00
t-keydb-keyring.kbx g10: Add test for keydb as well as new testing infrastructure. 2015-09-02 15:08:57 +02:00
t-keydb.c gpg: Add option --assert-pubkey_algo. 2024-02-10 14:26:55 +01:00
t-keyid.c gpg: Add option --assert-pubkey_algo. 2024-02-10 14:26:55 +01:00
t-rmd160.c Change all http://www.gnu.org in license notices to https:// 2016-11-05 12:02:19 +01:00
t-stutter-data.asc gpg: Add a new test. 2016-03-08 14:08:49 +01:00
t-stutter.c gpg: Add option --assert-pubkey_algo. 2024-02-10 14:26:55 +01:00
tdbdump.c gpg: Prepare for a new export option export-realclean. 2024-03-04 14:22:42 +01:00
tdbio.c gpg: Prepare for a new export option export-realclean. 2024-03-04 14:22:42 +01:00
tdbio.h gpg: Prepare for a new export option export-realclean. 2024-03-04 14:22:42 +01:00
test-stubs.c gpg: Mark disabled keys and add show-ownertrust list option. 2024-04-17 12:57:53 +02:00
test.c gpg: Add option --assert-pubkey_algo. 2024-02-10 14:26:55 +01:00
textfilter.c gpg: Initialize a parameter to silence valgrind. 2020-09-04 11:32:47 +02:00
tofu.c g10: Fix memory leaks 2021-05-20 13:38:39 +02:00
tofu.h g10: Remove dead code. 2016-12-06 12:16:56 +01:00
trust.c gpg: New option --add-desig-revoker 2023-02-16 18:10:03 +01:00
trustdb.c wks: Make gpg-wks-client --mirror work w/o args. 2024-03-06 10:00:37 +01:00
trustdb.h gpg: Fix adding the list of ultimate trusted keys. 2022-01-12 13:34:31 +09:00
verify.c gpg: Add option --assert-pubkey_algo. 2024-02-10 14:26:55 +01:00
zlib-riscos.h Change all http://www.gnu.org in license notices to https:// 2016-11-05 12:02:19 +01:00