mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

76 lines
3.0 KiB

  1. # --- ROCK-COPYRIGHT-NOTE-BEGIN ---
  2. #
  3. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  4. # Please add additional copyright information _after_ the line containing
  5. # the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
  6. # the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
  7. #
  8. # ROCK Linux: rock-src/package/blindcoder/dovecot/gnutls-upd.patch
  9. # ROCK Linux is Copyright (C) 1998 - 2006 Clifford Wolf
  10. #
  11. # This patch file is dual-licensed. It is available under the license the
  12. # patched project is licensed under, as long as it is an OpenSource license
  13. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  14. # of the GNU General Public License as published by the Free Software
  15. # Foundation; either version 2 of the License, or (at your option) any later
  16. # version.
  17. #
  18. # --- ROCK-COPYRIGHT-NOTE-END ---
  19. --- ./src/login-common/ssl-proxy-gnutls.c.orig 2004-09-07 00:52:38.735148640 +0200
  20. +++ ./src/login-common/ssl-proxy-gnutls.c 2004-09-07 01:01:43.871275352 +0200
  21. @@ -516,12 +516,8 @@
  22. certfile, keyfile, gnutls_strerror(ret));
  23. }
  24. - ret = gnutls_certificate_set_dh_params(x509_cred, dh_params);
  25. - if (ret < 0)
  26. - i_fatal("Can't set DH parameters: %s", gnutls_strerror(ret));
  27. - ret = gnutls_certificate_set_rsa_params(x509_cred, rsa_params);
  28. - if (ret < 0)
  29. - i_fatal("Can't set RSA parameters: %s", gnutls_strerror(ret));
  30. + gnutls_certificate_set_dh_params(x509_cred, dh_params);
  31. + gnutls_certificate_set_rsa_export_params(x509_cred, rsa_params);
  32. ssl_proxies = hash_create(default_pool, default_pool, 0, NULL, NULL);
  33. ssl_initialized = TRUE;
  34. --- ./src/login-common/ssl-proxy-gnutls.c.orig 2004-09-07 01:11:41.309450944 +0200
  35. +++ ./src/login-common/ssl-proxy-gnutls.c 2004-09-07 01:14:11.235658696 +0200
  36. @@ -276,7 +276,7 @@
  37. return;
  38. /* i/o interrupted */
  39. - dir = gnutls_handshake_get_direction(proxy->session) == 0 ?
  40. + dir = gnutls_record_get_direction(proxy->session) == 0 ?
  41. IO_READ : IO_WRITE;
  42. if (proxy->io_ssl_dir != dir) {
  43. if (proxy->io_ssl != NULL)
  44. @@ -298,7 +298,7 @@
  45. gnutls_compression_set_priority(session, comp_priority);
  46. gnutls_kx_set_priority(session, kx_priority);
  47. gnutls_mac_set_priority(session, mac_priority);
  48. - gnutls_cert_type_set_priority(session, cert_type_priority);
  49. + gnutls_certificate_type_set_priority(session, cert_type_priority);
  50. gnutls_cred_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred);
  51. return session;
  52. @@ -504,8 +504,8 @@
  53. read_parameters(paramfile);
  54. - if ((ret = gnutls_certificate_allocate_cred(&x509_cred)) < 0) {
  55. - i_fatal("gnutls_certificate_allocate_cred() failed: %s",
  56. + if ((ret = gnutls_certificate_allocate_credentials(&x509_cred)) < 0) {
  57. + i_fatal("gnutls_certificate_allocate_credentials() failed: %s",
  58. gnutls_strerror(ret));
  59. }
  60. @@ -537,7 +537,7 @@
  61. hash_foreach(ssl_proxies, ssl_proxy_destroy_hash, NULL);
  62. hash_destroy(ssl_proxies);
  63. - gnutls_certificate_free_cred(x509_cred);
  64. + gnutls_certificate_free_credentials(x509_cred);
  65. gnutls_global_deinit();
  66. }