[git] GnuPG - branch, master, updated. gnupg-2.1.21-27-g02af509

[by Justus Winter]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  02af509dfc2b893720aa0c7b380fd7736b2bafd0 (commit)
       via  f9cb15b385f64f7c9403670f03632f81a874f213 (commit)
       via  30c71a9476fa6557ab2846f703acb625b49f1b37 (commit)
       via  485b5a6e6dfe7aa545afa926e060d516ae911e42 (commit)
      from  c03e0eb01dc4632432d0472a6f8051142082bea4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 02af509dfc2b893720aa0c7b380fd7736b2bafd0
Author: Justus Winter <justus at g10code.com>
Date:   Wed May 31 14:24:04 2017 +0200

    gpg: Fix compliance computation.
    
    * g10/misc.c (gnupg_pk_is_compliant): Compare against CO_RFC2440, not
    RFC2440 which is actually a predicate.
    
    Fixes-commit: fe0b37e123ded51cc5f4cb5e3547fdfbce37a43e
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/g10/misc.c b/g10/misc.c
index abae6c9..bdd27cf 100644
--- a/g10/misc.c
+++ b/g10/misc.c
@@ -784,7 +784,7 @@ gnupg_pk_is_compliant (int compliance, PKT_public_key *pk,
   else if (algotype == is_elg_sign)
     {
       /* An Elgamal signing key is only RFC-2440 compliant.  */
-      result = (compliance == RFC2440);
+      result = (compliance == CO_RFC2440);
     }
   else
     {

commit f9cb15b385f64f7c9403670f03632f81a874f213
Author: Justus Winter <justus at g10code.com>
Date:   Wed May 31 12:51:56 2017 +0200

    sm: Simplify code.
    
    * sm/verify.c (gpgsm_verify): Simplify by using a newer gcrypt
    interface.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/sm/verify.c b/sm/verify.c
index 6c034e6..7bdc68b 100644
--- a/sm/verify.c
+++ b/sm/verify.c
@@ -341,16 +341,11 @@ gpgsm_verify (ctrl_t ctrl, int in_fd, int data_fd, estream_t out_fp)
                                         &msgdigest, &msgdigestlen);
       if (!rc)
         {
-          size_t is_enabled;
-
           algoid = ksba_cms_get_digest_algo (cms, signer);
           algo = gcry_md_map_name (algoid);
           if (DBG_X509)
             log_debug ("signer %d - digest algo: %d\n", signer, algo);
-          is_enabled = sizeof algo;
-          if ( gcry_md_info (data_md, GCRYCTL_IS_ALGO_ENABLED,
-                             &algo, &is_enabled)
-               || !is_enabled)
+          if (! gcry_md_is_enabled (data_md, algo))
             {
               log_error ("digest algo %d (%s) has not been enabled\n",
                          algo, algoid?algoid:"");

commit 30c71a9476fa6557ab2846f703acb625b49f1b37
Author: Justus Winter <justus at g10code.com>
Date:   Wed May 31 12:12:42 2017 +0200

    sm: Fix typo.
    
    --
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/sm/decrypt.c b/sm/decrypt.c
index 976bd12..f8b0199 100644
--- a/sm/decrypt.c
+++ b/sm/decrypt.c
@@ -41,7 +41,7 @@ struct decrypt_filter_parm_s
   gcry_cipher_hd_t hd;
   char iv[16];
   size_t ivlen;
-  int any_data;  /* dod we push anything through the filter at all? */
+  int any_data;  /* did we push anything through the filter at all? */
   unsigned char lastblock[16];  /* to strip the padding we have to
                                    keep this one */
   char helpblock[16];  /* needed because there is no block buffering in

commit 485b5a6e6dfe7aa545afa926e060d516ae911e42
Author: Justus Winter <justus at g10code.com>
Date:   Wed May 31 12:11:56 2017 +0200

    doc: Improve documentation.
    
    * doc/gpgsm.texi: Mention that '--with-key-data' implies
    '--with-colons'.
    
    Signed-off-by: Justus Winter <justus at g10code.com>

diff --git a/doc/gpgsm.texi b/doc/gpgsm.texi
index c3f5aac..79db177 100644
--- a/doc/gpgsm.texi
+++ b/doc/gpgsm.texi
@@ -564,7 +564,7 @@ Write output to @var{file}.  The default is to write it to stdout.
 Displays extra information with the @code{--list-keys} commands.  Especially
 a line tagged @code{grp} is printed which tells you the keygrip of a
 key.  This string is for example used as the file name of the
-secret key.
+secret key.  Implies @code{--with-colons}.
 
 @anchor{gpgsm-option --with-validation}
 @item --with-validation

-----------------------------------------------------------------------

Summary of changes:
 doc/gpgsm.texi | 2 +-
 g10/misc.c     | 2 +-
 sm/decrypt.c   | 2 +-
 sm/verify.c    | 7 +------
 4 files changed, 4 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org