GitLab

Fixes copy&paste error introduced with 5d64856b

GnuPG-bug-id: 5283

Where possible qBinaryFind is replaced with std::binary_search. All
other occurrences are replaced with a custom replacement.

I think using this replacement is much more convenient and results
in better readable and less errorprone code than replacing all usages of
qBinaryFind with std::lower_bound() and the necessary additional check
of the resulting iterator, in particular if a lambda expression is used
as custom comparison function.

If resolution with mixed protocols is allowed, then create a "best of"
list of the resolved OpenPGP and S/MIME keys, i.e. for a given recipient
take either the OpenPGP keys or the S/MIME keys where the choice if
based first on validity and then on the preferred protocol (with OpenPGP
as last resort).

GnuPG-bug-id: 5283

Previously, the result contained empty key lists for unresolved
recipients.

GnuPG-bug-id: 5283

... instead of per protocol and then per address

GnuPG-bug-id: 5283

... instead of per protocol and then per address

GnuPG-bug-id: 5283

GnuPG-bug-id: 5283

GnuPG-bug-id: 5283

The implementations only use variables and methods of the private class.

GnuPG-bug-id: 5283

Instead an empty list of keys for a recipient marks an unresolved
recipient.

GnuPG-bug-id: 5283

GnuPG-bug-id: 5283

GnuPG-bug-id: 5283

This makes the core of the resolver independent of the key approval
dialog (and any other UI components).

GnuPG-bug-id: 5283

GnuPG-bug-id: 5283

The override keys are never changed. Therefore the getter is currently
pretty useless.

GnuPG-bug-id: 5283

... by making sure that the sender's address is added to the list of
recipients.

GnuPG-bug-id: 5283

GnuPG-bug-id: 5283

* Adapt possible formats for overrides to recent API changes
* Mark format for overrides as optional
* Fix order of arguments for "sigkeys" option
* Modernize/simplify definition of names of options

GnuPG-bug-id: 5283

GnuPG-bug-id:5283

This makes sure that the update happens whenever the filter is changed
either programmatically or by the user.

GnuPG-bug-id:5283

Previously, OpenPGP was used if OpenPGP only and S/MIME only were both
possible regardless of the preferred protocol.

GnuPG-bug-id: 5283

This commit also adds a first autotest for KeyResolver including a bunch
of test keys.

GnuPG-bug-id: 5283

* use OpenPGP as preferred protocol, unless a preferred protocol is
  specified or forced
* if in mixed mode for a recipient there are keys with different
  protocols, then propose the keys matching the preferred protocol in
  the approval dialog

GnuPG-bug-id: 5283

In mixed mode the sender may need to specify OpenPGP keys and S/MIME keys
for signing and for encryption-to-self. Use fixed protocol filters for
the corresponding key selectors.

GnuPG-bug-id: 5283

* should be better usability if the sender's key(s) are not "hidden"
  between the keys of the recipients
* in mixed mode we need two encryption keys for the sender (OpenPGP
  and S/MIME), but only one encryption key for the recipients (OpenPGP
  or S/MIME); clear separation of the keys should avoid confusion

GnuPG-bug-id: 5283

GnuPG-bug-id: 5283

Tests exclusive (i.e. non-mixed) mode with OpenPGP resp. S/MIME as
preferred protocols.

GnuPG-bug-id: 5283