Compare commits

..

No commits in common. 'c9' and 'cs10' have entirely different histories.
c9 ... cs10

4
.gitignore vendored

@ -1,2 +1,2 @@
SOURCES/gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg
SOURCES/libtasn1-4.16.0.tar.gz
SOURCES/gpgkey-B1D2BD1375BECB784CF4F8C4D73CF638C53C06BE.gpg
SOURCES/libtasn1-4.19.0.tar.gz

@ -1,2 +1,2 @@
90f7b4d994c81d1debc13aa0c6c105c9a682921a SOURCES/gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg
f4f1fc301c0835389d9db7754815e48f4f57937a SOURCES/libtasn1-4.16.0.tar.gz
ffd1dbaa518c9a0697bbc1d6ee37edd652b2d76d SOURCES/gpgkey-B1D2BD1375BECB784CF4F8C4D73CF638C53C06BE.gpg
9c4b6616de65513a0a4d27e0b7f25184391ca8fd SOURCES/libtasn1-4.19.0.tar.gz

@ -1,70 +0,0 @@
diff -up libtasn1-4.16.0/lib/coding.c.coverity libtasn1-4.16.0/lib/coding.c
--- libtasn1-4.16.0/lib/coding.c.coverity 2020-02-01 23:22:04.000000000 +0100
+++ libtasn1-4.16.0/lib/coding.c 2021-04-13 17:34:34.101819976 +0200
@@ -1103,7 +1103,10 @@ asn1_der_coding (asn1_node_const element
max_len = *len;
if (der == NULL && max_len > 0)
- return ASN1_VALUE_NOT_VALID;
+ {
+ err = ASN1_VALUE_NOT_VALID;
+ goto error;
+ }
counter = 0;
move = DOWN;
diff -up libtasn1-4.16.0/lib/element.c.coverity libtasn1-4.16.0/lib/element.c
--- libtasn1-4.16.0/lib/element.c.coverity 2020-01-03 23:20:17.000000000 +0100
+++ libtasn1-4.16.0/lib/element.c 2021-04-13 18:05:21.054820798 +0200
@@ -142,7 +142,7 @@ int
_asn1_append_sequence_set (asn1_node node, struct node_tail_cache_st *pcache)
{
asn1_node p, p2;
- char temp[LTOSTR_MAX_SIZE];
+ char temp[LTOSTR_MAX_SIZE+1];
long n;
if (!node || !(node->down))
@@ -183,7 +183,12 @@ _asn1_append_sequence_set (asn1_node nod
n = strtol (p->name + 1, NULL, 0);
n++;
temp[0] = '?';
+ if (n < 0)
+ return ASN1_GENERIC_ERROR;
+ /* assuming non-negative n, we have enough space in buffer */
_asn1_ltostr (n, temp + 1);
+ if (strlen(temp) >= LTOSTR_MAX_SIZE)
+ return ASN1_GENERIC_ERROR;
}
_asn1_set_name (p2, temp);
/* p2->type |= CONST_OPTION; */
diff -up libtasn1-4.16.0/lib/int.h.coverity libtasn1-4.16.0/lib/int.h
--- libtasn1-4.16.0/lib/int.h.coverity 2020-01-03 23:20:17.000000000 +0100
+++ libtasn1-4.16.0/lib/int.h 2021-04-13 17:34:34.101819976 +0200
@@ -213,6 +213,7 @@ void *_asn1_realloc(void *ptr, size_t si
ret = realloc(ptr, size);
if (ret == NULL)
{
+ /* cppcheck-suppress doubleFree */
free(ptr);
}
return ret;
diff -up libtasn1-4.16.0/src/asn1Coding.c.coverity libtasn1-4.16.0/src/asn1Coding.c
--- libtasn1-4.16.0/src/asn1Coding.c.coverity 2019-07-19 19:55:08.000000000 +0200
+++ libtasn1-4.16.0/src/asn1Coding.c 2021-04-13 17:34:34.102819982 +0200
@@ -72,13 +72,13 @@ readAssignment (FILE * file, char *varNa
int ret;
- ret = fscanf (file, "%s", varName);
+ ret = fscanf (file, "%1023s", varName);
if (ret == EOF)
return ASSIGNMENT_EOF;
if (!strcmp (varName, "''"))
varName[0] = 0;
- ret = fscanf (file, "%s", value);
+ ret = fscanf (file, "%1023s", value);
if (ret == EOF)
return ASSIGNMENT_ERROR;

@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
iQEzBAABCAAdFiEEWfu1XKfzqKsMUDdz2BxIh/FnmmUFAl42AF0ACgkQ2BxIh/Fn
mmVm8Qf9GroRQ/D3f8crSv/HWZJ/EGDKAcSc+s0Gc5bfPQK7CrEUJpoCRt+kZzhO
9RWcod3jot3/W26v1R6lCruQwUDbXmoPOYUMJ5cJuP8oHSs3+6m96e6aadWhpNxh
8FGsnSvLNJ1zeCtsuvf9Zyi1NVicBGoeeCRgkJIkAE1TnCsbpo+QascmXJHlfDc2
lueMzRexFzy7t03ySsRdiKpfzG1pyTWvU7lVhX8ysf2+31wi9kgvg71bPJhsA794
FBIkpHcJXBkxxmlIvI/O65pRNX+13GmZjcPij5qth6Cr1fVQcN4hzEEKzyzf2RoP
xqzVc6yNRh8pj+A44vwZ4sm7S+o0tQ==
=czTt
-----END PGP SIGNATURE-----

@ -1,11 +0,0 @@
--- a/lib/int.h 2022-11-30 14:21:26.985600761 -0500
+++ b/lib/int.h 2022-11-30 14:23:25.856065950 -0500
@@ -97,7 +97,7 @@
#define ETYPE_TAG(etype) (_asn1_tags[etype].tag)
#define ETYPE_CLASS(etype) (_asn1_tags[etype].class)
#define ETYPE_OK(etype) (((etype) != ASN1_ETYPE_INVALID && \
- (etype) <= _asn1_tags_size && \
+ (etype) < _asn1_tags_size && \
_asn1_tags[(etype)].desc != NULL)?1:0)
#define ETYPE_IS_STRING(etype) ((etype == ASN1_ETYPE_GENERALSTRING || \

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
iHUEABYIAB0WIQSjzJyHC50xCrrUzy9RcisI/kdFogUCYwUS9wAKCRBRcisI/kdF
ouWTAP95jlnitHZ2gCNZgtei9tEjdUVVL8CsFbQnvogFVUvieQD/XzHxaRGluLTh
DuHAJzrPScJUtPGImSUsoqcgozUv4w8=
=zX4n
-----END PGP SIGNATURE-----

@ -1,24 +1,35 @@
## START: Set by rpmautospec
## (rpmautospec version 0.6.5)
## RPMAUTOSPEC: autorelease, autochangelog
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
release_number = 9;
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
print(release_number + base_release_number - 1);
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}
## END: Set by rpmautospec
Summary: The ASN.1 library used in GNUTLS
Name: libtasn1
Version: 4.16.0
Release: 8%{?dist}
Version: 4.19.0
Release: %autorelease
# The libtasn1 library is LGPLv2+, utilities are GPLv3+
License: GPLv3+ and LGPLv2+
License: GPL-3.0-or-later AND LGPL-2.1-or-later
URL: http://www.gnu.org/software/libtasn1/
Source0: http://ftp.gnu.org/gnu/libtasn1/%name-%version.tar.gz
Source1: http://ftp.gnu.org/gnu/libtasn1/%name-%version.tar.gz.sig
Source2: gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg
#Source2: gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg
#Source2: gpgkey-99415CE1905D0E55A9F88026860B7FBB32F8119D.gpg
Source2: gpgkey-B1D2BD1375BECB784CF4F8C4D73CF638C53C06BE.gpg
Patch1: libtasn1-3.4-rpath.patch
Patch200: libtasn1-4.16-coverity.patch
Patch300: libtasn1-4.19-CVE-2021-46848.patch
BuildRequires: gnupg2
BuildRequires: gcc
BuildRequires: bison, pkgconfig, help2man
BuildRequires: autoconf, automake, libtool
BuildRequires: valgrind-devel
BuildRequires: make
BuildRequires: make
BuildRequires: gtk-doc
# Wildcard bundling exception https://fedorahosted.org/fpc/ticket/174
Provides: bundled(gnulib) = 20130324
@ -57,8 +68,6 @@ gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
%setup -q
%patch1 -p1 -b .rpath
%patch200 -p1 -b .coverity
%patch300 -p1 -b .CVE-2021-46848
%build
autoreconf -v -f --install
@ -79,7 +88,7 @@ rm -f $RPM_BUILD_ROOT{%_libdir/*.la,%_infodir/dir}
make check
%files
%license LICENSE doc/COPYING*
%license COPYING doc/COPYING*
%doc AUTHORS NEWS README.md
%{_libdir}/*.so.6*
@ -88,7 +97,6 @@ make check
%{_mandir}/man1/asn1*
%files devel
%doc doc/TODO doc/*.pdf
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%{_includedir}/*
@ -97,18 +105,48 @@ make check
%changelog
* Wed Nov 30 2022 Simo Sorce <simo@redhat.com> - 4.16.0-9
- Resolves: rhbz#2140602
## START: Generated by rpmautospec
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 4.19.0-9
- Bump release for October 2024 mass rebuild:
* Mon Oct 07 2024 Alexander Sosedkin <asosedkin@redhat.com> - 4.19.0-8
- Initial CI and gating setup for RHEL-10
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 4.19.0-7
- Bump release for June 2024 mass rebuild
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.19.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.19.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Sep 20 2023 Simo Sorce <simo@redhat.com> - 4.19.0-4
- Migrate license field to SPDX format
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.19.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 4.16.0-7
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.19.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 4.16.0-6
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.18.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Apr 12 2021 Dmitry Belyavskiy <dbelyavs@redhat.com> - 4.16.0-5
- Coverity-related fixes (#1938797)
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 4.18.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Tue Nov 9 2021 Simo Sorce <simo@redhat.com> - 4.18.0-1
- Update to 4.18.0 (#2021613)
* Wed Nov 3 2021 Simo Sorce <simo@redhat.com> - 4.17.0-1
- Update to 4.17.0 (#1960364)
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.16.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Apr 06 2021 Simo Sorce <simo@redhat.com> - 4.16.0-5
- Add gtk-doc as BuildRequire
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 4.16.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
@ -379,3 +417,6 @@ make check
* Tue Jun 10 2003 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de> 0:0.2.4-0.fdr.1
- Initial build.
## END: Generated by rpmautospec

Loading…
Cancel
Save