aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add per-ctx custom engine options.bjk/custom-engine-optionsBen Kibbey2015-07-1714-1/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | * src/gpgme.h.in (gpgme_ctx_set_engine_options): New prototype. (gpgme_ctx_get_engine_options): Ditto. * src/engine-backend.h (engine_ops): Add set_options and get_options. * src/engine.c (gpgme_ctx_set_engine_options): New. (gpgme_ctx_get_engine_options): Ditto. * src/engine-gpg.c (gpg_set_options): New. (gpg_get_options): Ditto. * src/op-support.c (_gpgme_op_reset): Keep custom options. * src/engine-gpg.c (_gpgme_engine_ops_gpg): Adjust for new members. * src/engine-assuan.c (_gpgme_engine_ops_assuan): Ditto. * src/engine-g13.c (_gpgme_engine_ops_g13): Ditto. * src/engine-gpgconf.c (_gpgme_engine_ops_gpgconf): Ditto. * src/engine-gpgsm.c (_gpgme_engine_ops_gpgsm): Ditto. * src/engine-spawn.c (_gpgme_engine_ops_spawn): Ditto. * src/engine-uiserver.c (_gpgme_engine_ops_uiserver): Ditto. * src/gpgme.def: Export new symbols. * src/libgpgme.vers: Ditto. * doc/gpgme.texi: Document these new functions. -- Not all of gpg2's features are exposed to libgpgme and adding these functions makes it possible to do things like specify an --s2k-count, etc.
* Post release updatesWerner Koch2015-06-082-2/+6
| | | | --
* Release 1.5.5gpgme-1.5.5Werner Koch2015-06-083-5/+11
|
* Fix regression with gpgsm 2.0 due to "OPTION with-secret".Werner Koch2015-06-081-16/+30
| | | | | | | | | | | | | | | | | | | * src/engine-gpgsm.c (gpgsm_assuan_simple_command): Do not terminate on a status lines. -- This bug has been with us since the support for gpgsm: If there is no status line handler but a status line is received anyway the command handling loop terminates and thus the command/answer order gets out of sync. In the case of the bug report this is triggered by sending an option which starts the agent and that starting emits a "PROGRESS" status line. The solution is not to stop reading after a status line but record a possible error code and return that only after OK or ERR. GnuPG-bug-id: 1795 Signed-off-by: Werner Koch <[email protected]>
* tests: Add option --secret to run-keylist.Werner Koch2015-06-081-1/+8
| | | | Signed-off-by: Werner Koch <[email protected]>
* Fix compiler warnings about unused value in TRACE macros.Werner Koch2015-06-082-37/+45
| | | | | | | | | | | | | | * src/debug.h: Change macros to not have a literal 0 as last expression of the comma operator. * src/debug.c (_gpgme_debug_frame_end): Return 0. (_gpgme_debug): Return 0. -- Instead of using foo(), 0 for the trace macros we let foo() return 0 instead. Signed-off-by: Werner Koch <[email protected]>
* Fix test suite for GnuPG 2.1 which uses pubring.kbx.Werner Koch2015-06-088-16/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * tests/gpgsm/final.test: New. * tests/gpgsm/initial.test: New. * tests/gpg/start-stop-agent: Move to ../. * tests/gpgsm/Makefile.am (TESTS_ENVIRONMENT): Export top_srcdir. (TESTS): Add intial.test and final.test. (AM_LDFLAGS): Add -no-install. (clean-local): Use start-stop-agent (initial.test): Add dependency. * tests/gpg/Makefile.am (top_srcdir): Export top_srcdir. (AM_LDFLAGS): Add -no-install. (check-local): Depend on pubring-stamp instead of pubring.gpg. (initial.test): Depend on check-local. (./pubring-gpg): Replace by rule for ./pubring-stamp. -- There are also a couple of other changes which should make the tests a bit more robust and the gpg and gpgsm tests more similar. The -no-install avoids creating wrappers for test programs, which make debugging easier. The dependency on check-local guarantees that its rules are run before the first test. This is important because conf files are setup by this rule. Earlier automake versions seem to have run check-local always before the tests but today the order of execution is not defined. Signed-off-by: Werner Koch <[email protected]>
* Set GPGME_SIGSUM_KEY_REVOKED also for gpg.Matthew Barnes2015-06-051-0/+7
| | | | | | | | | | | | * src/verify.c (calc_sig_summary): Handle GPG_ERR_CERT_REVOKED. -- parse_new_sig() handles a revoked key by setting sig->status to GPG_ERR_CERT_REVOKED, but then later calc_sig_summary() expects that code in sig->validity_reason. Additional comments added by wk.
* Fix segv for userids with a backslash.Werner Koch2015-06-051-0/+1
| | | | | | | | | | | * src/engine-gpg.c (gpg_keylist_preprocess): Increment SRC for a backslash. -- This bug is not exploitable because this bug fills up .data with backslashes and thus causes the segv. Signed-off-by: Werner Koch <[email protected]>
* Post release updates.Werner Koch2015-04-132-2/+6
| | | | --
* Release 1.5.4.gpgme-1.5.4Werner Koch2015-04-133-9/+10
|
* w32: Use -static-libgcc to avoid linking to libgcc_s_sjlj-1.dll.Werner Koch2015-04-131-4/+8
| | | | | | | | | | | | | | | | | | * src/Makefile.am (extra_ltoptions): New. (libgpgme_la_LDFLAGS): Use it. (libgpgme_pthread_la_LDFLAGS): Ditto. (libgpgme_glib_la_LDFLAGS): Ditto. -- Since gcc 4.8 there is a regression in Mingw64 in that plain C programs may link to libgcc_s.a which has a dependency on libgcc_s_sjlj.dll. This is for example triggered by using long long arithmetic on a 32 bit Windows (e.g symbol __udivdi3). Note that we don't use this patch for the Qt version which, as C++ programs, actually requires that DLL, Signed-off-by: Werner Koch <[email protected]>
* Fix potential crash in trace macro.Werner Koch2015-03-163-5/+3
| | | | | | | | | * src/signers.c (gpgme_signers_add): Avoid deref of a NULL KEY in the trace macro. * src/engine-spawn.c (engspawn_release): Remove always true condition. * src/engine-gpg.c (gpg_release): Ditto. Signed-off-by: Werner Koch <[email protected]>
* Fix one byte too short malloc.Werner Koch2015-03-161-1/+1
| | | | | | | | | | | | | | * src/engine-spawn.c (add_data): Fix malloc -- Bummer. Why did I subtracted one from the size? Did I assume a dynamically allocated structure with a string field which was not going to be used? Very strange. Not a real problem though because malloc will anyway round up the allocation to at least the next word size. Detected by Stack 0.3.
* Switch to automake 1.14 and update build-aux files.Werner Koch2015-01-3011-829/+1086
| | | | Signed-off-by: Werner Koch <[email protected]>
* doc: Update gpl.texi to match version from gnupgDaniel Kahn Gillmor2014-12-151-13/+21
| | | | | | | | | | | | | -- Somehow the doc/gpl.texi from gpgme and gnupg drifted out of sync. This patch to gpgme's file brings it in line with gnupg's master branch, and avoids the following errors during make: ./gpl.texi:667: @section seen before @end enumerate ./gpl.texi:724: unmatched `@end enumerate' ./gpl.texi:1: warning: node next `Copying' in menu `Concept Index' and in sectioning `Function and Data Index' differ
* Post release updates.Werner Koch2014-12-113-4/+10
| | | | --
* Release 1.5.3.gpgme-1.5.3Werner Koch2014-12-112-2/+5
| | | | * configure.ac: Set LT version to C24/A13/R2.
* Return an error for some export key operations.Werner Koch2014-12-082-4/+127
| | | | | | | | | | | | | | | | * src/context.h (OPDATA_EXPORT): New. * src/export.c (op_data_t): New. (release_op_data): New. (parse_error): New. (export_status_handler): New. (export_start, export_ext_start): Prepare op_data. (gpgme_op_export_ext, gpgme_op_export_keys): Return an error from the status handler. -- To support an error return also for the async functions we need to extend the API. Until we have done that this new features helps at least in some cases; in particular for --send-keys.
* Post release updatesWerner Koch2014-11-213-3/+7
| | | | --
* Release 1.5.2.gpgme-1.5.2Werner Koch2014-11-212-2/+6
| | | | * configure.ac: Set LT version to C24/A13/R1.
* Update the previous commitWerner Koch2014-11-211-58/+54
| | | | | | | | | | | * src/sign.c (gpgme_op_sign_result): Reformat and take care of failed malloc. -- Although _gpgme_debug_trace() is current always true, the code should be run always and not just in trace mode. Also added error checking to malloc and strdup. And while at replace some while by for loop for easier readability.
* Fix returning new signatures when there are none.Ben Kibbey2014-11-211-8/+54
| | | | | | | | | | | | | | | | | | * src/sign.c (gpgme_op_sign_result): Test that invalid and valid signatures add up to gpgme_signers_count(). -- When invalid and valid signatures do not equal gpgme_signers_count() it means that there was a bad passphrase during signing after the first signer. This leaves the result.signatures from previous signers intact which isn't correct since gpg will report: gpg: number of one-pass packets does not match number of signature packets gpg: can't handle this ambiguous signature data during verify. So when this happens append the valid signatures to the .invalid_signers list with .reason set to GPG_ERR_GENERAL.
* doc: Clarify the FILE command.Werner Koch2014-11-191-4/+9
| | | | --
* Improve the debug output a bit.Werner Koch2014-11-062-3/+4
| | | | * src/debug.h (TRACE_ERR): Include the line number in the output.
* build: Implement SYSROOT feature.origin/bjk/masterWerner Koch2014-10-024-17/+116
| | | | | | * configure.ac: Document SYSROOT. * m4/gpg-error.m4: Update from libgpg-error master. * src/gpgme.m4: Implement SYSROOT stuff.
* Use --no-sk-comments, not --no-sk-comment.Daniel Kahn Gillmor2014-10-021-2/+2
| | | | | | | -- The --no-sk-comments flag is (or should be) a no-op in modern versions of gnupg, but gpgme should still use its full form rather than the (slightly) abbreviated --no-sk-comment
* Register DCO for Daniel Kahn Gillmor.Werner Koch2014-09-241-1/+9
| | | | --
* Add ftp and git URLs to AUTHORS.Werner Koch2014-09-241-0/+2
| | | | --
* tests: Delay some test file extraction until "make check".Werner Koch2014-09-242-2/+3
| | | | | * tests/gpg/Makefile.am (all-local): Change to check-local. * tests/gpgsm/Makefile.am (all-local): Ditto.
* Clean up gpgme's tests/gpg when gpg2.1 is availableDaniel Kahn Gillmor2014-09-242-1/+2
| | | | | | | * tests/gpg/Makefile.am: Clean up .gpg-v21-migrated -- We also need to gitignore this file.
* gpgme-tool: Print fingerprint and keyid with keyservers.Werner Koch2014-08-121-1/+3
| | | | | * src/gpgme-tool.c (cmd_keylist): Print keyid. Print FPR only if available.
* Handle modern keyserver output which may emit the fingerprint.Werner Koch2014-08-121-9/+44
| | | | | * src/engine-gpg.c (read_colon_line): Split preprocessed lines. (gpg_keylist_preprocess): Limit keyid field and print fingerprint.
* gpgme-tool: Install gpgme-tool.Werner Koch2014-08-122-4/+8
| | | | | * src/Makefile.am (bin_PROGRAMS): New. Add gpgme-tools. (noinst_PROGRAMS): Remove.
* gpgme-tool: Fix segv for external key listing.Werner Koch2014-08-121-7/+10
| | | | * src/gpgme-tool.c (result_xml_escape): Allow for DATA being NULL.
* Post release updates.Werner Koch2014-07-302-1/+5
| | | | --
* Release 1.5.1gpgme-1.5.1Werner Koch2014-07-302-6/+6
| | | | * configure.ac: Change LT version to C24/A13/R0.
* Fix possible realloc overflow for gpgsm and uiserver engines.Werner Koch2014-07-303-2/+5
| | | | | | | | | | | | | | | | * src/engine-gpgsm.c (status_handler): * src/engine-uiserver.c (status_handler): -- After a realloc (realloc is also used for initial alloc) the allocated size if the buffer is not correctly recorded. Thus an overflow can be introduced by receiving data with different line lengths in a specific order. This is not easy exploitable because libassuan constructs the line. However a crash has been reported and thus it might be possible to constructs an exploit. CVE-id: CVE-2014-3564 Reported-by: Tomáš Trnka
* w32: Get IOSPAWN flag back in sync with spawn helper.Werner Koch2014-06-262-18/+8
| | | | * src/gpgme-w32spawn.c: Include priv-io.h.
* w32: Add comment about a compiler warningWerner Koch2014-06-261-0/+6
| | | | --
* Add new reason codes to the INV_RECP status code.Werner Koch2014-06-101-0/+8
| | | | * src/op-support.c (_gpgme_parse_inv_recp): Add codes 13 and 14.
* Add new keylist mode GPGME_KEYLIST_MODE_WITH_SECRET.Werner Koch2014-06-047-13/+64
| | | | | | | | | | | | | | * src/gpgme.h.in (GPGME_KEYLIST_MODE_WITH_SECRET): New. * src/engine-gpg.c (gpg_keylist_build_options): Handle new mode. * src/engine-gpgsm.c (gpgsm_keylist, gpgsm_keylist_ext): Ditto. * src/keylist.c (parse_sec_field15): Add arg key and take care of --with-secret output. * src/gpgme-tool.c (gt_get_keylist_mode, cmd_keylist_mode): Add "with_secret". Print card info and and secret flag for subkeys. -- Note: This mode may only be used with GnuPG >= 2.1.
* Post release updatesWerner Koch2014-05-212-1/+5
| | | | --
* Release 1.5.0.gpgme-1.5.0Werner Koch2014-05-213-23/+25
| | | | * configure.ac: Change LT version to C22/A11/R0.
* Add 6 new GPGME_STATUS_ codes.Werner Koch2014-05-133-18/+37
| | | | * src/status-table.c: Also add missing DECRYPTION_INFO entry.
* Add field CURVE to the key info.Werner Koch2014-05-086-1/+31
| | | | | | | | | | | | | * src/gpgme.h.in (struct _gpgme_subkey): Add field CURVE. * src/key.c (gpgme_key_unref): Free CURVE. * src/keylist.c (keylist_colon_handler): Set CURVE. * src/gpgme.c (gpgme_release): For failsafe reasons reset engine and engine info after freeing. -- The engine hack is useful in case the other release functions accidently call engine release.
* Fix a memory access and a double slash bug.Werner Koch2014-05-082-2/+2
| | | | | | | | | | | | | | | | | * src/engine-spawn.c (engspawn_start): Allocate space for list terminator. * src/posix-util.c (walk_path): Fix trailing slash detection. -- Kudos to Valgrind for pointing out these two problems. The first is a plain allocation bug in a code pattern I have written thousands of times - this time it went wrong. The allocation is not user controlled thus not directly exploitable. The second is missed to do what it intended to do. Found due to the access of malloced but not initialized memory. Not using calloc again proved to be helpful to detect logical error.
* Map public key algos returned by gpg to gpgme values.Werner Koch2014-05-0810-23/+60
| | | | | | | | | | | | | | | | | | | * src/conversion.c (_gpgme_map_pk_algo): New. * src/decrypt.c (parse_enc_to): Add arg PROTOCOL and map pubkey algo. (_gpgme_decrypt_status_handler): Map pubkey algo. * src/keylist.c (keylist_colon_handler): Map pubkey algo. * src/sign.c (parse_sig_created): Add arg PROTOCOL and map pubkey algo. * src/verify.c (parse_new_sig): Ditto. (parse_valid_sig): Ditto. * src/gpgme.h.in (GPGME_PK_ECC): New. (GPGME_MD_SHA224): New. * src/gpgme.c (gpgme_pubkey_algo_name): Add GPGME_PK_ECC case. (gpgme_hash_algo_name): Add GPGME_MD_SHA224. -- This affects only the not yet released ECC code of GnuPG 2.1.
* Add GPGME_ENCRYPT_NO_COMPRESS flag.Werner Koch2014-05-085-3/+30
| | | | | | * src/gpgme.h.in (GPGME_ENCRYPT_NO_COMPRESS): New. * src/engine-gpg.c (gpg_encrypt, gpg_encrypt_sign): Implement it. * src/gpgme-tool.c (_cmd_sign_encrypt): Add option --no-compress.
* w32: Fix another memleak on error.Werner Koch2014-04-162-0/+5
| | | | | | | * src/w32-io.c (create_reader): free CTX. -- Found by Hans-Christoph Steiner with cppcheck.