[git] GCRYPT - branch, LIBGCRYPT-1-6-BRANCH, updated. libgcrypt-1.6.3-10-gd281624

by Werner Koch cvs at cvs.gnupg.org
Mon Sep 7 15:46:50 CEST 2015


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  d2816248461c24a7ea81a1de2f562f481ccc9edd (commit)
       via  236c040c066d385582376b67a2f356a07fbbfafc (commit)
      from  b85c8d6645039fc9d403791750510e439731d479 (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 d2816248461c24a7ea81a1de2f562f481ccc9edd
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Sep 7 15:38:04 2015 +0200

    Fix gcc portability on Solaris 9 SPARC boxes.
    
    * mpi/longlong.h: Use __sparcv8 as alias for __sparc_v8__.
    --
    
    This patch has been in use by pkgsrc for
      SunOS mentok 5.9 Generic_117171-02 sun4u sparc SUNW,Sun-Fire-V240
    since 2004.
    
    GnuPG-bug-id: 1703
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/mpi/longlong.h b/mpi/longlong.h
index 4f33937..1ebfdd4 100644
--- a/mpi/longlong.h
+++ b/mpi/longlong.h
@@ -1287,7 +1287,7 @@ typedef unsigned int UTItype __attribute__ ((mode (TI)));
 	     "rJ" ((USItype)(al)),                                      \
 	     "rI" ((USItype)(bl))                                       \
 	   __CLOBBER_CC)
-#if defined (__sparc_v8__)
+#if defined (__sparc_v8__) || defined(__sparcv8)
 /* Don't match immediate range because, 1) it is not often useful,
    2) the 'I' flag thinks of the range as a 13 bit signed interval,
    while we want to match a 13 bit interval, sign extended to 32 bits,

commit 236c040c066d385582376b67a2f356a07fbbfafc
Author: Werner Koch <wk at gnupg.org>
Date:   Mon Sep 7 14:02:09 2015 +0200

    Improve GCRYCTL_DISABLE_PRIV_DROP by also disabling cap_ calls.
    
    * src/secmem.c (lock_pool, secmem_init): Do not call any cap_
    functions if NO_PRIV_DROP is set.
    --
    Signed-off-by: Werner Koch <wk at gnupg.org>
    
    (cherry picked from commit 3a3d5410cc83f7069c7cb1ab384905f382292d32)
    Resolved conflicts:
    	src/secmem.c - No need for the typo fix.

diff --git a/src/secmem.c b/src/secmem.c
index 2bf7d8c..cce1a03 100644
--- a/src/secmem.c
+++ b/src/secmem.c
@@ -246,15 +246,21 @@ lock_pool (void *p, size_t n)
   {
     cap_t cap;
 
-    cap = cap_from_text ("cap_ipc_lock+ep");
-    cap_set_proc (cap);
-    cap_free (cap);
+    if (!no_priv_drop)
+      {
+        cap = cap_from_text ("cap_ipc_lock+ep");
+        cap_set_proc (cap);
+        cap_free (cap);
+      }
     err = no_mlock? 0 : mlock (p, n);
     if (err && errno)
       err = errno;
-    cap = cap_from_text ("cap_ipc_lock+p");
-    cap_set_proc (cap);
-    cap_free(cap);
+    if (!no_priv_drop)
+      {
+        cap = cap_from_text ("cap_ipc_lock+p");
+        cap_set_proc (cap);
+        cap_free(cap);
+      }
   }
 
   if (err)
@@ -482,13 +488,14 @@ secmem_init (size_t n)
     {
 #ifdef USE_CAPABILITIES
       /* drop all capabilities */
-      {
-        cap_t cap;
+      if (!no_priv_drop)
+        {
+          cap_t cap;
 
-        cap = cap_from_text ("all-eip");
-        cap_set_proc (cap);
-        cap_free (cap);
-      }
+          cap = cap_from_text ("all-eip");
+          cap_set_proc (cap);
+          cap_free (cap);
+        }
 
 #elif !defined(HAVE_DOSISH_SYSTEM)
       uid_t uid;

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

Summary of changes:
 mpi/longlong.h |  2 +-
 src/secmem.c   | 31 +++++++++++++++++++------------
 2 files changed, 20 insertions(+), 13 deletions(-)


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




More information about the Gnupg-commits mailing list