2 years agocpp: Fix update of partial key in verifyresult
Andre Heinecke [Thu, 15 Dec 2016 10:24:43 +0000 (11:24 +0100)]
cpp: Fix update of partial key in verifyresult

* lang/cpp/src/verificationresult.cpp
(Signature::key(bool,bool)): Don't update the returned copy
but the actual key of the signature.

The whole point of the update is to change the partial key
from the signature (e.g. only fingerprint and one uid as we
would have from tofu) to a fully keylisted one.

2 years agodoc: Let's suggest GNU guidelines for bit checking.
Werner Koch [Wed, 7 Dec 2016 22:25:50 +0000 (23:25 +0100)]
doc: Let's suggest GNU guidelines for bit checking.


While educating students we can also get them to use useful habits, in
particular to parenthese bit tests.

Signed-off-by: Werner Koch <>
2 years agoClarify what "checking on bit" means
Andre Heinecke [Wed, 7 Dec 2016 20:41:34 +0000 (21:41 +0100)]
Clarify what "checking on bit" means

* doc/gpgme.texi (gpgme_sigsum_t summary): Clarify what "you
can check one bit means"

It was unclear which bit to test for is. And tests
with students have shown that they would "test" for
this one bit by using if(sig.summary == GPGME_SIGSUM_VALID)
which would fail because valid sigs are also SIGSUM_GREEN.

So lets give an example for people not used to checking bits and
clarify through this example which bit is meant to be checked.

2 years agopython: Try to be more helpful when given a string to encrypt().
Tobias Mueller [Fri, 2 Dec 2016 22:37:27 +0000 (23:37 +0100)]
python: Try to be more helpful when given a string to encrypt().

* lang/python/helpers.c (_gpg_obj2gpgme_data_t): Extended error
* lang/python/tests/ Test for "encode" in error message.
The motivation is to help the user when encrypting fails. I claim that
it is not obvious to not being able to encrypt a string directly.  To
nudge the user into encoding it to bytes, the error message is a bit

Signed-off-by: Tobias Mueller <>
2 years agopython: Define a macro for wrapping fragile result objects.
Tobias Mueller [Thu, 1 Dec 2016 20:15:12 +0000 (21:15 +0100)]
python: Define a macro for wrapping fragile result objects.

* lang/python/gpgme.i (wrapresult): New Macro.

This reduces the amount of copy and pasted code at the expense of a
slightly more complicated logic with a macro.

Signed-off-by: Tobias Mueller <>
2 years agopython: Check "buffer" when writing to sys.stdout for python2 compat.
Tobias Mueller [Wed, 30 Nov 2016 22:08:47 +0000 (23:08 +0100)]
python: Check "buffer" when writing to sys.stdout for python2 compat.

* lang/python/tests/ (print_data): Add check for buffer.

When running with something like make -C lang/python check verbose=2 the
test would fail under python2, because the file objects do not have a
buffer property.

Signed-off-by: Tobias Mueller <>
2 years agopython: Make Context have a repr method.
Tobias Mueller [Tue, 29 Nov 2016 22:26:20 +0000 (23:26 +0100)]
python: Make Context have a repr method.

* lang/python/gpg/ (Context.__repr__): New function.

This makes Context objects look nicer in a REPL.

Signed-off-by: Tobias Mueller <>
2 years agopython: Make Results have a nicer __repr__.
Tobias Mueller [Wed, 30 Nov 2016 07:47:29 +0000 (08:47 +0100)]
python: Make Results have a nicer __repr__.

* lang/python/gpg/ (Result.__str__): Renamed to '__repr__'
* lang/python/gpg/ (Result.__repr__): ... and added fields.

So that it looks a bit nicer in the Python REPL.

It looked like this before:

In [2]: gpg.core.get_engine_info()[0]
<gpg.results.EngineInfo at 0x7fb23509a240>

Now the output is

In [2]: gpg.core.get_engine_info()[0]
EngineInfo(file_name='/usr/bin/gpg2', home_dir=None,
protocol=0, req_version='1.4.0', version='2.1.11')

This also applies to other results, e.g. the ImportResult.

Note that the format now changed from "<Class >" to "Class()". The
Python documentation on repr states: "For many object types, including
most builtins, eval(repr(obj)) == obj."

Signed-off-by: Tobias Mueller <>
2 years agopython: Fix removing the TOFU database.
Justus Winter [Fri, 25 Nov 2016 08:55:42 +0000 (09:55 +0100)]
python: Fix removing the TOFU database.

* lang/python/ (CLEANFILES): Move 'tofu.db'...
* lang/python/tests/ (CLEANFILES): ... here.

Fixes-commit: 9b22f82afc5518961e4bea1fc516b79800e379a2
Signed-off-by: Justus Winter <>
2 years agotests: Remove tofu.db.
Justus Winter [Fri, 25 Nov 2016 08:13:01 +0000 (09:13 +0100)]
tests: Remove tofu.db.

* lang/python/ (CLEANFILES): Add 'tofu.db'.
* tests/gpg/ (CLEANFILES): Likewise.

Signed-off-by: Justus Winter <>
2 years agoRemove a forgotten instance of @libsuffix@
Heiko Becker [Wed, 16 Nov 2016 22:09:45 +0000 (23:09 +0100)]
Remove a forgotten instance of @libsuffix@

* lang/cpp/src/ Remove a forgotten
instance of @libsuffix@.

b2c07bd47bd608afa5cc819b60a7b5bb8c9dd96a removed @libsuffix@ from
cmake config files, but missed one instance.

Signed-off-by: Heiko Becker <>
2 years agoPost release updates.
Werner Koch [Wed, 16 Nov 2016 13:03:40 +0000 (14:03 +0100)]
Post release updates.


2 years agoRelease 1.8.0 gpgme-1.8.0
Werner Koch [Wed, 16 Nov 2016 12:29:02 +0000 (13:29 +0100)]
Release 1.8.0

* Set version to 1.8.0.  Set LT version C28/A17/RO.
Set CPP LT version to C9/A3/R0.  Set Qt LT version to C8/A1/R0.

Signed-off-by: Werner Koch <>
2 years agodoc: Replace http: by https: in core source files.
Werner Koch [Wed, 16 Nov 2016 12:27:00 +0000 (13:27 +0100)]
doc: Replace http: by https: in core source files.


Signed-off-by: Werner Koch <>
2 years agocore: Do not leak the override session key to ps(1).
Werner Koch [Wed, 16 Nov 2016 09:12:19 +0000 (10:12 +0100)]
core: Do not leak the override session key to ps(1).

* src/engine-gpg.c (struct engine_gpg): New field
(gpg_release): Free that field.
(gpg_decrypt): With gnupg 2.1.16 use --override-session-key-fd.

* tests/run-decrypt.c (main): Fix setting over the override key.

Note that this works only with gnupg 2.1.16 and later.

Signed-off-by: Werner Koch <>
2 years agodoc,tests: Require use of ctx_flag before use of session_key.
Daniel Kahn Gillmor [Wed, 16 Nov 2016 05:10:22 +0000 (14:10 +0900)]
doc,tests: Require use of ctx_flag before use of session_key.

* doc/gpgme.texi: Document requirements of verifying that it is OK to
use session_key.
* tests/run-decrypt.c: Ensure that we fail if we're unable to access
the session key, so that we do not violate the guidance above.

Signed-off-by: Daniel Kahn Gillmor <>
Changed the description

 -@code{gpgme_set_ctx_flag (ctx, "export-session-key")} returns
 -@code{GPG_ERR_NO_ERROR} or @code{gpgme_get_ctx_flag (ctx,
 -"export-session-key")} returns @code{"1"}.
 +@code{gpgme_set_ctx_flag (ctx, "export-session-key")} returns success
 +or @code{gpgme_get_ctx_flag (ctx, "export-session-key")} returns true
 +(non-empty string).

to get gpgme_get_ctx_flag for boolean values in sync with its own

Note that I don't agree with the above suggestion but it does not
really harm to have it in the man page.

Signed-off-by: Werner Koch <>
2 years agoqt, cpp: Add cmake config files for w32
Andre Heinecke [Tue, 15 Nov 2016 13:33:31 +0000 (14:33 +0100)]
qt, cpp: Add cmake config files for w32

* lang/cpp/src/
lang/qt/src/ New.
* lang/cpp/src/,
lang/qt/src/ Remove libsuffix handling.
* lang/cpp/src/,
lang/qt/src/ Create / install w32 config files.
* Configure them.

To work with DLL's cmake needs to know about the implib and
the final DLL. So the config files look different enough
that it's better to use alternative files.

2 years agoqt: Use new style connect in th..mixin
Andre Heinecke [Tue, 15 Nov 2016 11:30:56 +0000 (12:30 +0100)]
qt: Use new style connect in th..mixin

* lang/qt/src/threadedjobmixin.h
(ThreadedJobMixin::lateInitialization): Use new style connect.

2 years agodoc: Fix typos.
Daniel Kahn Gillmor [Tue, 15 Nov 2016 10:53:35 +0000 (19:53 +0900)]
doc: Fix typos.


2 years agocore: Implement context flag "override-session-key".
Werner Koch [Tue, 15 Nov 2016 09:29:48 +0000 (10:29 +0100)]
core: Implement context flag "override-session-key".

* src/gpgme.c (gpgme_set_ctx_flag): Add flags "export-session-key" and
(gpgme_get_ctx_flag): Ditto.
(gpgme_set_export_session_keys): Remove.
(gpgme_get_export_session_keys): Remove.
* src/gpgme.def, src/libgpgme.vers: Remove them.
* src/context.h (struct gpgme_context): Add field
* src/decrypt-verify.c (decrypt_verify_start): Pass
override_session_key value to the engine.
* src/decrypt.c (decrypt_start): Ditto.
* src/engine.c (_gpgme_engine_op_decrypt): Ditto.
(_gpgme_engine_op_decrypt_verify): Ditto.
* src/engine-backend.h (struct engine_ops): Extend DECRYPT and
DECRYPT_VERIFY_START with override_session_key.
* src/engine-uiserver.c (_uiserver_decrypt): Add stub arg
(uiserver_decrypt): Ditto.
(uiserver_decrypt_verify): Ditto.
* src/engine-gpgsm.c (gpgsm_decrypt): Ditto.
* src/engine-gpg.c (gpg_decrypt): Add arg override_session_key and set
corresponding gpg option.

* tests/run-decrypt.c (print_result): Print the session key if
(main): Add options --export-session-key and --override-session-key.


To keep the number of context manipulation functions at bay, this
patches removes the just added gpgme_set_export_session_keys and
gpgme_get_export_session_keys by flags for the generic context

The patch also implements the --override-session-key feature.

GnuPG-bug-id: 2754
Signed-off-by: Werner Koch <>
2 years agocore: Add public function gpgme_get_ctx_flag.
Werner Koch [Tue, 15 Nov 2016 08:24:17 +0000 (09:24 +0100)]
core: Add public function gpgme_get_ctx_flag.

* src/ (gpgme_get_ctx_flag): New.
* src/gpgme.c (gpgme_set_ctx_flag): Move down the file and add a trace
(gpgme_get_ctx_flag): New.
* src/gpgme.def, src/libgpgme.vers: Add new interface.

Signed-off-by: Werner Koch <>
2 years agocore: Enable extraction of session keys.
Daniel Kahn Gillmor [Fri, 11 Nov 2016 07:49:28 +0000 (16:49 +0900)]
core: Enable extraction of session keys.

* src/gpgme.c (gpgme_set_export_session_keys): New function.
(gpgme_get_export_session_keys): New function.
* src/ (struct _gpgme_op_decrypt_result): Add session_key
(gpgme_{set,get}_export_session_keys): Declare new functions.
* src/libgpgme.vers, src/gpgme.def: Export new functions in shared
* src/engine.h: (_gpgme_engine_op_decrypt) Add export_session_key
(_gpgme_engine_op_decrypt_verify): Add export_session_key parameter.
* src/engine-backend.h: (struct engine_ops): Change function
pointer declarations to match.
* src/context.h (struct gpgme_context): Add export_session_keys member.
* src/decrypt.c (release_op_data): Free result.session_key.
(_gpgme_decrypt_status_handler): Store a copy of the exported session
(decrypt_start): Pass export_session_keys from the context.
* src/decrypt-verify.c (decrypt_verify_start): Pass
export_session_keys from context.
* src/engine.c (_gpgme_engine_op_decrypt): Pass through
export_session_key flag.
(_gpgme_engine_op_decrypt_verify): Pass through export_session_key
* src/engine-gpg.c (gpg_decrypt): If export_session_key is set, add
--export-session-key to argument list.
* src/engine-gpgsm.c (gpgsm_decrypt): Ignore export_session_key for
now, since gpgsm offers no such mechanism.
* src/engine-uiserver.c (_uiserver_decrypt): If export_session_key is
set, add --export-session-key flag to cmd.
* doc/gpgme.texi: Document new functions and session_key member of
* doc/uiserver.texi: Add --export-session-key flag to DECRYPT command.


gpg(1) documents session key export as useful for key escrow, and is
rightly dubious of that use case.  However, session key export is also
useful in other use cases.  Two examples from MUA development (where
this functionality would be specifically useful to me right now):

 * If the MUA stores a local copy of the session key upon decrypting
   the message, it can re-decrypt the message without expensive
   asymmetric operations.  When rendering a thread with dozens of
   encrypted messages, this can represent a significant speedup.

 * A user may have expired encryption-capable secret key material,
   along with many messages encrypted to that material.  If she stores
   the session keys for those messages she wants to keep, she can
   destroy her secret key material and make any messages she has
   deleted completely unrecoverable, even to an attacker who gets her
   remaining secret keys in the future.

This patchset makes a two specific implementation decisions that could
have gone in different ways.  I welcome feedback on preferred outcomes.

 0) session key representation: we currently represent the session key
    as an opaque textual string, rather than trying to provide any
    sort of in-memory structure.  While it wouldn't be hard to parse
    the data produced by gpg's --export-session-key, I chose to use
    the opaque string rather than lock in a particular data format.

 1) API/ABI: i've added a member to gpgme_op_decrypt_result_t.  This
    has the potential to cause an out-of-bound memory access if
    someone uses code compiled against the newer verision, but linked
    at runtime against an older version.  I've attempted to limit that
    risk by documenting that users must verify
    gpgme_get_export_session_keys() before accessing this new struct
    member -- this means that code expecting this capability will
    require the symbol at link-time, and will refuse to link against
    older versions.

    Another approach to solving this problem would be to avoid
    modifying gpgme_op_decrypt_result_t, and to introduce instead a
    new function gpgme_op_session_key(), which could be called in the
    same places as gpgme_op_decrypt_result().  Depending on the
    representation of the session key, this might introduce new
    memory-management burdens on the user of the library, and the
    session key is certainly part of a decryption result, so it seemed
    simpler to go with what i have here.

If anyone has strong preferences that these choices should be solved
in a different way, i'm happy to hear them.

Additionally, I note that i'm also still pretty unclear about how the
"UI Server" fits into this whole ecosystem. In particular, I don't
know whether it's kosher to just add an --export-session-key flag to
the DECRYPT operation without actually having implemented it anywhere,
but i don't see where i would actually implement it either :/

If this patch (or some variant) is adopted, i will supply another
patch that permits offering a session key during decryption (e.g. "gpg
--override-session-key"), but I wanted to get these implementation
choices ironed out first.

Gnupg-Bug-Id: 2754
Signed-off-by: Daniel Kahn Gillmor <>
On the concern of adding a new field to a structure: It may not be
clearly documented but we don't expect that a user ever allocates such
a structure - those result structure may only be created bu gpgme and
are read-only for the user.  Adding a new member constitutes a
compatible ABI change and thus an older SO may not be used by code
compiled with a header for the newer API.  Unless someone tinkers with
the build system, this should never happen.  We have added new fields
to result structure may times and I can't remember any problems.

 - wk

2 years agoqt: Add API to get the context for a Job
Andre Heinecke [Mon, 14 Nov 2016 19:40:29 +0000 (20:40 +0100)]
qt: Add API to get the context for a Job

* lang/qt/src/job.cpp,
lang/qt/src/job.h (Job::context): New.
* lang/qt/src/threadedjobmixin.cpp
(ThreadedJobMixin::~ThreadedJobMixin): New. Unregister context.
(ThreadedJobMixin::lateInitialization): Register context.
* NEWS: Update for cpp and qt.

The global map hack is necessary because the job class does
not know about the context which is held in threadedjobmixin.
Adding a virtual function in Job would be an ABI break which
I'd like to avoid at this point. Although QGpgME's API will
need a big ABI break to make it ABI maintainable. The virtual
jobs -> implementation classes are nearly unmaintainable ABI wise.

The context is exposed to provide more flexibility to users, e.g.
to add a passphrase callback or to set the sender in a context.

2 years agocpp: Add get / set Sender API
Andre Heinecke [Mon, 14 Nov 2016 15:13:27 +0000 (16:13 +0100)]
cpp: Add get / set Sender API

* cpp/src/context.cpp, cpp/src/context.h (Context::setSender),
(Context::getSender): Add simple wrappers.

2 years agoqt, cpp: Enable dll build for windows
Andre Heinecke [Mon, 14 Nov 2016 18:37:34 +0000 (19:37 +0100)]
qt, cpp: Enable dll build for windows

* lang/cpp/src/,
lang/qt/src/ Add -no-undefined to LDFLAGS.

2 years agow32: Fix build of w32-glib
Andre Heinecke [Mon, 14 Nov 2016 16:18:50 +0000 (17:18 +0100)]
w32: Fix build of w32-glib

* src/ (main_sources): Remove system_components_not_extra.
(libgpgme_la_SOURCES): Add system_components_not_extra.
(libgpgme_glib_la_SOURCES): Remove duplicated ath files.

2 years agodoc: Correct deftypefun for gpgme_op_decrypt_verify_start.
Daniel Kahn Gillmor [Fri, 11 Nov 2016 06:16:43 +0000 (15:16 +0900)]
doc: Correct deftypefun for gpgme_op_decrypt_verify_start.

* doc/gpgme.texi: Documentationabout gpgme_op_decrypt_verify_start was
stored under the name gpgme_op_decrypt_verify instead.

Signed-off-by: Daniel Kahn Gillmor <>
2 years agodoc: Correct text about gpgme_cancel_async.
Daniel Kahn Gillmor [Fri, 11 Nov 2016 05:25:19 +0000 (14:25 +0900)]
doc: Correct text about gpgme_cancel_async.

* doc/gpgme.texi: Documentation about gpgme_cancel_async should refer
to the correct name.

Signed-off-by: Daniel Kahn Gillmor <>
2 years agocore: Non-zero values should set _armor, _textmode, and _online.
Daniel Kahn Gillmor [Thu, 10 Nov 2016 23:47:48 +0000 (15:47 -0800)]
core: Non-zero values should set _armor, _textmode, and _online.

* src/gpgme.c (gpgme_set_armor, gpgme_set_textmode,
gpgme_set_offline): Ensure that non-zero values actually set the
appropriate internal bit.


The documentation for these functions says things like "disabled if
YES is zero, and enabled otherwise", where YES is an integer.
However, if you pass an even integer, it will be aliased back to 0
because the context member variables are declared as single bits.

This should make the implementation match the documentation.

Signed-off-by: Daniel Kahn Gillmor <>
2 years agodoc: Fix regression in macro handling
Werner Koch [Fri, 11 Nov 2016 14:10:57 +0000 (15:10 +0100)]
doc: Fix regression in macro handling


The way macros are handled seem to have changed since 2008.  Fix that:

Signed-off-by: Werner Koch <>
2 years agotests,python: Atomic directory creation
Alon Bar-Lev [Wed, 19 Oct 2016 09:04:07 +0000 (12:04 +0300)]
tests,python: Atomic directory creation

* lang/python/tests/  Use MIDIR_P.
* tests/gpg/ Ditto.
* tests/gpgsm/ Ditto.

Solves race in parallel build when mkdir fails if directory exists.

Signed-off-by: Alon Bar-Lev <>
- Tweaked the ChangeLog

Signed-off-by: Werner Koch <>
2 years agocore: Use better error code when using select with a too high fd.
Werner Koch [Thu, 10 Nov 2016 18:49:13 +0000 (19:49 +0100)]
core: Use better error code when using select with a too high fd.

* src/posix-io.c (_gpgme_io_select): Return EMFILE instead of EBADF.

Also EBADF seem more correct, EMFILE (Too man open files) gives
a clearer message to the user that there are somehow too many files
open.  The problem can be exhibited by running lots of threads,

We should eventually move to poll but that would be a large change and
so we better fix it with the planned migration of the I/O subsystem to
libgpgrt (currently known as libgpg-error).

Signed-off-by: Werner Koch <>
2 years agotests: Reduce thread count in new thread tests
Andre Heinecke [Thu, 10 Nov 2016 17:32:26 +0000 (18:32 +0100)]
tests: Reduce thread count in new thread tests

* gpg/t-thread-keylist-verify.c,
gpg/t-thread-keylist.c: Reduce threads to 100

Due to the limit of FD_SETSIZE the
number of parallel threads is limited. So some systems
run into this problem when running the testsuite.

2 years agodoc: s/Multi Threading/Multi-Threading/
Werner Koch [Thu, 10 Nov 2016 16:28:29 +0000 (17:28 +0100)]
doc: s/Multi Threading/Multi-Threading/


2 years agocore: Detect unreadable keyrings.
Werner Koch [Thu, 10 Nov 2016 16:13:02 +0000 (17:13 +0100)]
core: Detect unreadable keyrings.

* src/keylist.c (op_data_t): Add field keydb_search_err.
(keylist_status_handler): Parse STATUS_ERROR into that var.
(gpgme_op_keylist_next): Use that err instead of GPG_ERR_EOF.

With a recent GnuPG version this allows to detect a keyring with wrong
permissions (i.e. no read access).  GPG_ERR_OPEN_KEYRING will be
returned instead of GPG_ERR_EOF.

Signed-off-by: Werner Koch <>
2 years agotests: Fix additional memleaks in thread tests
Andre Heinecke [Thu, 10 Nov 2016 14:04:17 +0000 (15:04 +0100)]
tests: Fix additional memleaks in thread tests

* tests/gpg/t-thread-keylist-verify.c (start_verify): Release
(start_keylist): Unref keys.
* tests/gpg/t-thread-keylist.c (start_keylist): Unref keys.

2 years agotests: Improve new thread tests
Andre Heinecke [Thu, 10 Nov 2016 13:10:11 +0000 (14:10 +0100)]
tests: Improve new thread tests

* tests/gpg/t-thread-keylist-verify.c (start_keylist): Mark
arg as unused. Release context.
(start_verify): Ditto.
(main): Mark args as unused.
* tests/gpg/t-thread-keylist.c (start_keylist):  Mark
arg as unused. Release context.
(main): Mark args as unused.

2 years agocore: Use gpgrt locking for thread safeness
Andre Heinecke [Tue, 8 Nov 2016 14:32:14 +0000 (15:32 +0100)]
core: Use gpgrt locking for thread safeness

* Require libgpg-error 1.17. No longer
check for pthread.
* doc/gpgme.texi: Document removed neccessity for thread
safe gpgme flavours.
* src/sema.h (DEFINE_GLOBAL_LOCK),
(DESTROY_LOCK, LOCK, UNLOCK): Change to gpgrt equivalents.
* src/posix-sema.c, src/w32-sema.c: Removed.
* src/ Remove libpthread and
Update accordingly.
* src/ath.c, src/ath.h (ath_mutex_init)
(ath_mutex_destroy, ath_mutex_lock, ath_mutex_unlock): Removed.
* src/ath.h (ATH_MUTEX_INITIALIZER): Removed.
* src/version.c (do_subsystem_inits): sema_subsystem_init is
no longer required.
* tests/gpg/ Add new threading tests.
(t_thread1_LDADD, t_cancel_LDADD):
Use just gpgme.
* tests/gpg/t-thread-keylist-verify.c,
tests/gpg/t-thread-keylist.c: New.
* src/ Use -lgpgme for thread-model pthread.

Using gpgrt locks instead of pthread locks removes
the neccessity to link pthread directly to gpgme and
have a different, thread safe flavor of gpgme. Now
gpgme is thread-safe if the conditions mentioned
in the doc are met.

As the cpp bindings linked against libgpgme
and not libgpgme-pthread this fixes threading problems
with them.

libgpgme-pthread is removed but gpgme-config still supports
--thread=pthread for compatibility with find scripts.

2 years agopython: Require at least GPGME 1.7 for out-of-tree builds.
Justus Winter [Wed, 9 Nov 2016 12:56:00 +0000 (13:56 +0100)]
python: Require at least GPGME 1.7 for out-of-tree builds.

* lang/python/ Bump required version to 1.7.

Signed-off-by: Justus Winter <>
2 years agow32: Better protect the IO-system's fd_table
Werner Koch [Wed, 9 Nov 2016 07:33:02 +0000 (08:33 +0100)]
w32: Better protect the IO-system's fd_table

* src/w32-io.c (fd_table_lock): New.
(new_fd): Lock allocation of a new slot.
(release_fd): Lock deallocation of a slot.

Note that we lock only the allocation but not the sanitiy checks we do
further down in the code.

Signed-off-by: Werner Koch <>
2 years agocpp: Add API for swdb queries
Andre Heinecke [Fri, 4 Nov 2016 11:33:57 +0000 (12:33 +0100)]
cpp: Add API for swdb queries

* lang/cpp/src/swdbresult.cpp,
 lang/cpp/src/swdbresult.h (SwdbResult): New.
* lang/cpp/src/ Update accordingly.

2 years agocpp: Add more EngineInfo::Version ctors
Andre Heinecke [Fri, 4 Nov 2016 11:29:32 +0000 (12:29 +0100)]
cpp: Add more EngineInfo::Version ctors

* lang/cpp/src/engineinfo.h
(EngineInfo::Version::Version(const char*)),
(EngineInfo::Version::Version()): New.

2 years agocpp: Don't include gpgme.h in tofuinfo header
Andre Heinecke [Fri, 4 Nov 2016 11:26:46 +0000 (12:26 +0100)]
cpp: Don't include gpgme.h in tofuinfo header

* lang/cpp/src/tofuinfo.h: Don't include gpgme.h

No public header should include gpgme.h

2 years agocpp: Extend gpgmefw for tofuinfo and swdb query
Andre Heinecke [Fri, 4 Nov 2016 11:24:34 +0000 (12:24 +0100)]
cpp: Extend gpgmefw for tofuinfo and swdb query

* lang/cpp/src/gpgmefw.h (gpgme_tofu_info_t)
(gpgme_query_swdb_result_t): New forwards.

2 years agow32: Fix locating gpgconf on 64 bit systems.
Werner Koch [Fri, 4 Nov 2016 07:10:34 +0000 (08:10 +0100)]
w32: Fix locating gpgconf on 64 bit systems.

* src/w32-util.c (find_program_at_standard_place): Use access to check
whether the binary is at CSIDL_PROGRAM_FILES before testing

Suggested-by: ticho
Fixes-commit: a82e9b182f62966207cad0972be6fa284329a5a1
GnuPG-bug-id: 2814
Signed-off-by: Werner Koch <>
2 years agocore: Add gpgme_op_query_swdb and helper.
Werner Koch [Thu, 3 Nov 2016 15:29:45 +0000 (16:29 +0100)]
core: Add gpgme_op_query_swdb and helper.

* src/ (gpgme_query_swdb_result_t): New.
(gpgme_op_query_swdb): New.
(gpgme_op_query_swdb_result): New.
* src/libgpgme.vers, src/gpgme.def: Add the two new functions.
* src/queryswdb.c: New.
* src/ (main_sources): Add new file.
* src/context.h (OPDATA_QUERY_SWDB): New.
* src/engine-backend.h (struct engine_ops): Add field 'query_swdb'.
Adjust all initializer.
* src/engine.c (_gpgme_engine_op_query_swdb): New.
* src/engine-gpgconf.c (parse_swdb_line): New.
(gpgconf_query_swdb): New.
(_gpgme_engine_ops_gpgconf): Register that function.

* src/util.h (GPG_ERR_TOO_OLD): Define for older libgpg-error.

* tests/run-swdb.c: New.
* tests/ (noinst_PROGRAMS): Add new debug tool.

Signed-off-by: Werner Koch <>
2 years agoqt: Change license of export / version header
Andre Heinecke [Thu, 3 Nov 2016 08:40:00 +0000 (09:40 +0100)]
qt: Change license of export / version header

* lang/qt/src/qgpgme_export.h,
lang/qt/src/qgpgme_version.h: Change license to GPLv2+

These files were based on copies from the cpp version/export
headers. This change is meant to clarify the licensing by
bringing it in line with the overall licesense of the
qgpgme library.

2 years agocore: Make use of --homedir in gpgconf.
Werner Koch [Thu, 3 Nov 2016 08:31:30 +0000 (09:31 +0100)]
core: Make use of --homedir in gpgconf.

* src/engine-gpgconf.c (struct engine_gpgconf): Add field 'version'.
(have_gpgconf_version): New.
(gpgconf_release): Free VERSION.
(gpgconf_new): Set VERSION.
(gpgconf_read, gpgconf_write): Use --homedir with recent gnupg.

Signed-off-by: Werner Koch <>
2 years agoqt: Fix build with g++ 4.8.x
Andras Mantia [Wed, 2 Nov 2016 09:23:42 +0000 (11:23 +0200)]
qt: Fix build with g++ 4.8.x

* lang/qt/src/defaultkeygenerationjob.cpp
(DefaultKeyGenerationJob::start): Explicitly connect pointer
in the QPointer.

Commit message written by Andre Heinecke <>

2 years agoqt, cpp: Fix versioning in cmake config and header
Andre Heinecke [Wed, 2 Nov 2016 13:43:44 +0000 (14:43 +0100)]
qt, cpp: Fix versioning in cmake config and header

subst variables for the version header.
* lang/cpp/src/,
lang/qt/src/ Use new variables.

Using the LT_* variables was just wrong. Reporting the
package version also makes more sense then the library version.
Having different versions might make ABI breaks more visible
by increasing the major version number, but to have different
versions in the same package is too confusing imo and gpgme
uses a versioning that is unrelated to the library version number.

2 years agoqt: Install cmake config into qgpgme subdir
Andre Heinecke [Wed, 2 Nov 2016 13:36:56 +0000 (14:36 +0100)]
qt: Install cmake config into qgpgme subdir

* lang/qt/src/ Install cmake config file in qgpgme subdir.

Putting it together with Gpgmepp was done for historic reasons
but the proper way is for each library to have its own subdir.

2 years agoqt: Require gpgmepp from cmake config script
Andre Heinecke [Wed, 2 Nov 2016 13:31:35 +0000 (14:31 +0100)]
qt: Require gpgmepp from cmake config script

* lang/qt/src/ Require cpp.

This fixes an error if a user only does find_package(QGpgme)

2 years agoqt, cpp: Add all generated files to cleanfiles
Andre Heinecke [Wed, 2 Nov 2016 11:24:42 +0000 (12:24 +0100)]
qt, cpp: Add all generated files to cleanfiles

* cpp/src/ (CLEANFILES),
qt/src/ (CLEANFILES): Add all generated files
to cleanfiles.

2 years agoqt: Add Distinguished Name parser from libkleo
Andre Heinecke [Tue, 1 Nov 2016 17:28:20 +0000 (18:28 +0100)]
qt: Add Distinguished Name parser from libkleo

* lang/qt/src/dn.cpp (DN, DN::Attribute): New public API.
* lang/qt/src/dn.h: New.
* lang/qt/src/ Update accordingly.

This is a general useful API to work with X509 distinguished
names and is useful when doing CMS with GpgME.

Adding this class from libkleo allows kmails messagelib to
avoid any KDE UI Frameworks and so can be used more versatile
in the future.

This class can be combined with libkleos DNAttributeMapper
to have the same bevavior as before in libkleo when using
DN::prettyDN calls can be converted from:


    QGpgME::DN dn(uid);

2 years agoqt, cpp: Install version headers in subdirs
Andre Heinecke [Tue, 1 Nov 2016 09:13:49 +0000 (10:13 +0100)]
qt, cpp: Install version headers in subdirs

* lang/cpp/src/,
lang/qt/src/ Install version headers in include

This change was requested on the gnupg-devel mailing list to
avoid placing these headers into the top level include directories.
There is currently no known user of these headers so changing it
now should not break things downstream.

2 years agopython: Use vanity modules for constants in tests and examples.
Justus Winter [Mon, 31 Oct 2016 14:28:26 +0000 (15:28 +0100)]
python: Use vanity modules for constants in tests and examples.

* lang/python/gpg/constants/sig/ New file.
* lang/python/gpg/constants/sig/ Import new module.

* lang/python/examples/ Use more specific module for
constants, e.g. 'protocol.ASSUAN' instead of 'PROTOCOL_ASSUAN'.
* lang/python/examples/ Likewise.
* lang/python/tests/ Likewise.
* lang/python/tests/ Likewise.
* lang/python/tests/ Likewise.
* lang/python/tests/ Likewise.
* lang/python/tests/ Likewise.
* lang/python/tests/ Likewise.
* lang/python/tests/ Likewise.
* lang/python/tests/ Likewise.
* lang/python/tests/ Likewise.
* lang/python/tests/ Likewise.
* lang/python/tests/ Likewise.
* lang/python/tests/ Likewise.
* lang/python/tests/ Likewise.
* lang/python/tests/ Likewise.
* lang/python/tests/ Likewise.
* lang/python/tests/ Likewise.
* lang/python/tests/ Likewise.
* lang/python/tests/ Likewise.
* lang/python/tests/ Likewise.
* lang/python/tests/ Likewise.
* lang/python/tests/ Likewise.

Signed-off-by: Justus Winter <>
2 years agopython: Import the topmost module in tests and examples.
Justus Winter [Mon, 31 Oct 2016 13:42:26 +0000 (14:42 +0100)]
python: Import the topmost module in tests and examples.

* examples/ Only import the topmost module 'gpg' and
update the code accordingly.
* tests/ Likewise.
* tests/ Likewise.
* tests/ Likewise.
* tests/ Likewise.
* tests/ Likewise.
* tests/ Likewise.
* tests/ Likewise.
* tests/ Likewise.
* tests/ Likewise.
* tests/ Likewise.
* tests/ Likewise.
* tests/ Likewise.
* tests/ Likewise.
* tests/ Likewise.
* tests/ Likewise.
* tests/ Likewise.
* tests/ Likewise.
* tests/ Likewise.
* tests/ Likewise.
* tests/ Likewise.
* tests/ Likewise.

Signed-off-by: Justus Winter <>
2 years agopython: Improve constants module.
Justus Winter [Mon, 31 Oct 2016 13:28:08 +0000 (14:28 +0100)]
python: Improve constants module.

* lang/python/gpg/constants/ Import all modules below
'constants/'.  Interface hygiene: delete 'util'.
* lang/python/gpg/constants/data/ Delete 'util'.
* lang/python/gpg/constants/ Likewise.
* lang/python/gpg/constants/ Likewise.
* lang/python/gpg/constants/keylist/ Likewise.
* lang/python/gpg/constants/ Likewise.
* lang/python/gpg/constants/ Likewise.
* lang/python/gpg/constants/ Likewise.
* lang/python/gpg/constants/sig/ Likewise.
* lang/python/gpg/constants/ Likewise.
* lang/python/gpg/constants/ Likewise.
* lang/python/gpg/ Likewise.

Signed-off-by: Justus Winter <>
2 years agopython: Rename Python module from PyME to gpg.
Daniel Kahn Gillmor [Fri, 28 Oct 2016 20:45:49 +0000 (16:45 -0400)]
python: Rename Python module from PyME to gpg.

This follows weeks of discussion on the gnupg-devel mailing list.
Hopefully it will make it easier for people using Python to use GnuPG
in the future.

Signed-off-by: Daniel Kahn Gillmor <>
2 years agocore: New API functions gpgme_set_sender, gpgme_get_sender.
Werner Koch [Tue, 25 Oct 2016 15:27:49 +0000 (17:27 +0200)]
core: New API functions gpgme_set_sender, gpgme_get_sender.

* src/context.h (struct gpgme_context): Add field 'sender'.
* src/gpgme.c: Include mbox-util.h.
(gpgme_release): Free SENDER.
(gpgme_set_sender): New.
(gpgme_get_sender): New.
* src/gpgme.def, src/libgpgme.vers: Add new functions.

* src/engine-gpg.c (append_args_from_sender): New.
(gpg_encrypt_sign, gpg_sign): Call append_args_from_sender.
(gpg_verify): Add arg CTX.  Call append_args_from_sender/
* src/engine-gpgsm.c (gpgsm_verify): Add dummy arg CTX.
* src/engine-uiserver.c (uiserver_verify): Ditto.
* src/engine.c (_gpgme_engine_op_verify): Add arg CTX.
* src/verify.c (verify_start): Pass CTX to engine function.

* tests/gpg/t-verify.c (main): Add some checks for new functions.
* tests/run-sign.c (main): Add option --sender.
* tests/run-verify.c (main): Ditto.

Signed-off-by: Werner Koch <>
2 years agoqt: Improve WKSPublishJob apidoc
Andre Heinecke [Wed, 19 Oct 2016 13:17:09 +0000 (15:17 +0200)]
qt: Improve WKSPublishJob apidoc

* lang/qt/src/wkspublishjob.h: Improve doc.

2 years agoPost release updates gpgme-1.7-branch
Werner Koch [Tue, 18 Oct 2016 17:40:11 +0000 (19:40 +0200)]
Post release updates


2 years agoRelease 1.7.1. gpgme-1.7.1
Werner Koch [Tue, 18 Oct 2016 17:23:59 +0000 (19:23 +0200)]
Release 1.7.1.

* Set LT version to C27/A16/R0.  Note that the LT
versions for cpp and Qt have already been updated.

Signed-off-by: Werner Koch <>
2 years agotests: Make t-cancel more portable.
Werner Koch [Fri, 14 Oct 2016 14:29:06 +0000 (16:29 +0200)]
tests: Make t-cancel more portable.

* tests/gpg/t-cancel.c: Include sys/time.h and protect sys/select.h.

Signed-off-by: Werner Koch <>
2 years agopython: Call ln(1) in a portable way.
Werner Koch [Fri, 14 Oct 2016 14:20:15 +0000 (16:20 +0200)]
python: Call ln(1) in a portable way.

* lang/python/ Specify target dir for ln.

Signed-off-by: Werner Koch <>
2 years agocpp: Fix init of string from null
Andre Heinecke [Fri, 14 Oct 2016 14:23:57 +0000 (16:23 +0200)]
cpp: Fix init of string from null

* lang/cpp/src/key.cpp (UserID::addrSpecFromString): Check return
value before creating the string.

2 years agopython: Make 'get_key' more idiomatic.
Justus Winter [Thu, 13 Oct 2016 11:13:23 +0000 (13:13 +0200)]
python: Make 'get_key' more idiomatic.

* lang/python/pyme/ (Context.get_key): Raise errors.KeyNotFound
if the key is not found.  This error is both a KeyError for idiomatic
error handling as well as a GPGMEError so we don't break existing
* lang/python/pyme/ (KeyNotFound): New class.
* lang/python/tests/ (no_such_key): New variable.
* lang/python/tests/ Test the new behavior.

Signed-off-by: Justus Winter <>
2 years agopython: Return public keys by default.
Justus Winter [Thu, 13 Oct 2016 10:05:59 +0000 (12:05 +0200)]
python: Return public keys by default.

* lang/python/pyme/ (Core.get_key): Return public keys by
default, improve docstring.
* lang/python/examples/ Update example.
* lang/python/examples/ Likewise.

GnuPG-bug-id: 2751
Signed-off-by: Justus Winter <>
2 years agopython: Fix example.
Justus Winter [Thu, 13 Oct 2016 10:45:50 +0000 (12:45 +0200)]
python: Fix example.

* lang/python/examples/ Fix example.

Fixes-commit: a458e7fe
Signed-off-by: Justus Winter <>
2 years agocpp: Fix version number
Andre Heinecke [Thu, 13 Oct 2016 08:13:47 +0000 (10:13 +0200)]
cpp: Fix version number

Added API so it should have been correct to bump current
and age and not to bump age.

2 years agoqt, cpp: Fix permissions of Config files
Andre Heinecke [Thu, 13 Oct 2016 07:35:30 +0000 (09:35 +0200)]
qt, cpp: Fix permissions of Config files

* lang/cpp/src/,
lang/qt/src/ Do not install config files as executable.

2 years agoqt: Install SpecialJob
Andre Heinecke [Thu, 13 Oct 2016 07:13:50 +0000 (09:13 +0200)]
qt: Install SpecialJob

* lang/qt/src/ Install SpecialJob
* NEWS: mention it.

SpecialJob was and is public API. So it needs to be installed.

2 years agoqt, cpp: Fix expected targets in Config files
Andre Heinecke [Thu, 13 Oct 2016 07:07:36 +0000 (09:07 +0200)]
qt, cpp: Fix expected targets in Config files

* lang/cpp/src/,
lang/qt/src/ Remove KF5 variants.

2 years agoMention Qt API fixes in news
Andre Heinecke [Tue, 11 Oct 2016 17:57:35 +0000 (19:57 +0200)]
Mention Qt API fixes in news


2 years agoqt: Add missing implementation of MultiDeleteJob
Daniel Vrátil [Tue, 11 Oct 2016 17:32:54 +0000 (19:32 +0200)]
qt: Add missing implementation of MultiDeleteJob

* lang/qt/src/multideletejob.h: Fix include, cryptobackend.h is now
called protocol.h
* lang/qt/src/multideletejob.cpp: New file.
* lang/qt/src/ Add multideletejob.cpp.

2 years agoqt: Install abstractimportjob.h
Daniel Vrátil [Tue, 11 Oct 2016 17:32:08 +0000 (19:32 +0200)]
qt: Install abstractimportjob.h

* lang/cpp/src/ Install abstractimportjob.h since it's
included from importjob.h

Fixes build when someone inclues importjob.h in their code.

2 years agocpp: Add API for gpgme_addrspec_from_uid
Andre Heinecke [Tue, 11 Oct 2016 12:13:15 +0000 (14:13 +0200)]
cpp: Add API for gpgme_addrspec_from_uid

* lang/cpp/src/key.cpp (UserID::addrSpecFromString): New static
function to expose addrspec from uid.
(UserID::addrSpec): New. Get addrSpec from Userid.
* NEWS: Update accordingly.

2 years agoAdd NEWS for cpp and qt, bump cpp version
Andre Heinecke [Mon, 10 Oct 2016 15:42:10 +0000 (17:42 +0200)]
Add NEWS for cpp and qt, bump cpp version

* NEWS: Add entries for cpp and qt changes.
* Bump cpp version because of added API.

2 years agoAdd convenience function to get key from sig
Andre Heinecke [Mon, 10 Oct 2016 15:38:43 +0000 (17:38 +0200)]
Add convenience function to get key from sig

* lang/cpp/src/verificationresult.cpp (Signature::key(bool, bool)):
New. Can be used to search / update the key associcated with this

By using update a caller can ensure that an incomplete key
obtainable through the new key() function is fully loaded.
With search the key can be looked up in the internal keyring.

As the results are cached this can be done in the crypto thread
and the result then better used in the UI thread.

2 years agocpp: Return null key if the signature had no key
Andre Heinecke [Mon, 10 Oct 2016 15:36:41 +0000 (17:36 +0200)]
cpp: Return null key if the signature had no key

* lang/cpp/src/verificationresult.cpp (Private): Add null key
to list when there is no key associated with the signature.

This fixes an out of bounds read when a verification did
not have a key.

2 years agoqt: Add simple verify test
Andre Heinecke [Mon, 10 Oct 2016 13:22:17 +0000 (15:22 +0200)]
qt: Add simple verify test

* lang/qt/tests/t-verify.cpp: New. Small test if a signature
returns a key with fingerprint.
* lang/qt/tests/ Add new test.

2 years agocore: Fix w32 crash in find_program_in_dir
Andre Heinecke [Mon, 10 Oct 2016 10:19:48 +0000 (12:19 +0200)]
core: Fix w32 crash in find_program_in_dir

* src/w32-util.c (find_program_in_dir): Fix call to _gpgme_strconcat.

This fixes a crash introduced by dc39552d0 because it tried
to concat a strlen.

2 years agocore: New helper function gpgme_addrspec_from_uid.
Werner Koch [Sat, 8 Oct 2016 19:14:52 +0000 (21:14 +0200)]
core: New helper function gpgme_addrspec_from_uid.

* src/ Add gpgme_addrspec_from_uid.
* src/gpgme.def, src/libgpgme.vers: Ditto.
* src/mbox-util.c (gpgme_addrspec_from_uid): New.

Signed-off-by: Werner Koch <>
2 years agoAdd missing includes.
Justus Winter [Thu, 6 Oct 2016 11:12:28 +0000 (13:12 +0200)]
Add missing includes.

* lang/cpp/src/key.cpp: Include <strings.h> for 'strcasecmp'.
* tests/gpg/t-cancel.c: Include <sys/select.h> for 'fd_set' and

Signed-off-by: Justus Winter <>
2 years agocpp: Bump Revision
Andre Heinecke [Wed, 5 Oct 2016 15:38:49 +0000 (17:38 +0200)]
cpp: Bump Revision

* (LIBGPGMEPP_LT_REVISION): Bump revision.

The Data::Encoding enum now supports more encodings so
this should have been done then.

2 years agoqt: Fix spelling error in WKSPublishJob
Andre Heinecke [Wed, 5 Oct 2016 15:27:36 +0000 (17:27 +0200)]
qt: Fix spelling error in WKSPublishJob

* src/qgpgmewkspublishjob.cpp,
tests/t-wkspublish.cpp: Fix spelling of received.

While this is an API break I've decided to fix this now
instead of deprecating / keeping it around forever in the API.

The only known users of QGpgME are KDE Applications and
there it is not yet used.

2 years agoqt: Disable tests that require a password for 2.0
Andre Heinecke [Wed, 5 Oct 2016 15:19:20 +0000 (17:19 +0200)]
qt: Disable tests that require a password for 2.0

* lang/qt/tests/t-encrypt.cpp: Disable tests that require
a password for 2.0.

The passphrase_cb apparently does not work with 2.0 so we would
need a fake pinentry to get this to work. We just disable the
test instead as this is a rarely used feature and works with
1.4 and 2.1.

2 years agoAdd warning flags for c++ compiler, too
Andre Heinecke [Wed, 5 Oct 2016 14:55:14 +0000 (16:55 +0200)]
Add warning flags for c++ compiler, too

* (CXXFLAGS): Add Wall and Wextra.

2 years agoqt: Fix unused variable warnings
Andre Heinecke [Wed, 5 Oct 2016 14:44:53 +0000 (16:44 +0200)]
qt: Fix unused variable warnings

* qt/src/qgpgmenewcryptoconfig.cpp,
qt/tests/t-wkspublish.cpp: Mark additional variables as unused.

2 years agocpp: Add support for URL Data encodings
Andre Heinecke [Wed, 5 Oct 2016 14:43:16 +0000 (16:43 +0200)]
cpp: Add support for URL Data encodings

* lang/cpp/src/data.h (Data::Encoding): Extend enum.
* lang/cpp/src/data.cpp (Data::encoding),
Data::setEncoding): Support new values.

2 years agocpp: Fix gcc diagnostic push / pop
Andre Heinecke [Wed, 5 Oct 2016 14:27:18 +0000 (16:27 +0200)]
cpp: Fix gcc diagnostic push / pop

* lang/cpp/src/context.cpp: Fix pragmas.

This fixes an error with -Werror=unknown-pragmas

2 years agoqt: Disable t-wkspublish test
Andre Heinecke [Wed, 5 Oct 2016 14:01:20 +0000 (16:01 +0200)]
qt: Disable t-wkspublish test

* lang/qt/tests/ (TESTS): Remove t-wkspublish.

Even the only enabled test did a connection to localhost this
might fail if it is stalled and is an outside factor. It also might
be disturbing other services locally.

2 years agopython: Link 'data.h' and 'config.h' into the builddir.
Alon Bar-Lev [Thu, 29 Sep 2016 07:30:58 +0000 (10:30 +0300)]
python: Link 'data.h' and 'config.h' into the builddir.

* lang/python/ Link to the files.
* lang/python/gpgme.i: Update path.
* lang/python/ Do not add the top builddir to the include
To make it easy to build the subpackage using standard tools without
altering environment or CFLAGS, symlink the required artifacts from
source tree into subpackage directory when preparing sources.

Signed-off-by: Alon Bar-Lev <>
2 years agopython: Add 'prepare' target.
Alon Bar-Lev [Thu, 29 Sep 2016 07:30:57 +0000 (10:30 +0300)]
python: Add 'prepare' target.

* lang/python/ Add 'prepare' target.
This enables preparing the package using autoconf then build using
distutils as separate stage.

Signed-off-by: Alon Bar-Lev <>
2 years agopython: Make generated '' executable.
Alon Bar-Lev [Thu, 29 Sep 2016 07:30:56 +0000 (10:30 +0300)]
python: Make generated '' executable.

Signed-off-by: Alon Bar-Lev <>
2 years agocpp, qt: Handle modified includedir installation
Andre Heinecke [Thu, 29 Sep 2016 10:46:18 +0000 (12:46 +0200)]
cpp, qt: Handle modified includedir installation

* lang/cpp/src/,
lang/qt/src/ Replace resolved_includedir.
* lang/cpp/src/,
lang/qt/src/ Use resolved_includedir
instead of relying on a common installation prefix.

This fixes usage of the config files in case gpgme
is configured with a custom --includedir.
We have to do the replacement manually like for libdir
because configure would include variables in the replacement.

2 years agotests: Fix blunder.
Justus Winter [Tue, 27 Sep 2016 10:49:24 +0000 (12:49 +0200)]
tests: Fix blunder.

Fixes-commit: a423603f
Signed-off-by: Justus Winter <>
2 years agoClarify licensing
Daniel Kahn Gillmor [Fri, 23 Sep 2016 11:58:58 +0000 (07:58 -0400)]
Clarify licensing

* src/b64dec.c, src/mbox-util.c, src/mbox-util.h: These three files
  are explicitly licensed under LGPL, but their comments suggest that
  details about the warranty can be found in the GPL.  Adjust comments
  to refer to the correct license.

Signed-off-by: Daniel Kahn Gillmor <>
2 years agotests: Fix check for gpg versions not reporting the critical flag.
Justus Winter [Tue, 27 Sep 2016 10:28:38 +0000 (12:28 +0200)]
tests: Fix check for gpg versions not reporting the critical flag.

* lang/python/tests/ Also blacklist 2.0.x.
* tests/gpg/t-sig-notation.c: Likewise.

Signed-off-by: Justus Winter <>
2 years agopython: Get rid of the last C++-style comments.
Justus Winter [Mon, 26 Sep 2016 14:45:21 +0000 (16:45 +0200)]
python: Get rid of the last C++-style comments.

Signed-off-by: Justus Winter <>