Fixed ECDSA public key import (#1612803)
This commit is contained in:
parent
abd1baafcc
commit
08085a1894
27
gnutls-3.6.3-fix-ecdsa.patch
Normal file
27
gnutls-3.6.3-fix-ecdsa.patch
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
diff --git a/lib/pubkey.c b/lib/pubkey.c
|
||||||
|
index 162ceaa4a..8fc42b95a 100644
|
||||||
|
--- a/lib/pubkey.c
|
||||||
|
+++ b/lib/pubkey.c
|
||||||
|
@@ -1072,7 +1072,6 @@ gnutls_pubkey_import(gnutls_pubkey_t key,
|
||||||
|
int result = 0, need_free = 0;
|
||||||
|
gnutls_datum_t _data;
|
||||||
|
ASN1_TYPE spk;
|
||||||
|
- gnutls_ecc_curve_t curve;
|
||||||
|
|
||||||
|
if (key == NULL) {
|
||||||
|
gnutls_assert();
|
||||||
|
@@ -1119,14 +1118,7 @@ gnutls_pubkey_import(gnutls_pubkey_t key,
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
|
||||||
|
- /* this has already been called by get_asn_mpis() thus it cannot
|
||||||
|
- * fail.
|
||||||
|
- */
|
||||||
|
- key->params.algo = _gnutls_x509_get_pk_algorithm(spk, "", &curve, NULL);
|
||||||
|
-
|
||||||
|
- key->params.curve = curve;
|
||||||
|
key->bits = pubkey_to_bits(&key->params);
|
||||||
|
-
|
||||||
|
result = 0;
|
||||||
|
|
||||||
|
cleanup:
|
@ -1,10 +1,11 @@
|
|||||||
# This spec file has been automatically updated
|
# This spec file has been automatically updated
|
||||||
Version: 3.6.3
|
Version: 3.6.3
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Patch1: gnutls-3.2.7-rpath.patch
|
Patch1: gnutls-3.2.7-rpath.patch
|
||||||
Patch2: gnutls-3.4.2-no-now-guile.patch
|
Patch2: gnutls-3.4.2-no-now-guile.patch
|
||||||
Patch3: gnutls-3.6.3-skip-new-priority-funcs-err-pos.patch
|
Patch3: gnutls-3.6.3-skip-new-priority-funcs-err-pos.patch
|
||||||
Patch4: gnutls-3.6.3-backport-upstream-fixes.patch
|
Patch4: gnutls-3.6.3-backport-upstream-fixes.patch
|
||||||
|
Patch5: gnutls-3.6.3-fix-ecdsa.patch
|
||||||
%bcond_without dane
|
%bcond_without dane
|
||||||
%if 0%{?rhel}
|
%if 0%{?rhel}
|
||||||
%bcond_with guile
|
%bcond_with guile
|
||||||
@ -154,6 +155,7 @@ gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
|
|||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
%patch3 -p1
|
%patch3 -p1
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
|
%patch5 -p1
|
||||||
|
|
||||||
sed -i -e 's|sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/lib /usr/lib %{_libdir}|g' configure
|
sed -i -e 's|sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/lib /usr/lib %{_libdir}|g' configure
|
||||||
rm -f lib/minitasn1/*.c lib/minitasn1/*.h
|
rm -f lib/minitasn1/*.c lib/minitasn1/*.h
|
||||||
@ -309,8 +311,11 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Aug 07 2018 Nikos Mavrogiannopoulos <nmav@redhat.com> - 3.6.3-3
|
||||||
|
- Fixed ECDSA public key import (#1612803)
|
||||||
|
|
||||||
* Thu Jul 26 2018 Nikos Mavrogiannopoulos <nmav@redhat.com> - 3.6.3-2
|
* Thu Jul 26 2018 Nikos Mavrogiannopoulos <nmav@redhat.com> - 3.6.3-2
|
||||||
- Backported regression fixed from 3.6.2
|
- Backported regression fixes from 3.6.2
|
||||||
|
|
||||||
* Mon Jul 16 2018 Nikos Mavrogiannopoulos <nmav@redhat.com> - 3.6.3-1
|
* Mon Jul 16 2018 Nikos Mavrogiannopoulos <nmav@redhat.com> - 3.6.3-1
|
||||||
- Update to upstream 3.6.3 release
|
- Update to upstream 3.6.3 release
|
||||||
|
Loading…
Reference in New Issue
Block a user