[git] GCRYPT - branch, master, updated. libgcrypt-1.5.0-35-g2c54c4d

[by Xi Wang]

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  2c54c4da19d3a79e9f749740828026dd41f0521a (commit)
      from  2196728e2252917849c1be94417258076767021b (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 2c54c4da19d3a79e9f749740828026dd41f0521a
Author: Xi Wang <xi.wang at gmail.com>
Date:   Tue Aug 14 18:54:40 2012 -0400

    Replace deliberate division by zero with _gcry_divide_by_zero.
    
    * mpi/mpi-pow.c: Replace 1 / msize.
    * mpi/mpih-div.c: Replace 1 / dsize.
    * src/misc.c: Add _gcry_divide_by_zero.
    --
    
    1) Division by zero doesn't "provoke a signal" on architectures
       like PowerPC.
    
    2) C compilers like clang will optimize away these divisions, even
       though the code tries "to make the compiler not remove" them.
    
    This patch redirects these cases to _gcry_divide_by_zero.

diff --git a/mpi/mpi-pow.c b/mpi/mpi-pow.c
index 33bbebe..891a7e6 100644
--- a/mpi/mpi-pow.c
+++ b/mpi/mpi-pow.c
@@ -76,7 +76,7 @@ gcry_mpi_powm (gcry_mpi_t res,
   ep = expo->d;
 
   if (!msize)
-    msize = 1 / msize;	    /* Provoke a signal.  */
+    _gcry_divide_by_zero();
 
   if (!esize)
     {
diff --git a/mpi/mpih-div.c b/mpi/mpih-div.c
index 224b810..b33dcbf 100644
--- a/mpi/mpih-div.c
+++ b/mpi/mpih-div.c
@@ -212,9 +212,8 @@ _gcry_mpih_divrem( mpi_ptr_t qp, mpi_size_t qextra_limbs,
 
     switch(dsize) {
       case 0:
-	/* We are asked to divide by zero, so go ahead and do it!  (To make
-	   the compiler not remove this statement, return the value.)  */
-	return 1 / dsize;
+	_gcry_divide_by_zero();
+	break;
 
       case 1:
 	{
diff --git a/src/g10lib.h b/src/g10lib.h
index ec86c97..c580c08 100644
--- a/src/g10lib.h
+++ b/src/g10lib.h
@@ -101,6 +101,8 @@ void _gcry_bug (const char *file, int line);
 void _gcry_assert_failed (const char *expr, const char *file, int line);
 #endif
 
+void _gcry_divide_by_zero (void) JNLIB_GCC_A_NR;
+
 const char *_gcry_gettext (const char *key) GCC_ATTR_FORMAT_ARG(1);
 void _gcry_fatal_error(int rc, const char *text ) JNLIB_GCC_A_NR;
 void _gcry_log( int level, const char *fmt, ... ) JNLIB_GCC_A_PRINTF(2,3);
diff --git a/src/misc.c b/src/misc.c
index 17bd546..ed72ed6 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -19,6 +19,7 @@
  */
 
 #include <config.h>
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -296,3 +297,10 @@ _gcry_burn_stack (int bytes)
     if (bytes > 0)
         _gcry_burn_stack (bytes);
 }
+
+void
+_gcry_divide_by_zero (void)
+{
+    gpg_err_set_errno (EDOM);
+    _gcry_fatal_error (gpg_err_code_from_errno (errno), "divide by zero");
+}

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

Summary of changes:
 mpi/mpi-pow.c  |    2 +-
 mpi/mpih-div.c |    5 ++---
 src/g10lib.h   |    2 ++
 src/misc.c     |    8 ++++++++
 4 files changed, 13 insertions(+), 4 deletions(-)


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