wok-next view gnome-vfs/stuff/patches/gnutls-3.4.0.patch @ rev 21724
busybox: update configs
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Tue Sep 01 11:04:25 2020 +0000 (2020-09-01) |
| parents | |
| children |
line source
1 diff -uprw gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-ssl.c gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c
2 --- gnome-vfs-2.24.4.orig/libgnomevfs/gnome-vfs-ssl.c 2010-02-09 14:16:14.000000000 +0200
3 +++ gnome-vfs-2.24.4/libgnomevfs/gnome-vfs-ssl.c 2015-04-14 00:01:51.272451668 +0300
4 @@ -314,21 +314,6 @@ gnome_vfs_ssl_create (GnomeVFSSSL **hand
5 #endif
6 }
8 -#ifdef HAVE_GNUTLS
9 -static const int protocol_priority[] = {GNUTLS_TLS1, GNUTLS_SSL3, 0};
10 -static const int cipher_priority[] =
11 - {GNUTLS_CIPHER_RIJNDAEL_128_CBC, GNUTLS_CIPHER_3DES_CBC,
12 - GNUTLS_CIPHER_RIJNDAEL_256_CBC, GNUTLS_CIPHER_ARCFOUR, 0};
13 -static const int comp_priority[] =
14 - {GNUTLS_COMP_ZLIB, GNUTLS_COMP_NULL, 0};
15 -static const int kx_priority[] =
16 - {GNUTLS_KX_DHE_RSA, GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, 0};
17 -static const int mac_priority[] =
18 - {GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0};
19 -
20 -#endif
21 -
22 -
23 /**
24 * gnome_vfs_ssl_create_from_fd:
25 * @handle_return: pointer to a #GnomeVFSSSL struct, which will
26 @@ -437,11 +422,7 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS
27 gnutls_transport_set_ptr (ssl->private->tlsstate,
28 GINT_TO_POINTER (fd));
30 - gnutls_protocol_set_priority (ssl->private->tlsstate, protocol_priority);
31 - gnutls_cipher_set_priority (ssl->private->tlsstate, cipher_priority);
32 - gnutls_compression_set_priority (ssl->private->tlsstate, comp_priority);
33 - gnutls_kx_set_priority (ssl->private->tlsstate, kx_priority);
34 - gnutls_mac_set_priority (ssl->private->tlsstate, mac_priority);
35 + gnutls_set_default_priority (ssl->private->tlsstate);
37 gnutls_cred_set (ssl->private->tlsstate, GNUTLS_CRD_CERTIFICATE,
38 ssl->private->xcred);