Revert to the patch for 4.1x/4.0x

el8
Nicolas Chauvet 6 years ago
parent af227139fe
commit 9737b159b4

@ -1,16 +1,9 @@
From 58eb69d5f471a7d6c13d54e235164595a0968049 Mon Sep 17 00:00:00 2001 From 73499eb72f268a0178d88c2144d9961a503f11fc Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart@gmail.com> From: Nicolas Chauvet <kwizart@gmail.com>
Date: Sat, 15 Jun 2019 16:18:42 +0200 Date: Mon, 24 Sep 2018 18:12:27 +0200
Subject: [PATCH] Use gnutls_set_default_priority Subject: [PATCH] gnutls Switch to default (system) priority
This will use the default priority for gnutls.
When supported, the priority will be set to @SYSTEM which allows to
adapt the ciphers list at runtime according to the policy set.
See also:
https://fedoraproject.org/wiki/Packaging:CryptoPolicies https://fedoraproject.org/wiki/Packaging:CryptoPolicies
https://wiki.debian.org/CryptoPolicy
Signed-off-by: Nicolas Chauvet <kwizart@gmail.com> Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
--- ---
@ -18,7 +11,7 @@ Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavformat/tls_gnutls.c b/libavformat/tls_gnutls.c diff --git a/libavformat/tls_gnutls.c b/libavformat/tls_gnutls.c
index f32bc2821b..b30e8ea007 100644 index e3c43683be..673a18ac6a 100644
--- a/libavformat/tls_gnutls.c --- a/libavformat/tls_gnutls.c
+++ b/libavformat/tls_gnutls.c +++ b/libavformat/tls_gnutls.c
@@ -181,7 +181,7 @@ static int tls_open(URLContext *h, const char *uri, int flags, AVDictionary **op @@ -181,7 +181,7 @@ static int tls_open(URLContext *h, const char *uri, int flags, AVDictionary **op
@ -27,9 +20,9 @@ index f32bc2821b..b30e8ea007 100644
gnutls_transport_set_ptr(p->session, c->tcp); gnutls_transport_set_ptr(p->session, c->tcp);
- gnutls_priority_set_direct(p->session, "NORMAL", NULL); - gnutls_priority_set_direct(p->session, "NORMAL", NULL);
+ gnutls_set_default_priority (p->session); + gnutls_set_default_priority (p->session);
do { ret = gnutls_handshake(p->session);
ret = gnutls_handshake(p->session); if (ret) {
if (gnutls_error_is_fatal(ret)) { ret = print_tls_error(h, ret);
-- --
2.17.2 2.17.2

Loading…
Cancel
Save