Open Build Service

Changes of Revision 7

_service:tar_scm_kernel_repo:libgcrypt.spec Changed

_service:tar_scm_kernel_repo:backport-mpi-Allow-opaque-MPI-with-zero-length.patch Added

@@ -0,0 +1,42 @@
+From 7f2fbbcdce46fbc52a634fa461b1e3b55aa5948b Mon Sep 17 00:00:00 2001
+From: NIIBE Yutaka <gniibe@fsij.org>
+Date: Fri, 29 Oct 2021 12:59:04 +0900
+Subject: [PATCH] mpi: Allow opaque MPI with zero length.
+ 
+* mpi/mpiutil.c (_gcry_mpi_copy): Support zero length.
+ 
+--
+ 
+Cherry-pick master commit of:
+	34d55589b7d91a239435d77e3d45cf0deeba59b6
+ 
+Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
+
+---
+ mpi/mpiutil.c | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+ 
+diff --git a/mpi/mpiutil.c b/mpi/mpiutil.c
+index 5320f4d8..337e7747 100644
+--- a/mpi/mpiutil.c
++++ b/mpi/mpiutil.c
+@@ -366,10 +366,13 @@ _gcry_mpi_copy (gcry_mpi_t a)
+     gcry_mpi_t b;
+ 
+     if( a && (a->flags & 4) ) {
+-        void *p = _gcry_is_secure(a->d)? xmalloc_secure ((a->sign+7)/8)
+-                                       : xmalloc ((a->sign+7)/8);
+-        if (a->d)
+-          memcpy( p, a->d, (a->sign+7)/8 );
++        void *p = NULL;
++        if (a->sign) {
++            p = _gcry_is_secure(a->d)? xmalloc_secure ((a->sign+7)/8)
++                                     : xmalloc ((a->sign+7)/8);
++            if (a->d)
++                memcpy( p, a->d, (a->sign+7)/8 );
++        }
+         b = mpi_set_opaque( NULL, p, a->sign );
+         b->flags = a->flags;
+         b->flags &= ~(16|32); /* Reset the immutable and constant flags.  */
+-- 
+2.23.0
\ No newline at end of file