No Description

300-fix-gnutls-system-trust.patch 1.2KB

1234567891011121314151617181920212223242526272829303132333435363738394041
  1. From 2c30fa7eb71b24f05b55ff03d6c81fc8572a6f4d Mon Sep 17 00:00:00 2001
  2. From: Daniel Golle <daniel@makrotopia.org>
  3. Date: Mon, 29 Jun 2015 18:36:01 +0200
  4. Subject: [PATCH] gnutls: use default system trust storage if no other CA is
  5. set
  6. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  7. ---
  8. lib/vtls/gtls.c | 21 +++++++++++++++++++++
  9. 1 file changed, 21 insertions(+)
  10. --- a/lib/vtls/gtls.c
  11. +++ b/lib/vtls/gtls.c
  12. @@ -420,6 +420,27 @@ gtls_connect_step1(struct connectdata *c
  13. return CURLE_SSL_CONNECT_ERROR;
  14. }
  15. + if(
  16. +#ifdef USE_TLS_SRP
  17. + data->set.ssl.authtype != CURL_TLSAUTH_SRP &&
  18. +#endif
  19. +#ifdef HAS_CAPATH
  20. + !data->set.ssl.CApath &&
  21. +#endif
  22. + !data->set.ssl.CAfile) {
  23. + /* add default system trust on supported systems */
  24. + rc = gnutls_certificate_set_x509_system_trust(conn->ssl[sockindex].cred);
  25. +
  26. + if(rc < 0) {
  27. + infof(data, "error importing system trust storage (%s)\n",
  28. + gnutls_strerror(rc));
  29. + if(data->set.ssl.verifypeer)
  30. + return CURLE_SSL_CACERT;
  31. + }
  32. + else
  33. + infof(data, "found %d certificates in system trust storage\n", rc);
  34. + }
  35. +
  36. #ifdef USE_TLS_SRP
  37. if(data->set.ssl.authtype == CURL_TLSAUTH_SRP) {
  38. infof(data, "Using TLS-SRP username: %s\n", data->set.ssl.username);