diff options
| author | Werner Koch <[email protected]> | 2017-09-26 10:00:03 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2017-09-26 10:00:03 +0000 |
| commit | cd2d758f3f9e0007ecd6bae9d2ee0d631773e237 (patch) | |
| tree | 0e1b9c898d0527969fa953e0f1fc418e610c8da4 /g10/gpgv.c | |
| parent | g10: Select a secret key by checking availability under gpg-agent. (diff) | |
| parent | po: Remove trailing colon from a German pinentry string. (diff) | |
| download | gnupg-cd2d758f3f9e0007ecd6bae9d2ee0d631773e237.tar.gz gnupg-cd2d758f3f9e0007ecd6bae9d2ee0d631773e237.zip | |
Merge branch 'STABLE-BRANCH-2-2' into master
--
Signed-off-by: Werner Koch <[email protected]>
Conflicts:
NEWS - include release info from 2.2.1
configure.ac - keep master.
Diffstat (limited to 'g10/gpgv.c')
| -rw-r--r-- | g10/gpgv.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/g10/gpgv.c b/g10/gpgv.c index fb274b337..c43067dfd 100644 --- a/g10/gpgv.c +++ b/g10/gpgv.c @@ -202,6 +202,7 @@ main( int argc, char **argv ) dotlock_disable (); gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); additional_weak_digest("MD5"); + gnupg_initialize_compliance (GNUPG_MODULE_NAME_GPG); pargs.argc = &argc; pargs.argv = &argv; |