FS-6174 --resolve after updating to this revision, put ca-bundle.crt in /usr/local...

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index 7157ca03b064da8b97a10ec4f61081ac077722ed..2936893276270400c8d700bc30798044eb6fa5e6 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Sun Jan 26 07:59:10 UTC 2014
+Fri Jan 31 20:16:45 CDT 2014

diff --git a/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_ws.c b/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_ws.c
index 1f16d0f18cc79c14180954aeb93804348927be43..a6cb2ba85bbcc99a47001e2f6c040d7c37ddc1d1 100644 (file)
--- a/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_ws.c
+++ b/libs/sofia-sip/libsofia-sip-ua/tport/tport_type_ws.c
@@ -338,6 +338,7 @@ static int tport_ws_init_primary_secure(tport_primary_t *pri,
   tport_ws_primary_t *wspri = (tport_ws_primary_t *)pri;
   const char *cert = "/ssl.pem";
   const char *key = "/ssl.pem";
+  const char *chain = NULL;
   char *homedir;
   char *tbf = NULL;
   su_home_t autohome[SU_HOME_AUTO_SIZE(1024)];
@@ -361,11 +362,13 @@ static int tport_ws_init_primary_secure(tport_primary_t *pri,
     key  = su_sprintf(autohome, "%s/%s", path, "wss.key");
        if (access(key, R_OK) != 0) key = NULL;
        cert = su_sprintf(autohome, "%s/%s", path, "wss.crt");
+       chain = su_sprintf(autohome, "%s/%s", path, "ca-bundle.crt");
        if (access(cert, R_OK) != 0) cert = NULL;
        if ( !key )  key  = su_sprintf(autohome, "%s/%s", path, "wss.pem");
        if ( !cert ) cert = su_sprintf(autohome, "%s/%s", path, "wss.pem");
        if (access(key, R_OK) != 0) key = NULL;
        if (access(cert, R_OK) != 0) cert = NULL;
+       if (access(chain, R_OK) != 0) chain = NULL;
   }
 
   init_ssl();
@@ -379,6 +382,10 @@ static int tport_ws_init_primary_secure(tport_primary_t *pri,
 
   if ( !wspri->ssl_ctx ) goto done;
 
+  if (chain) {
+         SSL_CTX_use_certificate_chain_file(wspri->ssl_ctx, chain);
+  }
+
   /* set the local certificate from CertFile */
   SSL_CTX_use_certificate_file(wspri->ssl_ctx, cert, SSL_FILETYPE_PEM);
   /* set the private key from KeyFile */