seek chain cert from wss.pem just cat together the cert, the key and the chain cert...

diff --git a/libs/sofia-sip/.update b/libs/sofia-sip/.update
index bad47b2a18cd236f4986cac48a6dc5c88082e408..caa693566dc77136fe56bcdcfeba2f0ab4b7adee 100644 (file)
--- a/libs/sofia-sip/.update
+++ b/libs/sofia-sip/.update
@@ -1 +1 @@
-Tue May 20 20:29:10 CDT 2014
+Tue May 20 23:17:55 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 464e8a56d6cb2c4a6e6628d7b86fa7c024eb1091..5dddccdf0e2f34889f642881ed563bac45ea0eb0 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
@@ -361,11 +361,17 @@ static int tport_ws_init_primary_secure(tport_primary_t *pri,
   if (path) {
     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");
+       if (access(cert, R_OK) != 0) cert = NULL;
+
        chain = su_sprintf(autohome, "%s/%s", path, "ca-bundle.crt");
+       if (access(chain, R_OK) != 0) chain = NULL;
+
        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 ( !chain ) chain = 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;