[Freeswitch-svn] [commit] r7811 - freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport

[Freeswitch SVN]

Author: mikej
Date: Fri Mar  7 12:37:43 2008
New Revision: 7811

Modified:
   freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tls.c

Log:
Mon Mar  3 12:17:50 EST 2008  Pekka.Pessi at nokia.com
  * tport_type_tls.c: not trying to use non-existing certificate/key, randfile, CAfile



Modified: freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tls.c
==============================================================================
--- freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tls.c	(original)
+++ freeswitch/trunk/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_tls.c	Fri Mar  7 12:37:43 2008
@@ -144,7 +144,8 @@
 				 tagi_t const *tags,
 				 char const **return_culprit)
 {
-  tport_tls_init_master(pri, tpn, ai, tags, return_culprit);
+  if (tport_tls_init_master(pri, tpn, ai, tags, return_culprit) < 0)
+    return -1;
 
   return tport_tcp_init_client(pri, tpn, ai, tags, return_culprit);
 }
@@ -192,6 +193,9 @@
     SU_DEBUG_9(("%s(%p): tls key = %s\n", __func__, (void *)pri, ti.key));
 
     if (ti.key && ti.CAfile && ti.randFile) {
+      if (access(ti.key, R_OK) != 0) ti.key = NULL;
+      if (access(ti.randFile, R_OK) != 0) ti.randFile = NULL;
+      if (access(ti.CAfile, R_OK) != 0) ti.CAfile = NULL;
       tlspri->tlspri_master = tls_init_master(&ti);
     }
   }