forked from pool/libgcrypt
Accepting request 259951 from home:AndreasStieger:branches:devel:libraries:c_c++
libgcrypt 1.6.2 OBS-URL: https://build.opensuse.org/request/show/259951 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libgcrypt?expand=0&rev=65
This commit is contained in:
Ismail Dönmez
Git OBS Bridge
parent
c1ef8148bf
commit
7377b22af6
@ -1,21 +0,0 @@
|
||||
From: Michal Vyskoci<mvyskocil@suse.com>
|
||||
Subject: Use internall malloc in fips.c
|
||||
|
||||
|
||||
---
|
||||
src/fips.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Index: libgcrypt-1.6.0/src/fips.c
|
||||
===================================================================
|
||||
--- libgcrypt-1.6.0.orig/src/fips.c
|
||||
+++ libgcrypt-1.6.0/src/fips.c
|
||||
@@ -613,7 +613,7 @@ check_binary_integrity (void)
|
||||
err = gpg_error (GPG_ERR_INTERNAL);
|
||||
else
|
||||
{
|
||||
- fname = gcry_malloc (strlen (info.dli_fname) + 1 + 5 + 1 );
|
||||
+ fname = _gcry_malloc (strlen (info.dli_fname) + 1 + 5 + 1 );
|
||||
if (!fname)
|
||||
err = gpg_error_from_syserror ();
|
||||
else
|
||||
@ -1,7 +1,25 @@
|
||||
Index: libgcrypt-1.6.1/src/fips.c
|
||||
---
|
||||
src/Makefile.in | 2 +-
|
||||
src/fips.c | 39 ++++++++++++++++++++++++++++++++-------
|
||||
2 files changed, 33 insertions(+), 8 deletions(-)
|
||||
|
||||
Index: libgcrypt-1.6.2/src/Makefile.in
|
||||
===================================================================
|
||||
--- libgcrypt-1.6.1.orig/src/fips.c
|
||||
+++ libgcrypt-1.6.1/src/fips.c
|
||||
--- libgcrypt-1.6.2.orig/src/Makefile.in 2014-11-05 20:33:18.000000000 +0000
|
||||
+++ libgcrypt-1.6.2/src/Makefile.in 2014-11-05 20:34:04.000000000 +0000
|
||||
@@ -449,7 +449,7 @@ libgcrypt_la_LIBADD = $(gcrypt_res) \
|
||||
../cipher/libcipher.la \
|
||||
../random/librandom.la \
|
||||
../mpi/libmpi.la \
|
||||
- ../compat/libcompat.la $(GPG_ERROR_LIBS)
|
||||
+ ../compat/libcompat.la $(GPG_ERROR_LIBS) -ldl
|
||||
|
||||
dumpsexp_SOURCES = dumpsexp.c
|
||||
dumpsexp_CFLAGS = $(arch_gpg_error_cflags)
|
||||
Index: libgcrypt-1.6.2/src/fips.c
|
||||
===================================================================
|
||||
--- libgcrypt-1.6.2.orig/src/fips.c 2014-11-05 20:33:18.000000000 +0000
|
||||
+++ libgcrypt-1.6.2/src/fips.c 2014-11-05 20:34:04.000000000 +0000
|
||||
@@ -589,23 +589,48 @@ run_random_selftests (void)
|
||||
return !!err;
|
||||
}
|
||||
@ -60,8 +78,8 @@ Index: libgcrypt-1.6.1/src/fips.c
|
||||
err = gpg_error (GPG_ERR_INTERNAL);
|
||||
else
|
||||
{
|
||||
- fname = _gcry_malloc (strlen (info.dli_fname) + 1 + 5 + 1 );
|
||||
+ fname = _gcry_malloc (strlen (libpath) + 1 + 5 + 1 );
|
||||
- fname = xtrymalloc (strlen (info.dli_fname) + 1 + 5 + 1 );
|
||||
+ fname = xtrymalloc (strlen (libpath) + 1 + 5 + 1 );
|
||||
if (!fname)
|
||||
err = gpg_error_from_syserror ();
|
||||
else
|
||||
@ -74,16 +92,3 @@ Index: libgcrypt-1.6.1/src/fips.c
|
||||
p = strrchr (fname, '/');
|
||||
if (p)
|
||||
p++;
|
||||
Index: libgcrypt-1.6.1/src/Makefile.in
|
||||
===================================================================
|
||||
--- libgcrypt-1.6.1.orig/src/Makefile.in
|
||||
+++ libgcrypt-1.6.1/src/Makefile.in
|
||||
@@ -449,7 +449,7 @@ libgcrypt_la_LIBADD = $(gcrypt_res) \
|
||||
../cipher/libcipher.la \
|
||||
../random/librandom.la \
|
||||
../mpi/libmpi.la \
|
||||
- ../compat/libcompat.la $(GPG_ERROR_LIBS)
|
||||
+ ../compat/libcompat.la $(GPG_ERROR_LIBS) -ldl
|
||||
|
||||
dumpsexp_SOURCES = dumpsexp.c
|
||||
dumpsexp_CFLAGS = $(arch_gpg_error_cflags)
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:a1c3efea69f8ffe769f488b300ce190eeeb0c30de24a53f1c1b6e4202fdc2070
|
||||
size 2470885
|
||||
Binary file not shown.
3
libgcrypt-1.6.2.tar.bz2
Normal file
3
libgcrypt-1.6.2.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:de084492a6b38cdb27b67eaf749ceba76bf7029f63a9c0c3c1b05c88c9885c4c
|
||||
size 2476101
|
||||
BIN
libgcrypt-1.6.2.tar.bz2.sig
Normal file
BIN
libgcrypt-1.6.2.tar.bz2.sig
Normal file
Binary file not shown.
@ -1,13 +0,0 @@
|
||||
Index: libgcrypt-1.6.1/random/rndlinux.c
|
||||
===================================================================
|
||||
--- libgcrypt-1.6.1.orig/random/rndlinux.c
|
||||
+++ libgcrypt-1.6.1/random/rndlinux.c
|
||||
@@ -261,7 +261,7 @@ _gcry_rndlinux_gather_random (void (*add
|
||||
|
||||
do
|
||||
{
|
||||
- int nbytes = length < sizeof(buffer)? length : sizeof(buffer);
|
||||
+ size_t nbytes = length < sizeof(buffer)? length : sizeof(buffer);
|
||||
n = read(fd, buffer, nbytes );
|
||||
if( n >= 0 && n > nbytes )
|
||||
{
|
||||
@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Nov 5 20:37:24 UTC 2014 - andreas.stieger@gmx.de
|
||||
|
||||
- libgcrypt 1.6.2:
|
||||
* Map deprecated RSA algo number to the RSA algo number for better
|
||||
backward compatibility.
|
||||
* Support a 0x40 compression prefix for EdDSA.
|
||||
* Improve ARM hardware feature detection and building.
|
||||
* Fix building for the x32 ABI platform.
|
||||
* Fix some possible NULL deref bugs.
|
||||
- remove libgcrypt-1.6.0-use-intenal-functions.patch, upstream
|
||||
via xtrymalloc macro
|
||||
- remove libgcrypt-fixed-sizet.patch, upstream
|
||||
- adjust libgcrypt-1.6.1-use-fipscheck.patch for xtrymalloc change
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Sep 21 10:08:39 UTC 2014 - vcizek@suse.com
|
||||
|
||||
|
||||
@ -19,10 +19,10 @@
|
||||
%define build_hmac256 1
|
||||
%define separate_hmac256_binary 0
|
||||
%define libsoname %{name}20
|
||||
%define sosuffix 20.0.1
|
||||
%define sosuffix 20.0.2
|
||||
%define cavs_dir %{_libexecdir}/%{name}/cavs
|
||||
Name: libgcrypt
|
||||
Version: 1.6.1
|
||||
Version: 1.6.2
|
||||
Release: 0
|
||||
Summary: The GNU Crypto Library
|
||||
License: GPL-2.0+ and LGPL-2.1+ and GPL-3.0+
|
||||
@ -45,9 +45,6 @@ Patch4: %{name}-sparcv9.diff
|
||||
Patch5: libgcrypt-unresolved-dladdr.patch
|
||||
#PATCH-FIX-SUSE: N/A
|
||||
Patch7: libgcrypt-1.5.0-LIBGCRYPT_FORCE_FIPS_MODE-env.diff
|
||||
#PATCH-FIX-UPSTREAM: internal functions are supposed to be used inside libgcrypt, mvyskocil@suse.com
|
||||
Patch8: libgcrypt-1.6.0-use-intenal-functions.patch
|
||||
Patch11: libgcrypt-fixed-sizet.patch
|
||||
Patch12: libgcrypt-1.6.1-use-fipscheck.patch
|
||||
Patch13: libgcrypt-1.6.1-fips-cavs.patch
|
||||
#PATCH-FIX-SUSE: bnc#724841, fix a random device opening routine
|
||||
@ -157,8 +154,6 @@ understanding of applied cryptography is required to use Libgcrypt.
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch11 -p1
|
||||
%if 0%{?suse_version} > 1310
|
||||
%patch12 -p1
|
||||
%patch21 -p1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user