summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* doc: Do not used fixed file names in the manuals.Werner Koch2015-06-0915-45/+376
| | | | | | | | | | | | | | | | | | | | | | * doc/mkdefsinc.c: New. * doc/Makefile.am: Include cmacros.am. (EXTRA_DIST): Add mkdefsinc.c defsincdate. (BUILT_SOURCES): Add defsincdate (CLEANFILES): Add mkdefsinc and defs.inc. (mkdefsinc): New rule. (yat2m-stamp): Depend on defs.inc. ($(myman_pages) gnupg.7): Ditto. (gnupg.texi): Remove rule to touch itself. (dist-hook): New. (defsincdate): New. (defs.inc): New. * doc/gnupg.texi: Remove inclusion of version.texi. Include defs.inc. Also include defs.inc in all files used to build man files. Change fixed directory names to those from defs.inc. -- GnuPG-bug-id: 1661 Signed-off-by: Werner Koch <wk@gnupg.org>
* dirmngr: Avoid crash due to an empty crls.d/DIR.txt.Werner Koch2015-06-091-1/+3
| | | | | | | | * dirmngr/crlcache.c (check_dir_version): Avoid segv. -- GnuPG-bug-id: 1842 Debian-bug-id: 776611
* doc: Change the manual source to be only for GnuPG 2.1Werner Koch2015-06-087-432/+27
| | | | Signed-off-by: Werner Koch <wk@gnupg.org>
* Convey envvar INSIDE_EMACS to the pinentry.Werner Koch2015-06-081-1/+3
| | | | | | * common/session-env.c (stdenvnames): Add it. Signed-off-by: Werner Koch <wk@gnupg.org>
* agent: Add command "getinfo std_env_names".Werner Koch2015-06-081-0/+16
| | | | | | | | | | | | | | | | | | | | * agent/command.c (cmd_getinfo): Add new sub-command. -- The current output is: > getinfo std_env_names D GPG_TTY D TERM D DISPLAY D XAUTHORITY D XMODIFIERS D GTK_IM_MODULE D QT_IM_MODULE D PINENTRY_USER_DATA OK Note that there is an invisible \x00 at the end of each line.
* scd: do_decipher change for OpenPGPcard v3.0.NIIBE Yutaka2015-06-051-3/+21
| | | | * scd/app-openpgp.c (do_decipher): Add a header for ECDH.
* gpg: Replace -1 by GPG_ERR_NOT_FOUND in tdbio.cWerner Koch2015-06-044-66/+71
| | | | | | | | | | | | * g10/tdbio.c (lookup_hashtable): Return GPG_ERR_NOT_FOUND. * g10/tdbdump.c (import_ownertrust): Test for GPG_ERR_NOT_FOUND. * g10/trustdb.c (read_trust_record): Ditto. (tdb_get_ownertrust, tdb_get_min_ownertrust): Ditto. (tdb_update_ownertrust, update_min_ownertrust): Ditto. (tdb_clear_ownertrusts, update_validity): Ditto. (tdb_cache_disabled_value): Ditto. Signed-off-by: Werner Koch <wk@gnupg.org>
* gpg: Cleanup error code path in case of a bad trustdb.Werner Koch2015-06-041-26/+28
| | | | | | | | | | * g10/tdbio.c (tdbio_read_record): Fix returning of the error. -- Actually the returned error will anyway be GPG_ERR_TRUSTDB but the old code was not correct. Signed-off-by: Werner Koch <wk@gnupg.org>
* gpg: Fix output in case of a corrupted trustdb.Werner Koch2015-06-044-13/+14
| | | | | | | | | * g10/tdbdump.c (list_trustdb): Add arg FP and change callers to pass es_stdout. * g10/tdbio.c (upd_hashtable): On a corrupted trustdb call list_trustdb only in verbose > 1 mode and let it dump to stderr. Signed-off-by: Werner Koch <wk@gnupg.org>
* gpg: Re-indent and improve documentation of g10/tdbio.cWerner Koch2015-06-042-965/+1267
| | | | --
* doc: Replace "conventional encryption" by "symmetric encryption".Werner Koch2015-06-023-6/+7
| | | | | | | | -- Suggested-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net> Ported from 2.0.
* scd: Fix key template of ECC.NIIBE Yutaka2015-05-291-1/+1
| | | | | | | | * scd/app-openpgp.c (build_ecc_privkey_template): Use correct value. -- Forthcoming OpenPGPcard specification 3.0 will address this 0x92.
* g10: Fix a race condition initially creating trustdb.NIIBE Yutaka2015-05-281-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 dotlock_create. -- GnuPG-bug-id: 1675
* g10: Remove g10/signal.c.NIIBE Yutaka2015-05-273-211/+2
| | | | | | | | | | | * g10/signal.c: Remove. * g10/main.h: Remove old function API. * g10/tdbio.c: Use new API, even in the dead code. -- We use common/signal.c now. The file g10/signal.c has been useless since 2003-06-27. Now, the removal.
* 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.
* agent: When the password cache is cleared, also clear the ext. cache.Neal H. Walfield2015-05-193-1/+32
| | | | | | | | | * agent/agent.h (agent_clear_passphrase): New declaration. * agent/call-pinentry.c (agent_clear_passphrase): New function. * agent/command.c (cmd_clear_passphrase): Call agent_clear_passphrase. -- Signed-off-by: Neal H. Walfield <neal@g10code.com>
* agent: Modify agent_clear_passphrase to support an ext. password cache.Neal H. Walfield2015-05-193-4/+27
| | | | | | | | | | | * agent/agent.h (agent_get_passphrase): Add arguments keyinfo and cache_mode. Update callers. * agent/call-pinentry.c (agent_get_passphrase): Add arguments keyinfo and cache_mode. If KEYINFO and CACHE_MODE describe a cachable key, then send SETKEYINFO to the pinentry. -- Signed-off-by: Neal H. Walfield <neal@g10code.com>
* g10: detects public key encryption packet error properly.NIIBE Yutaka2015-05-191-5/+3
| | | | | g10/mainproc.c (proc_pubkey_enc): Only allow relevant algorithms for encryption.
* tests: More OpenPGP test keysWerner Koch2015-05-1614-2/+425
| | | | --
* build: Make --disable-gpgsm work.Werner Koch2015-05-153-11/+7
| | | | | | | | | | * Makefile.am: Always build kbx/ * g10/Makefile.am (AM_CFLAGS): Include KSBA_CFLAGS. -- Note that "make check" still prints a warning. Signed-off-by: Werner Koch <wk@gnupg.org>
* Post release updates.Werner Koch2015-05-122-1/+5
| | | | --
* Release 2.1.4gnupg-2.1.4Werner Koch2015-05-121-1/+22
|
* po: Auto-updateWerner Koch2015-05-1225-582/+1552
| | | | --
* speedo,w32: Update Windows README.Werner Koch2015-05-122-68/+15
| | | | --
* speedo: Add make option SELFCHECK=0 to build a new release.Werner Koch2015-05-122-17/+33
| | | | | * build-aux/getswdb.sh: Add option --skip-selfcheck. * build-aux/speedo.mk: Add option SELFCHECK.
* po: Update German translationWerner Koch2015-05-121-26/+60
| | | | --
* gpgparsemail: Rename a variable.Werner Koch2015-05-121-14/+14
| | | | | | | | | -- For unknown reason I used the term MOSS for an RFC1847 structure. MOSS is a historic and broken security format for MIME define in 1848. To avoid misunderstandings this patch changes the term to SMFM which stands for Security Multiparts for MIME (rfc-1847).
* common: Cope with AIX problem on number of open files.Werner Koch2015-05-111-0/+10
| | | | | | | | * common/exechelp-posix.c: Limit returned value for too hight values. -- GnuPG-bug-id: 1778 Signed-off-by: Werner Koch <wk@gnupg.org>
* 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 <wk@gnupg.org>
* agent: Add option --no-allow-external-cache.Werner Koch2015-05-115-14/+54
| | | | | | | | | | | | | | | | * agent/agent.h (opt): Add field allow_external_cache. * agent/call-pinentry.c (start_pinentry): Act upon new var. * agent/gpg-agent.c (oNoAllowExternalCache): New. (opts): Add option --no-allow-external-cache. (parse_rereadable_options): Set this option. -- Pinentry 0.9.2 may be build with libsecret support and thus an extra checkbox is displayed to allow the user to get passwords out of an libsecret maintained cache. Security aware user may want to avoid this feature and may do this at runtime by enabling this option. Signed-off-by: Werner Koch <wk@gnupg.org>
* agent: Add strings for use by future Pinentry versions.Werner Koch2015-05-111-1/+8
| | | | | | | | | | * 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 <wk@gnupg.org>
* agent: Add option --debug-pinentry.Werner Koch2015-05-114-1/+15
| | | | | | | | | | | | | | * agent/gpg-agent.c (oDebugPinentry): New. (opts): Add --debug-pinentry. (parse_rereadable_options): Set that option. * agent/call-pinentry.c (start_pinentry): Pass option to assuan_set_flag. -- This option is quite useful to see the IPC between gpg-agent and Pinentry. Note that "debug 1024" is also required. Signed-off-by: Werner Koch <wk@gnupg.org>
* gpg: Avoid cluttering stdout with trustdb info in verbose mode.Werner Koch2015-05-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 <wk@gnupg.org>
* gpg: Fix wrong output in list mode.Werner Koch2015-05-081-1/+1
| | | | | | | | | | | | | * g10/parse-packet.c (parse_gpg_control): Replace puts by es_fputs to LISTFP. -- Reported-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net> This was an oversight from the conversion to estream or a separate listing stream. Signed-off-by: Werner Koch <wk@gnupg.org>
* gpg: New command --quick-adduid.Werner Koch2015-05-086-30/+185
| | | | | | | | | | | | | | | * g10/keygen.c (ask_user_id): Factor some code out to ... (uid_already_in_keyblock): new. (generate_user_id): Add arg UIDSTR. Fix leaked P. * g10/keyedit.c (menu_adduid): Add new arg uidstring. Adjust caller. (keyedit_quick_adduid): New. * g10/gpg.c (aQuickAddUid): New. (opts): Add command --quick-adduid. (main): Implement that. -- GnuPG-bug-id: 1956 Signed-off-by: Werner Koch <wk@gnupg.org>
* gpg: Add push/pop found state feature to keydb.Werner Koch2015-05-084-5/+88
| | | | | | | | | | | | | | * g10/keydb.c (keydb_handle): Add field saved_found. (keydb_new): Init new field. (keydb_push_found_state, keydb_pop_found_state): New. * g10/keyring.c (kyring_handle): Add field saved_found. (keyring_push_found_state, keyring_pop_found_state): New. -- We have the same feature in gpgsm. It is very useful to check for an unambiguous user id with a follow up update of the keyblock. Signed-off-by: Werner Koch <wk@gnupg.org>
* gpg: Minor code merging in keyedit.Werner Koch2015-05-081-17/+26
| | | | | | | | | | | * g10/keyedit.c (fix_keyblock): Rename to fix_key_signature_order. (fix_keyblock): New. Call fix_key_signature_order and other fix functions. (keyedit_menu): Factor code out to new fix_keyblock. (keyedit_quick_sign): Ditto. Check for primary fpr before calling fix_keyblock. Signed-off-by: Werner Koch <wk@gnupg.org>
* Typo fixesWerner Koch2015-05-081-1/+4
| | | | --
* agent: Minor change for 56b5c9f.Werner Koch2015-05-071-12/+14
| | | | | | | * agent/call-pinentry.c (agent_askpin): Move option setting to ... (start_pinentry): here. Fix error code check. Signed-off-by: Werner Koch <wk@gnupg.org>
* dirmngr: Fix segfault in ldap engineKristian Fiskerstrand2015-05-071-1/+3
| | | | | (ks-engine-ldap.c) Fix segfault caused by missing check whether uri is initialized
* agent: Improve some comments.Neal H. Walfield2015-05-071-7/+7
| | | | | | -- Signed-off-by: Neal H. Walfield <neal@g10code.com>
* agent: Improve support for externally cached passwords.Neal H. Walfield2015-05-071-12/+35
| | | | | | | | | | | | | | | | * agent/call-pinentry.c (PINENTRY_STATUS_PASSWORD_FROM_CACHE): New constant. (pinentry_status_cb): Add it to *FLAGS if PASSWORD_FROM_CACHE was provided. (agent_askpin): Pass "OPTION allow-external-password-cache" to the pinentry. Always pass SETKEYINFO to the pinentry. If there is no stable identifier, then use "--clear". If the password is incorrect and PINENTRY_STATUS_PASSWORD_FROM_CACHE is set in *PINENTRY_STATUS, then decrement PININFO->FAILED_TRIES. -- Signed-off-by: Neal H. Walfield <neal@g10code.com>
* agent: Or in the value; don't overwrite the variable.Neal H. Walfield2015-05-071-1/+1
| | | | | | | | | * agent/call-pinentry.c (pinentry_status_cb): Or in PINENTRY_STATUS_CLOSE_BUTTON; don't overwrite *FLAG. -- Signed-off-by: Neal H. Walfield <neal@g10code.com>
* agent: Avoid magic numbers. Use more accurate names.Neal H. Walfield2015-05-071-12/+20
| | | | | | | | | | | | | * agent/call-pinentry.c (PINENTRY_STATUS_CLOSE_BUTTON): New constant. (PINENTRY_STATUS_PIN_REPEATED): Likewise. (close_button_status_cb): Rename from this... (pinentry_status_cb): ... to this. Use the constants. (agent_askpin): Rename local variable from close_button to pinentry_status. Use symbolic constants rather than magic numbers. -- Signed-off-by: Neal H. Walfield <neal@g10code.com>
* gpg: Improve 'General key info' line of --card-status.Werner Koch2015-05-076-40/+35
| | | | | | | | | | | | | | | | | * g10/keylist.c (print_pubkey_info): Print either "pub" or "sub". * g10/getkey.c (get_pubkey_byfprint): Add optional arg R_KEYBLOCK. * g10/keyid.c (keyid_from_fingerprint): Adjust for change. * g10/revoke.c (gen_desig_revoke): Adjust for change. * g10/card-util.c (card_status): Simplify by using new arg. Align card-no string. * g10/card-util.c (card_status): Remove not used GnuPG-1 code. -- This now prints "sub" if the first used card key is actually a subkey. Signed-off-by: Werner Koch <wk@gnupg.org>
* gpg: Fix regression not displaying the card serial numberWerner Koch2015-05-071-1/+1
| | | | | | | | | | | * g10/call-agent.c (keyinfo_status_cb): Detect KEYINFO. -- This regression is due to commit 585d5c62eece23911a768d97d11f159be138b13d from February 2013! Signed-off-by: Werner Koch <wk@gnupg.org>
* speedo,w32: Install a native pinentry.Werner Koch2015-05-062-15/+21
| | | | | | | | | * build-aux/speedo.mk: Always build pinentry for w32. (speedo_pkg_pinentry_configure): Adjust to modern pinentry. * build-aux/speedo/w32/inst.nsi: Install native pinentry under the name pinentry-basic.exe. Signed-off-by: Werner Koch <wk@gnupg.org>
* g10: fix cmp_public_key.NIIBE Yutaka2015-05-011-5/+8
| | | | | | | | | | | * g10/free-packet.c (cmp_public_keys): Compare opaque data at the first entry of the array when it's unknown algo. -- (forwardported from 2.0 commit 43429c7869152f301157e4b24790b3801dce0f0a) GnuPG-bug-id: 1962
* scd: PC/SC reader selection by partial string match.NIIBE Yutaka2015-04-301-4/+8
| | | | | | | | | | | | | | | | | * scd/apdu.c (open_pcsc_reader_direct): Partial string match. -- 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. Note that we need to change pcsc-wrapper.c in 2.0 backport. GnuPG-bug-id: 1618, 1930
* common: Remove JNLIB from boiler plate (jnlib merge).Werner Koch2015-04-2431-220/+124
| | | | | | | * common/README.jnlib: Remove. -- This is the final part of merging jnlib into gnupg/common.