[git] GCRYPT - branch, master, updated. libgcrypt-1.6.0-62-gae1fbce

by Werner Koch cvs at cvs.gnupg.org
Tue Apr 15 22:21:01 CEST 2014


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, master has been updated
       via  ae1fbce6dacf14747af0126e640bd4e54cb8c680 (commit)
      from  b76b632a453b8d100d024e2439b4358454dc286e (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 ae1fbce6dacf14747af0126e640bd4e54cb8c680
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 461ad64..5ab89cb 100644
--- a/cipher/md.c
+++ b/cipher/md.c
@@ -1250,7 +1250,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/test-getrusage.c |    4 ----
 2 files changed, 2 insertions(+), 5 deletions(-)


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


_______________________________________________
Gnupg-commits mailing list
Gnupg-commits at gnupg.org
http://lists.gnupg.org/mailman/listinfo/gnupg-commits




More information about the Gcrypt-devel mailing list