aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Release 2.0.29.gnupg-2.0.29Werner Koch2015-09-084-8/+19
| | | | Signed-off-by: Werner Koch <[email protected]>
* po: Auto-update.Werner Koch2015-09-0828-225/+350
| | | | --
* po: Update German translationWerner Koch2015-09-081-9/+13
| | | | --
* po: Update Russian translation.Ineiev2015-09-081-26/+15
| | | | --
* gpg: Print a new FAILURE status after most commands.Werner Koch2015-09-084-19/+94
| | | | | | | | | | | | | | | | | | * common/status.h (STATUS_FAILURE): New. * g10/cpr.c (write_status_failure): New. * g10/gpg.c (main): Call write_status_failure for all commands which print an error message here. -- This status line can be used similar to the error code returned by commands send over the Assuan interface in gpgsm. We don't emit them in gpgsm because there we already have that Assuan interface to return proper error code. This change helps GPGME to return better error codes. (backported from master 9cdff09743c473a12359bfdb914578ede0e4e3e2) Signed-off-by: Werner Koch <[email protected]>
* gpg: Avoid cluttering stdout with trustdb info in verbose mode.Werner Koch2015-09-081-1/+1
| | | | | | | | | | | | | | | | * g10/trustdb.c (validate_keys): Call dump_key_array only in debug mode. -- I guess that is a left-over from an early attempt to output information on the trustdb for use by other tools. Maybe related to the former --list-trust-path command. Sending it to stdout is probably useful so we do this now only in debug mode. Signed-off-by: Werner Koch <[email protected]> Backported to STABLE-BRANCH-2-0 from b03a2647299a6c8764a2574590cbaccdff9e497d by dkg
* gpg: Obsolete --no-sig-create-check.Werner Koch2015-09-014-13/+12
| | | | | | | | * g10/gpg.c (opts): Make --no-sig-create-check a NOP. * g10/options.h (struct opt): Remove field "no_sig_create_check". * g10/sign.c (do_sign): Do not run the create check for Libgcrypt 1.7. Signed-off-by: Werner Koch <[email protected]>
* g10: fix --card-status creating stub.NIIBE Yutaka2015-08-121-0/+1
| | | | * g10/getkey.c (get_seckeyblock_byfprint): Require exact match.
* sm: Revert to use SHA-1 for CSR generation.Werner Koch2015-07-271-9/+16
| | | | | | | | | * sm/certreqgen.c (create_request): Revert to use SHA-1 but change to set it only at one place. -- Regression-due-to: bdf439035d123e4751e133ad42982673b0c86b75 Signed-off-by: Werner Koch <[email protected]>
* Don't segfault if the first 'auto-key-locate' option is 'clear'.Neal H. Walfield2015-07-161-0/+3
| | | | | | | | | | | | | * g10/getkey.c (free_akl): If AKL is NULL, just return. -- Backported from f2ee673c99825d5189631031ddec2dbf54dbd482. Note: unlike in 2.1, in 2.0 this bug is not (currently) triggered since parse_auto_key_locate doesn't recognize "clear". Signed-off-by: Neal H. Walfield <[email protected]>. Reported-by: Sami Farin. GnuPG-bug-id: 2045
* scd: pinpad workaround for PC/SC implementations.NIIBE Yutaka2015-06-231-4/+12
| | | | | | | | | | | | | | * scd/adpu.c (pcsc_pinpad_verify, pcsc_pinpad_modify): Bigger buffer for TPDU card reader. -- (backport from 2.1 commit 5e1d2fe6555d06f9dcd2daac713b2edfbc0428a5) GnuPG-bug-id: 2003, 2004 This is needed for PC/SC on Debian Jessie. Note that it's not only for Cherry ST-2000, but also, for any TPDU card readers.
* scd: Fix Cherry ST-2000 support for pinpad input.NIIBE Yutaka2015-06-232-6/+16
| | | | | | | | | | | | * scd/apdu.c (pcsc_vendor_specific_init): Set pinmax to 15. * scd/ccid-driver.c (ccid_transceive_secure): Add zero for the template of APDU. -- (backport from 2.1 commit 444e9232aa9e00aacd939cbf7bdb881b550dfebe) GnuPG-bug-id: 2003, 2004
* gpg: Print PGP-2 fingerprint instead of all zeroes.Werner Koch2015-06-172-1/+9
| | | | | | | | | | | | | | | | * g10/keyid.c (fingerprint_from_pk): Allow PGP-2 fingerprints. * g10/keylist.c (print_fingerprint): Print a warning after a PGP-2 fingerprint. -- Printing all zeroes for a PGP-2 (v3 key) fingerprint has the problem that frontends (or the user) may use that fingerprint to lookup a key and gpg will return all PGP2 keys. They may then show a different PGP-2 key than the one actually used for a signature. This is worse than displaying a weak fingerprint. GnuPG-bug-id: 2000 Signed-off-by: Werner Koch <[email protected]>
* po: Update Japanese Translation.NIIBE Yutaka2015-06-161-4/+4
|
* g10: Fix a race condition initially creating trustdb.NIIBE Yutaka2015-06-151-65/+56
| | | | | | | | | | | | | | * g10/tdbio.c (take_write_lock, release_write_lock): New. (put_record_into_cache, tdbio_sync, tdbio_end_transaction): Use new lock functions. (tdbio_set_dbname): Fix the race. (open_db): Don't call create_dotlock. -- (backported from commit fe5c6edaed78839303d67e01e141cfc6b5de9aec) GnuPG-bug-id: 1675
* po:Update Japanese translation.NIIBE Yutaka2015-06-151-28/+13
|
* doc: Replace "conventional encryption" by "symmetric encryption".Werner Koch2015-06-023-8/+8
| | | | | | -- Suggested-by: Daniel Kahn Gillmor <[email protected]>
* gpg: Consider that gcry_mpi_get_opaque may return NULL.Werner Koch2015-06-021-26/+35
| | | | | | | | | | | | * g10/seckey-cert.c (do_check): Handle a NULL opaque MPI. -- This patch extends b2d9d10 for secret keys. The problem is that we changed the semantics so that opaque MPIs may be NULL with a bit length. This patch is not required in GnuPG 2 because we do not use secret keys there. Signed-off-by: Werner Koch <[email protected]>
* gpg: Fix segv due to NULL value stored as opaque MPI (BRANCH 2.0)Daniel Kahn Gillmor2015-06-022-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * g10/build-packet.c (do_secret_key): Check for NULL return from gcry_mpi_get_opaque. * g10/keyid.c (hash_public_key): Ditto. -- This is a backport of 76c8122adfed0f0f443cce7bda702ba2b39661b3 from master to the STABLE-BRANCH-2-0 On the STABLE-BRANCH-2-0, we may also want to patch g10/seckey-cert.c, but that has not been done in this patch. This fix extends commmit 0835d2f44ef62eab51fce6a927908f544e01cf8f. gpg2 --export --no-default-keyring --keyring TESTDATA With TESTDATA being below after unpacking. -----BEGIN PGP ARMORED FILE----- mBMEhdkMmS8BcX8F//8F5voEhQAQmBMEnAAAZwAAo4D/f/8EhQAAAIAEnP8EhQAQ iBMEnP8AAAAABf8jIID///8EhQYQmBMEnIUAEIgTBKT/AAAAAAUAACCA/f//BIUA EJgTBJx/AP8ABPPzBJx/AP8ABPPz =2yE0 -----END PGP ARMORED FILE----- Reported-by: Jodie Cunningham Signed-off-by: Daniel Kahn Gillmor <[email protected]>
* doc: Typo fix for "Creation-Date".Werner Koch2015-06-021-1/+1
| | | | | | | | -- Debian-bug-id: 760273 This has already been fixed in master.
* Post release updatesWerner Koch2015-06-023-9/+56
| | | | | | -- The fuzzy entries of ru.po are not in the release. Does not matter.
* Release 2.0.28gnupg-2.0.28Werner Koch2015-06-021-1/+16
|
* po: Auto-updateWerner Koch2015-06-0227-250/+1131
| | | | --
* po: Update Russian translationIneiev2015-06-021-115/+107
| | | | | | | | -- This pacth was missed for 2.0.27. I fixed a typo in the PO-Revision-Date. - wk
* po: Update the German translationWerner Koch2015-06-021-6/+36
| | | | --
* po: Fix a LF mismatch in ja.po.Werner Koch2015-06-021-2/+2
| | | | --
* agent: Make --allow-external-password-cache work.Werner Koch2015-06-022-14/+0
| | | | | | | | | | | * agent/call-pinentry.c (start_pinentry): Remove first instance of sending the option. -- That option to tell Pinentry about an external password cache was send twice and the first one unconditionally. Signed-off-by: Werner Koch <[email protected]>
* agent: Add strings for use by future Pinentry versions.Werner Koch2015-06-021-29/+35
| | | | | | | | | | | | | | * agent/call-pinentry.c (start_pinentry): Add more strings. -- We do this so that translations of these strings will be available at the time a pinentry implements features which require these strings. Signed-off-by: Werner Koch <[email protected]> This is a backport from master commit 02d5e1205489aa5027a87a64552eaf15984dc22d without the mode flag in the table.
* agent: Cleanup caching code for command GET_PASSPHRASE.Werner Koch2015-05-201-1/+1
| | | | | | | | | | | | * agent/command.c (cmd_get_passphrase): Read from the user cache. -- We used to read the passphrase with mode CACHE_MODE_NORMAL but we put it into the cache with CACHE_MODE_USER. However, agent_get_cache does not yet distinguish between them and thus this does not change anything. (backported from commit 23d2ef83cda644c6a83499f9327350d3371e8a17)
* agent: Backport changes from 2.1 to support an external password manager.Neal H. Walfield2015-05-1910-21/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * agent/agent.h (agent_askpin): Add arguments keyinfo and cache_mode. Update callers. (agent_get_passphrase): Likewise. (agent_clear_passphrase): New function. (opt): Add field allow_external_cache. * agent/call-pinentry.c (start_pinentry): Send "OPTION allow-external-password-cache" to the pinentry. (PINENTRY_STATUS_PASSWORD_FROM_CACHE): New constant. (pinentry_status_cb): New function. (agent_askpin): Add arguments keyinfo and cache_mode. If KEYINFO and CACHE_MODE describe a cachable key, then send SETKEYINFO to the pinentry. Pass PINENTRY_STATUS_CB to the "GETPIN" invocation. If the passphrase was incorrect and PINENTRY_STATUS_PASSWORD_FROM_CACHE is set, decrement PININFO->FAILED_TRIES. (agent_get_passphrase): Add arguments keyinfo and cache_mode. If KEYINFO and CACHE_MODE describe a cachable key, then send SETKEYINFO to the pinentry. (agent_clear_passphrase): New function. * agent/call-pinentry.c (start_pinentry): Act upon new var, allow_external_cache. * agent/command.c (cmd_clear_passphrase): Call agent_clear_passphrase. * agent/gpg-agent.c (oNoAllowExternalCache): New. (opts): Add option --no-allow-external-cache. (parse_rereadable_options): Set this option. -- Signed-off-by: Neal H. Walfield <[email protected]> Based on commits: 3a9305439b75ccd4446378d4fd87da087fd9c892 e201c20f25e7bed29088186c5f717d43047a0f4b d7293cb317acc40cc9e5189cef33fe9d8b47e62a 56b5c9f94f2e55d096be585ed061ccf1c9ec0de6 d3b5cad2346bd5747789dc62d7804fa5c15f4f3b 2180845959839705200e3172dbafc94b70b9007f
* g10: detects public key encryption packet error properly.NIIBE Yutaka2015-05-191-3/+3
| | | | | | | | | g10/mainproc.c (proc_pubkey_enc): Only allow relevant algorithms for encryption. -- (backport from 2.1 commit c771963140cad7c1c25349bcde27e427effc0058)
* g10: Improve handling of no corresponding public key.NIIBE Yutaka2015-05-191-0/+12
| | | | | | | | | | | | | | | | | * g10/getkey.c (get_seckey): Return G10ERR_NO_PUBKEY when it's not exact match. -- (ported from 1.4 commit b3fd30451a5464b124b0296afbc341cb98b3977c) In the situation of corrupted .gnupg/ where only private subkey is available but no corresponding public key of the subkey, the code returned public primary key which caused mysterious error (for a user). This fix detects an error earlier. GnuPG-bug-id: 1422 Debian-Bug-Id: #638619
* gpg-connect-agent: Fix quoting of internal percent+ function.Werner Koch2015-05-111-4/+4
| | | | | | | | | * tools/gpg-connect-agent.c (get_var_ext) <percent, percent+): Also escape '+'. -- GnuPG-bug-id: 1841 Signed-off-by: Werner Koch <[email protected]>
* scd: PC/SC reader selection by partial string match.NIIBE Yutaka2015-05-012-10/+21
| | | | | | | | | | | | | | | | | | * scd/apdu.c (open_pcsc_reader_direct): Partial string match. * scd/pcsc-wrapper.c (handle_open): Likewise. -- (backport from 2.1 commit 01a2a61bc4b34817c4216888265f65d59a33dad3) The card reader name by PC/SC service might include USB bus, which varies (on some platform like GNU/Linux). Thus, it's better to match partial string. Original patch was submitted by anstein. I changed it to fallback to the first reader if no match found. GnuPG-bug-id: 1618, 1930
* g10: fix cmp_public_key and cmp_secret_keys.NIIBE Yutaka2015-04-303-10/+18
| | | | | | | | | | * g10/free-packet.c (cmp_public_keys, cmp_secret_keys): Compare opaque data at the first entry of the array when it's unknown algo. * configure.ac (NEED_LIBGCRYPT_VERSION): Require 1.5.0. -- GnuPG-bug-id: 1962
* gpg: Emit status line NEWSIG before signature verification starts.Werner Koch2015-04-162-3/+5
| | | | | | | | | | * g10/mainproc.c (check_sig_and_print): Emit STATUS_NEWSIG. -- gpgsm does this for a long time but somehow it never made it into gpg. Signed-off-by: Werner Koch <[email protected]> (backported from 2.1 commit e7ddaad0fd2c8774a1d3367adfaa68014eaf65de)
* scd: better handling of extended APDU.NIIBE Yutaka2015-04-153-83/+87
| | | | | | | | | | | | | | | | | * scd/apdu.c (send_le): Bug fix for not append Z when lc<0&&le<0. * scd/app-common.h (struct app_ctx_s): Use bit fields for flags. * scd/ccid-driver.c (CCID_MAX_BUF): New. Only for OpenPGPcard. (struct ccid_driver_s): New field of max_ccid_msglen. Remove ifsd field. (parse_ccid_descriptor): Initialize max_ccid_msglen. (ccid_transceive_apdu_level): Implement sending extended APDU in chain of CCID message. -- With this patch, we won't need PC/SC library/service any more. GnuPG-bug-id: 1947 (backported from 2.1 commit 971d558e862db878a7310e06ed7116dbe36886ab)
* gpgparsemail: Fix last commit (3f2bdac)Werner Koch2015-04-151-1/+2
| | | | | | | | | | | | * tools/rfc822parse.c (parse_field): Replace break by goto. -- Brown paper bag bug: Changing an IF to a WHILE inside another loop requires to fix the inner break. Reported-by: Hanno Böck Signed-off-by: Werner Koch <[email protected]> (backported from 2.1 commit 9433661419043431a6cfc7d84c8450e0b2f6c353)
* gpgparsemail: Fix case of zero length continuation lines.Werner Koch2015-04-151-5/+8
| | | | | | | | | | | | | | | | | | | | * tools/rfc822parse.c (parse_field): Loop after continuation line. -- Using header lines like Name:[lf] [space][lf] [lf] resulted in running into the "(s2 = strchr (delimiters2, *s)" branch and inserting a new token for the empty continuation line. This also led to one byte read after the string which is what Hanno figured. The new code should handle empty continuation lines correct. Reported-by: Hanno Böck Signed-off-by: Werner Koch <[email protected]> (backported from 2.1 commit 3fbeba64a8bfb2b673230c124a3d616b6568fd2f)
* agent: Fix length test in sshcontrol parser.Werner Koch2015-04-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | * agent/command-ssh.c (ssh_search_control_file): Check S before upcasing it. -- In contradiction to the comment we did not check the length of HEXGRIP and thus the GPG_ERR_INV_LENGTH was never triggered. Detected by Stack 0.3: bug: anti-simplify model: | %cmp8 = icmp ne i32 %i.0, 40, !dbg !986 --> false stack: - /home/wk/s/gnupg/agent/command-ssh.c:1226:0 ncore: 2 core: - /home/wk/s/gnupg/agent/command-ssh.c:1225:0 - buffer overflow - /home/wk/s/gnupg/agent/command-ssh.c:1225:0 - buffer overflow (backported from 2.1 commit 3529dd8bb5bafc4e02915648d5f409bd27a9cc37)
* scd: Fix possible NULL deref in apdu.cWerner Koch2015-04-151-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | * scd/apdu.c (control_pcsc_direct): Take care of BUFLEN being NULL. (control_pcsc_wrapped): Ditto. -- pcsc_vendor_specific_init calls the above with BUFFER and BUFLEN as NULL. Reported by Stack 0.3: bug: anti-dce model: | control_pcsc.exit77: %retval.0.i.i76 = phi i32 [ %rc.0.i.i.i73, \ %pcsc_error_to_sw.exit.i.i74 ], [ 0, %if.end.i.i75 ] %tobool198 = icmp ne i32 %retval.0.i.i76, 0, !dbg !728 br i1 %tobool198, label %if.then199, label %if.end200, !dbg !728 stack: - /home/wk/s/gnupg/scd/apdu.c:1882:0 ncore: 1 core: - /home/wk/s/gnupg/scd/apdu.c:1309:0 - buffer overflow (backported from 2.1 commit ef0a3abf7305133d071bf1a94a7f461082f9a9aa)
* po: Update Japanese translation.NIIBE Yutaka2015-04-151-9/+6
|
* gpg: Fix DoS while parsing mangled secret key packets.Werner Koch2015-04-051-7/+43
| | | | | | | | | | | | | | | * g10/parse-packet.c (parse_key): Check PKTLEN before calling mpi_read et al. -- Due to the missing length checks PKTLEN may turn negative. Because PKTLEN is an unsigned int the malloc in read_rest would try to malloc a too large number and terminate the process with "error reading rest of packet: Cannot allocate memory". Reported-by: Hanno Böck. Signed-off-by: Werner Koch <[email protected]> (backported from 2.1 commit d901efcebaefaf6eae4a9b9aa8f0c2c055d3518a)
* doc: Document the changed default algos for gpgsm.Werner Koch2015-03-251-2/+2
| | | | --
* sm: Change default algos to SHA256 (CSR) and AES128 (bulk encryption).Werner Koch2015-03-252-3/+3
| | | | | | | | * sm/certreqgen.c (create_request): Change default hash algo. * sm/gpgsm.c (main): Change default bulk cipher algo. -- Signed-off-by: Werner Koch <[email protected]>
* gpgtar: Fix extracting files with !(size % 512)Andre Heinecke2015-03-171-1/+5
| | | | | | | | | | | | | | | | | | * tools/gpgtar-extract.c (extract_regular): Handle size multiples of RECORDSIZE. -- If a hdr->size was a multiple of 512 the last record would not have been written and the files corrupted accordingly. GnuPG-bug-id: 1926 Signed-off-by: Andre Heinecke <[email protected]> Changed to use only if-else. Signed-off-by: Werner Koch <[email protected]> (cherry picked from commit 6cbbb0bec98e1acefc4c7163cc41a507469db920)
* common: Check option arguments for a valid rangeWerner Koch2015-03-112-8/+47
| | | | | | | | | | | | | | * common/argparse.h (ARGPARSE_INVALID_ARG): New. * common/argparse.c: Include limits h and errno.h. (initialize): Add error strings for new error constant. (set_opt_arg): Add range checking. -- Signed-off-by: Werner Koch <[email protected]> [ This is a backport of 0d73a242cb53522669cf712b5ece7d1ed05d003a from master to STABLE-BRANCH-2-0 ] Signed-off-by: Daniel Kahn Gillmor <[email protected]>
* gpg: New command --list-gcrypt-config.Werner Koch2015-03-111-0/+10
| | | | | | | * g10/gpg.c (aListGcryptConfig): New. (main): Implement command. Signed-off-by: Werner Koch <[email protected]>
* gpg: Remove left-over debug message.Werner Koch2015-02-261-3/+0
| | | | * g10/armor.c (check_input): Remove log_debug.
* Post release updates.Werner Koch2015-02-182-1/+5
| | | | --