gnome-vfs-2.24.4-gnutls34.patch 1.6 KB

123456789101112131415161718192021222324252627282930313233343536373839
  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. }
  7. -#ifdef HAVE_GNUTLS
  8. -static const int protocol_priority[] = {GNUTLS_TLS1, GNUTLS_SSL3, 0};
  9. -static const int cipher_priority[] =
  10. - {GNUTLS_CIPHER_RIJNDAEL_128_CBC, GNUTLS_CIPHER_3DES_CBC,
  11. - GNUTLS_CIPHER_RIJNDAEL_256_CBC, GNUTLS_CIPHER_ARCFOUR, 0};
  12. -static const int comp_priority[] =
  13. - {GNUTLS_COMP_ZLIB, GNUTLS_COMP_NULL, 0};
  14. -static const int kx_priority[] =
  15. - {GNUTLS_KX_DHE_RSA, GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, 0};
  16. -static const int mac_priority[] =
  17. - {GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0};
  18. -
  19. -#endif
  20. -
  21. -
  22. /**
  23. * gnome_vfs_ssl_create_from_fd:
  24. * @handle_return: pointer to a #GnomeVFSSSL struct, which will
  25. @@ -437,11 +422,7 @@ gnome_vfs_ssl_create_from_fd (GnomeVFSSS
  26. gnutls_transport_set_ptr (ssl->private->tlsstate,
  27. GINT_TO_POINTER (fd));
  28. - gnutls_protocol_set_priority (ssl->private->tlsstate, protocol_priority);
  29. - gnutls_cipher_set_priority (ssl->private->tlsstate, cipher_priority);
  30. - gnutls_compression_set_priority (ssl->private->tlsstate, comp_priority);
  31. - gnutls_kx_set_priority (ssl->private->tlsstate, kx_priority);
  32. - gnutls_mac_set_priority (ssl->private->tlsstate, mac_priority);
  33. + gnutls_set_default_priority (ssl->private->tlsstate);
  34. gnutls_cred_set (ssl->private->tlsstate, GNUTLS_CRD_CERTIFICATE,
  35. ssl->private->xcred);