aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* w32: Fix installing of .def file.Werner Koch2013-05-231-0/+1
| | | | * src/Makefile.am (install-def-file): Create libdir first.
* Fix libtool 2.4.2 to correctly detect .def files.Werner Koch2013-05-232-5/+9
| | | | | | | | | | | | | | | | | | | * build-aux/ltmain.sh (sed_uncomment_deffile): New. (orig_export_symbols): Uncomment def file before testing for EXPORTS. * m4/libtool.m4: Do the same for the generated code. -- The old code was not correct in that it only looked at the first line and puts an EXPORTS keyword in front if missing. Binutils 2.22 accepted a duplicated EXPORTS keyword but at least 2.23.2 is more stringent and bails out without this fix. There is no need to send this upstream. Upstream's git master has a lot of changes including a similar fix for this problems. There are no signs that a libtool 2.4.3 will be released to fix this problem and thus we need to stick to our copy of 2.4.2 along with this patch. Signed-off-by: Werner Koch <[email protected]>
* Support --no-encrypt-to also with gpgme_op_encrypt_sign.Werner Koch2013-05-221-0/+3
| | | | | * src/engine-gpg.c (gpg_encrypt_sign): Support the GPGME_ENCRYPT_NO_ENCRYPT_TO flag.
* Allow symmetric encryption with gpgme_op_encrypt_sign.Werner Koch2013-05-224-14/+62
| | | | | | | | | | | * src/encrypt-sign.c (encrypt_sym_status_handler): New. (encrypt_sign_start): Handle recp == NULL case. * src/engine-gpg.c (gpg_encrypt_sign): Implement symmetric encryption. * tests/gpg/t-encrypt-sign.c (main): Add a test case for this. -- Co-authored-by: Kyle L. Huff <[email protected]> GnuPG-bug-id: 1440
* gpgme-tool: Allow for symmetric encryption.Werner Koch2013-05-221-2/+5
| | | | | * src/gpgme-tool.c (gt_sign_encrypt): Pass NULL for recp if no recipients are given.
* tests: Print auditlog in plain text format.Werner Koch2013-05-221-1/+1
| | | | | | | | * tests/gpgsm/t-verify.c (show_auditlog): Use plain text format. -- The HTML output is not very helpful on the console and a pain to the eyes.
* Improve C++ compatibility of previous patch.Werner Koch2013-05-181-2/+1
| | | | | | | | | | | | * src/gpgme.h.in: Move gpgme_sssize_t and gpgme_off_t typedefs into the extern "C" scope. -- Frankly, this does not help very much because g++ still does not interpret gpgme_data_seek_cb_t as compatible with the C++ ssize_t. I am sorry for that API change but C and C++ are too different to always get both of them under one umbrella. However, the ABI should now be identical to older gpgme versions.
* Make definition of off_t robust against misbehaving w32 toolchains.Werner Koch2013-05-1619-99/+153
| | | | | | | | | | | | | | | | * configure.ac (NEED__FILE_OFFSET_BITS): Change to define gpgme_off_t and gpgme_ssize_t. (API__OFF_T, API__SSIZE_T): New ac_subst. * src/gpgme.h.in: Replace all ssize_t and off_t by ac_subst macros. * src/assuan-support.c, src/ath-pthread.c, src/ath.c, src/ath.h * src/data-compat.c, src/data-fd.c, src/data-mem.c, src/data-stream.c * src/data-user.c, src/data.c, src/data.h, src/engine-gpgsm.c * src/engine-uiserver.c, src/gpgme-tool.c, src/gpgme.c: Replace off_t by gpgme_off_t and sszie_t by gpgme_ssize_t. * src/ath-pthread.c, src/ath.h: Include gpgme.h. -- For a detailed description, see the gpgme.texi diff.
* w32: Change the way the I/O threads are cleaned up.Werner Koch2013-05-111-90/+73
| | | | | | | | | | | | | | | | | * src/w32-io.c (reader_context_s, create_reader) (writer_context_s, create_writer): Rename STOPPED to CLOSE_EV. (reader, writer): Remove setting of STOPPED. Wait for CLOSE_EV and then release the context. (destroy_reader, destroy_writer): Do not wait but set the CLOSE_EV. (kill_reader, kill_writer): Remove. (_gpgme_io_close): Add code from kill_reader and kill_writer. -- The old code was prone to deadlocks which were actually exhibited at Kleopatra startup. The new code is much more straightforward and easier to understand. The reason for the complex old code was probably due to our former idea to allow re-use of the I/O threads. However we have long given up on this.
* Fix hang in socket closing.Werner Koch2013-05-081-0/+36
| | | | | * src/w32-io.c (destroy_reader): Call shutdown. (reader): Do not print an error in the shutdown case.
* Improve debug output of the I/O reader and writer.Werner Koch2013-05-081-5/+17
| | | | * src/w32-io.c (reader, writer): Also print file_sock.
* Simplify a debug code function.Werner Koch2013-05-061-11/+4
| | | | * src/debug.c (_gpgme_debug): Remove static space string.
* Post release version bump.Werner Koch2013-05-012-1/+5
| | | | --
* Release 1.4.1.gpgme-1.4.1Werner Koch2013-05-012-4/+6
| | | | * configure.ac: Bump LT version to C20/A9/R1.
* Disable fd-passing for Apple.Werner Koch2013-05-011-1/+12
| | | | | | | | | | * configure.ac: Disable fd-passing by default for Apple. -- We have not yet tracked down the problem, thus we revert to the pre-1.4 behaviour for Apple. GnuPG-bug-id: 1483
* Allow reading of long gpgconf output lines.Werner Koch2013-04-302-43/+81
| | | | | * src/engine-gpgconf.c (gpgconf_read): Rewrite to allow for line lengths up to 64k.
* Syntax fix for gpgme.texi.Werner Koch2013-04-301-1/+1
| | | | | | -- This fixes commit 12374cbecede047accd2d2267bba5927037ed16c.
* Fix for i686-w64-mingw32.Werner Koch2013-04-291-6/+8
| | | | * configure.ac (NEED__FILE_OFFSET_BITS): Do not define under Windows.
* Explain the GPGME_DEBUG variable.Werner Koch2013-04-161-0/+42
| | | | --
* Post release version number bump.Werner Koch2013-02-262-1/+5
| | | | --
* Release 1.4.0.gpgme-1.4.0Werner Koch2013-02-267-11/+20
| | | | * configure.ac: Bump LT version to C20/A9/R0.
* Enable FD passing and thus building of the UI-server.Werner Koch2013-02-263-3/+20
| | | | | * configure.ac: Make --enable-fd-passing the default. * src/engine-uiserver.c (_gpgme_engine_ops_uiserver): Syntax fix.
* w32: Hacks for building with 32 bit mingw64.Werner Koch2013-02-263-2/+11
| | | | | | | | | | | | | | * configure.ac (INSERT__TYPEDEFS_FOR_GPGME_H): Add hacks for 32 bit mingw64. * src/util.h [W32]: Include winsock2.h before windows to make mingw64 happy. * src/w32-util.c (_WIN32_IE): Need to use 5.1 for mingw64. -- It is not clear to me what mingw64 wants to achieve with their POSIX hacks. In particular the off64_t stuff looks quite strange given that Windows has a pretty stable API for close to 2 decades. Thus I can't say whether it will really work when build with that toolchain.
* Improve missing libgpg-error reporting in configure.Werner Koch2013-02-261-2/+17
| | | | | * configure.ac (NEED_GPG_ERROR_VERSION): New. Improve reporting for missing libgpg-error.
* Change the various version numbers to the new scheme.Werner Koch2013-02-264-54/+125
| | | | | | | | | | | | | | | * configure.ac: Rename my_foo variables to mym4_foo variables to make clear that they are processed by m4. (VERSION_NUMBER): New ac_subst. (AH_BOTTOM): Add CRIGHTBLURB macro. (BUILD_REVISION, BUILD_FILEVERSION, BUILD_TIMESTAMP): Change them to work similar to libgpg-error et al. * src/versioninfo.rc.in: Remove use of BUILD_NUMBER and get it in line with gpg-error et al. * src/version.c (cright_blurb): New. (gpgme_check_version_internal): Add magic to display the above information. * tests/t-version.c (main): Add option --verbose.
* Update GnuPG related m4 files.Werner Koch2013-02-262-28/+56
| | | | | * m4/gpg-error.m4: Update from libgpg-error. * m4/libassuan.m4: Update from libassuan.
* Update helper scripts.Werner Koch2013-02-2612-13/+10649
| | | | | | | | | | | | * configure.ac: Use AC_CONFIG_AUX_DIR. Remove args from AM_INIT_AUTOMAKE. Replace AM_CONFIG_HEADER by AC_CONFIG_HEADER. * compile, config.guess, config.sub, depcomp, install-sh, ltmain.sh * mkinstalldirs, texinfo.texi: Move to build-aux/ and update from gnulib (c042abf). * build-aux/mdate-sh, build-aux/missing: Install via automake -a -c. Update autogen.sh for changed config dir. * autogen.sh: Adjust for scripts dir change. Update W32 toolprefix list.
* Remove included gitlog-to-changelog.Werner Koch2013-02-252-377/+3
| | | | | | * build-aux/gitlog-to-changelog: Remove. * configure.ac (GITLOG_TO_CHANGELOG): Default to just gitlog-to-changelog.
* Declare next version to be 1.4.0Werner Koch2013-02-123-4/+4
| | | | --
* Add macro GPGME_VERSION_NUMBER.Werner Koch2013-02-123-3/+13
| | | | | | | | * src/gpgme.h.in (GPGME_VERSION_NUMBER): New. * configure.ac (my_version_major, my_version_minor) (my_version_micro): New m4 macros. (my_version): Build from new m4 macros. (VERSION_NUMBER): New ac_subst.
* Add public function gpgme_get_pinentry_mode.Werner Koch2013-02-125-0/+16
| | | | * src/gpgme.c (gpgme_get_pinentry_mode): New.
* gpgme_tool: Support GPG's new pinentry-mode.Werner Koch2013-02-073-5/+118
| | | | | | | | | | | * src/gpgme-tool.c (log_error): Do not always print the error source. (gt_set_pinentry_mode): New. (server_passphrase_cb): New. (cmd_pinentry_mode): New. (register_commands): Add cmd_pinentry_mode. (options): Add option --gpg-binary. (struct args): Add field gpg-binary. (parse_options, main): Implement that option.
* Add public function gpgme_set_pinentry_mode.Werner Koch2013-02-0714-7/+140
| | | | | | | | | | | | | | | | | * src/gpgme.c (gpgme_set_pinentry_mode): New. * src/gpgme.h.in (gpgme_pinentry_t): New. (gpgme_set_pinentry_mode): New. * src/context.h (struct gpgme_context): Add field pinentry_mode. * src/engine-backend.h (struct engine_ops): Add field set_pinentry_mode. * src/engine-gpg.c (struct engine_gpg): Add field pinentry_mode. (build_argv): Implement pinentry_mode. (gpg_set_pinentry_mode): New. (_gpgme_engine_ops_gpg): Register gpg_set_pinentry_mode. -- Note that this new fucntion may only be used with gpg 2.1.
* Add public function gpgme_io_writen.Werner Koch2013-02-075-129/+158
| | | | | | | | * src/gpgme.c (gpgme_io_read): New. -- This is a writen style variant for gpgme_io_write. It is often easier to use this one in passphrase and edit callbacks.
* Use gpg_error_from_syserror instead of directly accessing errno.Werner Koch2013-02-0627-135/+133
| | | | | | | | -- Also fixed a couple of minor thing; e.g. save the error before calling cleanup functions. Do not save the errno if only free is called in between.
* Improve parsing of the GIT revision number.Werner Koch2012-11-161-6/+5
| | | | * configure.ac (git_revision): Use git rev-parse.
* Fix non-portable use of chmod in autogen.sh.Werner Koch2012-11-161-2/+2
| | | | * autogen.sh: Remove option -c from chmod.
* Make _gpgme_encode_percent_string work for memory buffers.Werner Koch2012-11-151-1/+1
| | | | | | | * src/conversion.c (D_gpgme_encode_percent_string): Remove stray semicolon. Reported by Xi Wang. -- Obviously this function is not used with a supplied LEN argument != 0.
* Make local variables configure hack more robustWerner Koch2012-10-241-1/+1
| | | | | * configure.ac (emacs_local_vars_begin): Use extra m4 quoting so that newer Emscasen won't take it up as Local Variables for this file.
* Fix ttyname problem on Android.Werner Koch2012-10-243-4/+27
| | | | | | | | | | | | | | | * configure.ac: Define macro and conditional HAVE_ANDROID_SYSTEM. * m4/gnupg-ttyname.m4: Force use of replacement on Android. * src/ttyname_r.c: Ditto. -- Android's bionic lib has no working ttyname_r() nor ttyname(). Using them anyway will print FIX ME! implement ttyname_r() bionic/libc/bionic/stubs.c:466 Thus we force the use of our replacement code which simply return "/dev/tty".
* tests: Adhere to the docs and call gpgme_check_version.Werner Koch2012-10-241-0/+1
| | | | * tests/t-engine-info.c: Call gpgme_check_version.
* Trace the use of GPG_ERR_INV_ENGINE.Werner Koch2012-10-1920-37/+65
| | | | | | | | | | | | | | * src/debug.h: Include "gpgme.h" (_gpgme_trace_gpgme_error): New. (trace_gpg_error): New macro. Use it in all files where we return GPG_ERR_INV_ENGINE; also "include debug.h" as needed. -- This is a pretty common error code but often it is hard to figure out the actual cause. With debug level 4 we now print the file name and line number where this error code is generated by gpgme. Along with the git revision printed in the first log lines, this should give us an easier way to track down the problems related to this error code.
* Avoid warning about initialized but not used variableWerner Koch2012-10-191-2/+3
| | | | * src/engine-gpgsm.c (gpgsm_set_fd): Do not set DIR if not needed.
* gpgme-tool: Use membuf functions to build up strings.Werner Koch2012-10-111-32/+159
| | | | | | | | | | | * src/gpgme-tool.c (clear_membuf, init_membuf, put_membuf) (put_membuf_str, get_membuf, peek_membuf): Add membuf functions. Take from GnuPG master's common/membuf.[ch] and patch for our use. (result_xml_escape): Rewrite using new functions. -- First counting, then allocating, and finally copying data is prone to errors. We better use the membuf functions which make it much easier.
* gpgme-tool: Change license from LPGLv2+ to GPLv3+Werner Koch2012-10-112-5/+6
| | | | | | | | * src/gpgme-tool.c: Change license notice. -- gpgme-tool.c is a standalone program, thus it makes no sense to keep it under the LGPL. We already had the manual under GPLv3+.
* gpgme-tool: escape special characters in output XML data (<, >, and &).W. Trevor King2012-10-111-2/+67
| | | | | | | | | | | | | | | | | | | | [[PGP Signed Part:Undecided]] src/gpgme-tool.c (result_xml_escape_replacement, result_xml_escape): New. (result_xml_tag_data): Use result_xml_escape() to escape data. (result_add_error): Use unescaped < and >. -- This is a general solution for generating valid XML, but the specific output that inspired the change was from the KEYLIST command: <uid>William Trevor King <[email protected]></uid> Now the uids are properly escaped: <uid>William Trevor King &lt;[email protected]&gt;</uid> Signed-off-by: W. Trevor King <[email protected]>
* gpgme-tool: Fix chain_id -> chain-id in KEYLIST XML.W. Trevor King2012-10-111-1/+1
| | | | | | | | | | [[PGP Signed Part:Undecided]] src/gpgme-tool.c (cmd_keylist): Use <chain-id> instead of <chain_id>. -- All the other tags map struct attribute underscores to hyphens, so fixing <chain_id> follows the priciple of least surprise. Signed-off-by: W. Trevor King <[email protected]>
* gpgme-tool: Return more detailed XML from KEYLISTW. Trevor King2012-09-281-14/+120
| | | | | | | | | | | | | | | | | src/gpgme-tool.c (cmd_keylist): Convert output from a list of to more detailed XML. (xml_preamble1, xml_preamble2, xml_end): Make global. (result_add_protocol, result_add_validity): New functions for generating XML from GPGME types. (result_add_string): Treat NULL strings as "". (result_xml_tag_data): Make 'data' a 'const char' so we can use the value returned by gpgme_get_protocol_name directly. -- This is a first pass at returning most of the gpgme_key_t data from the KEYLIST call. Signed-off-by: W. Trevor King <[email protected]>
* gpgme-tool: Initialize input_fd and output_fdW. Trevor King2012-09-281-0/+2
| | | | | | * src/gpgme-tool.c (gpgme_server): Initialize input_fd and output_fd. Signed-off-by: W. Trevor King <[email protected]>
* gpgme-tool: Fix handling of file descriptorsWerner Koch2012-09-261-16/+35
| | | | | | | | | | | | | | * src/gpgme-tool.c (server_reset_fds): Use close/CloseHandle instead of the assuan close functions. (_cmd_decrypt_verify, _cmd_sign_encrypt, cmd_verify, cmd_import) (cmd_export, cmd_genkey, cmd_getauditlog): Use SERVER object instead of assuan_get_*_fd functions. -- Although we used our own handlers for INPUT and OUTPUT, we still used assuan_get_input_fd, assuan_get_output_fd and their close functions. That clearly can't work because libassuan does not have any values for them.