[git] GCRYPT - branch, LIBGCRYPT-1-6-BRANCH, updated. libgcrypt-1.6.1-6-gbceb5ec

[by Werner Koch]

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 crypto library".

The branch, LIBGCRYPT-1-6-BRANCH has been updated
       via  bceb5ec22bd966f4c78c7349d5821c9e17423660 (commit)
       via  8a0d51411fbecd2c9e470b2dc64a758184f59064 (commit)
      from  6868d7d5239c168d28f98314b98a55c6caa3aed1 (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 bceb5ec22bd966f4c78c7349d5821c9e17423660
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Apr 15 16:40:48 2014 +0200

    pubkey: Re-map all deprecated RSA algo numbers.
    
    * cipher/pubkey.c (map_algo): Mape RSA_E and RSA_S.

diff --git a/cipher/pubkey.c b/cipher/pubkey.c
index d130388..b31e9df 100644
--- a/cipher/pubkey.c
+++ b/cipher/pubkey.c
@@ -58,18 +58,16 @@ map_algo (int algo)
 {
  switch (algo)
    {
-   case GCRY_PK_ECDSA:
-   case GCRY_PK_ECDH:
-     return GCRY_PK_ECC;
-   case GCRY_PK_ELG_E:
-     return GCRY_PK_ELG;
-   default:
-     return algo;
+   case GCRY_PK_RSA_E: return GCRY_PK_RSA;
+   case GCRY_PK_RSA_S: return GCRY_PK_RSA;
+   case GCRY_PK_ELG_E: return GCRY_PK_ELG;
+   case GCRY_PK_ECDSA: return GCRY_PK_ECC;
+   case GCRY_PK_ECDH:  return GCRY_PK_ECC;
+   default:            return algo;
    }
 }
 
 
-
 /* Return the spec structure for the public key algorithm ALGO.  For
    an unknown algorithm NULL is returned.  */
 static gcry_pk_spec_t *

commit 8a0d51411fbecd2c9e470b2dc64a758184f59064
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Apr 15 16:40:48 2014 +0200

    cipher: Fix possible NULL dereference.
    
    * cipher/md.c (_gcry_md_selftest): Check for spec being NULL.
    --
    
    Also removed left-over code in unused file cipher/test-getrusage.c.
    
    Found by Hans-Christoph Steiner with cppcheck.

diff --git a/cipher/md.c b/cipher/md.c
index 22da30a..94f5cb7 100644
--- a/cipher/md.c
+++ b/cipher/md.c
@@ -1248,7 +1248,8 @@ _gcry_md_selftest (int algo, int extended, selftest_report_func_t report)
     ec = spec->selftest (algo, extended, report);
   else
     {
-      ec = spec->selftest? GPG_ERR_DIGEST_ALGO : GPG_ERR_NOT_IMPLEMENTED;
+      ec = (spec && spec->selftest) ? GPG_ERR_DIGEST_ALGO
+        /* */                       : GPG_ERR_NOT_IMPLEMENTED;
       if (report)
         report ("digest", algo, "module",
                 (spec && !spec->flags.disabled)?
diff --git a/cipher/test-getrusage.c b/cipher/test-getrusage.c
index 6fc8372..7f586dd 100644
--- a/cipher/test-getrusage.c
+++ b/cipher/test-getrusage.c
@@ -45,10 +45,6 @@ main (int argc, char **argv)
   printf ("ru_nvcsw   = %ld\n", buf.ru_nvcsw    );
   printf ("ru_nivcsw  = %ld\n", buf.ru_nivcsw   );
 
-  fprintf (stderr, "ru_utime   ru_stime   ru_minflt  ru_nccsw  ru_nivcsw\n");
-  fprintf (stderr, "%ld.%06ld  %ld.%06ld  %5ld       %5ld      %5ld\n");
-
-
   return 0;
 }
 

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

Summary of changes:
 cipher/md.c             |    3 ++-
 cipher/pubkey.c         |   14 ++++++--------
 cipher/test-getrusage.c |    4 ----
 3 files changed, 8 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
The GNU crypto library
http://git.gnupg.org